aggregates

This commit is contained in:
Alex Holliday committed 2025-12-17 21:11:51 +00:00
1 parent 95e415ed13
commit c8dc5b93cb
14 files changed
+302 -99

No files matched your search

@@ -94,9 +94,12 @@ export const ChartResponseTime = ({
"avgResponseTime"
);
return (
<BaseChart icon={<Clock size={20} strokeWidth={1.5} />} title="Response times">
<BaseChart
icon={<Clock size={20} strokeWidth={1.5} />}
title="Response times"
>
<ResponsiveContainer width="100%" height={300}>
<AreaChart data={normalized?.slice().reverse()}>
<AreaChart data={normalized?.slice()}>
<CartesianGrid
stroke={theme.palette.divider}
strokeWidth={1}
@@ -1,7 +1,14 @@
import Stack from "@mui/material/Stack";
import Typography from "@mui/material/Typography";
import { BaseChart } from "@/components/monitors/Chart";
import { ResponsiveContainer, BarChart, XAxis, Bar, Cell } from "recharts";
import {
ResponsiveContainer,
BarChart,
XAxis,
Bar,
Cell,
Tooltip,
} from "recharts";
import { TrendingUp, AlertTriangle } from "lucide-react";
import type { GroupedCheck } from "@/types/check";
@@ -65,7 +72,6 @@ export const HistogramStatus = ({
title: string;
}) => {
const { t } = useTranslation();
const uiTimezone = useAppSelector((state: any) => state.ui.timezone);
const icon =
status === "up" ? (
@@ -74,10 +80,31 @@ export const HistogramStatus = ({
<AlertTriangle size={20} strokeWidth={1.5} />
);
const theme = useTheme();
const [idx, setIdx] = useState<number | null>(null);
const dateFormat = range === "1d" || range === "2h" ? "MMM D, h A" : "MMM D";
const normalChecks = normalizeResponseTimes(checks, "avgResponseTime");
const CustomTooltip = ({ active, payload }: any) => {
if (!active || !payload?.length) return null;
const d = payload[0]?.payload as GroupedCheck & {
avgResponseTime?: number;
};
const avg = d?.avgResponseTime ?? 0;
const titleText = t("common.charts.uptime.avgResponseTime");
return (
<Stack
sx={{
p: 1,
bgcolor: "background.paper",
border: 1,
borderColor: "divider",
borderRadius: 1,
}}
>
<Typography variant="caption">{titleText}</Typography>
<Typography variant="body2">{Math.floor(avg)} ms</Typography>
</Stack>
);
};
if (normalChecks.length === 0) {
return (
<BaseChart icon={icon} title={title}>
@@ -105,23 +132,7 @@ export const HistogramStatus = ({
justifyContent="space-between"
>
<Stack>
<Typography>Total checks</Typography>
{idx ? (
<Stack>
<Typography variant="h2">
{normalChecks?.[idx]?.count}
</Typography>
<Typography position={"absolute"} top={"100%"}>
{formatDateWithTz(
normalChecks?.[idx]?._id,
dateFormat,
uiTimezone
)}
</Typography>
</Stack>
) : (
<Typography variant="h2">{totalChecks}</Typography>
)}
<Typography>Checks: {totalChecks}</Typography>
</Stack>
</Stack>
<ResponsiveContainer width="100%" height={155}>
@@ -138,19 +149,18 @@ export const HistogramStatus = ({
/>
}
/>
<Tooltip cursor={false} content={<CustomTooltip />} />
<Bar
dataKey="normalResponseTime"
maxBarSize={7}
background={{ fill: "transparent" }}
>
{normalChecks?.map((groupedCheck, idx) => {
{normalChecks?.map((groupedCheck) => {
const fillColor = getResponseTimeColor(
groupedCheck.normalResponseTime
);
return (
<Cell
onMouseEnter={() => setIdx(idx)}
onMouseLeave={() => setIdx(null)}
key={groupedCheck._id}
fill={theme.palette[fillColor].main}
/>
+2 -1
View File
@@ -211,7 +211,8 @@
"downTitle": "Downtime",
"emptyDown": "Great, no downtime!",
"emptyUp": "No checks yet",
"upTitle": "Uptime"
"upTitle": "Uptime",
"avgResponseTime": "Avg response time"
}
},
"dialog": {
+25 -34
View File
@@ -40,25 +40,7 @@ const UptimeDetailsPage = () => {
{ refreshInterval: GLOBAL_REFRESH, keepPreviousData: true }
);
const {
response: upResponse,
loading: upIsLoading,
error: upError,
} = useGet<ApiResponse<IMonitorWithMonitorStats>>(
`/monitors/${id}?embedChecks=true&range=${range}&status=up`,
{},
{ keepPreviousData: true }
);
const {
response: downResponse,
error: downError,
loading: downIsLoading,
} = useGet<ApiResponse<IMonitorWithMonitorStats>>(
`/monitors/${id}?embedChecks=true&range=${range}&status=down`,
{},
{ keepPreviousData: true }
);
// Up/Down derived from single response (server returns up/down/all in one payload)
const {
patch,
@@ -85,20 +67,33 @@ const UptimeDetailsPage = () => {
: -1;
const checks = response?.data?.checks || [];
const upChecks = upResponse?.data?.checks
? [...upResponse.data.checks].reverse()
: [];
const downChecks = downResponse?.data?.checks
? [...downResponse.data.checks].reverse()
: [];
const checksAll = checks.length ? [...checks].reverse() : [];
const upChecksMapped = checksAll.map((c: any) => ({
...c,
count: c.upChecks ?? 0,
avgResponseTime: c.avgResponseTimeUp ?? 0,
}));
const totalUp = upChecksMapped.reduce(
(sum: number, c: any) => sum + (c.count ?? 0),
0
);
const upChecks = totalUp === 0 ? [] : upChecksMapped;
const downChecksMapped = checksAll.map((c: any) => ({
...c,
count: c.downChecks ?? 0,
avgResponseTime: c.avgResponseTimeDown ?? 0,
}));
const totalDown = downChecksMapped.reduce(
(sum: number, c: any) => sum + (c.count ?? 0),
0
);
const downChecks = totalDown === 0 ? [] : downChecksMapped;
const palette = getStatusPalette(monitor?.status);
if (error || upError || downError || postError) {
if (error || postError) {
console.error("Error fetching monitor data:", {
error,
upError,
downError,
postError,
});
}
@@ -145,11 +140,7 @@ const UptimeDetailsPage = () => {
}
/>
</Stack>
<HeaderRange
loading={loading || upIsLoading || downIsLoading}
range={range}
setRange={setRange}
/>
<HeaderRange loading={loading} range={range} setRange={setRange} />
<Stack direction={isSmall ? "column" : "row"} gap={theme.spacing(8)}>
<HistogramStatus
title={t("common.charts.uptime.upTitle")}
@@ -165,7 +156,7 @@ const UptimeDetailsPage = () => {
/>
<ChartAvgResponse avg={avgResponseTime} max={maxResponseTime} />
</Stack>
<ChartResponseTime checks={checks} range={range} />
<ChartResponseTime checks={checksAll} range={range} />
<CheckTable monitorId={monitor?._id} />
</BasePage>
);
+4
View File
@@ -147,6 +147,10 @@ export interface GroupedCheck {
_id: string;
avgResponseTime: number;
count: number;
upChecks?: number;
downChecks?: number;
avgResponseTimeUp?: number | null;
avgResponseTimeDown?: number | null;
}
export interface LatestCheck {