Skip to content

Open-source status page, incident response and uptime monitoring

chore: improve layout and monitor chart (#551)

Maximilian Kaske62319860f2bb
diff --git a/apps/web/public/assets/changelog/latency-quantiles.png b/apps/web/public/assets/changelog/latency-quantiles.png
new file mode 100644
index 000000000..d91c71209
Binary files /dev/null and b/apps/web/public/assets/changelog/latency-quantiles.png differ
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/layout.tsx
new file mode 100644
index 000000000..67239c3b7
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/layout.tsx
@@ -0,0 +1,38 @@
+import * as React from "react";
+import Link from "next/link";
+
+import { ButtonWithDisableTooltip } from "@openstatus/ui";
+
+import { Header } from "@/components/dashboard/header";
+import { HelpCallout } from "@/components/dashboard/help-callout";
+import { api } from "@/trpc/server";
+
+export default async function Layout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ const isLimitReached = await api.monitor.isMonitorLimitReached.query();
+
+ return (
+ <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">
+ <Header
+ title="Monitors"
+ description="Overview of all your monitors."
+ actions={
+ <ButtonWithDisableTooltip
+ tooltip="You reached the limits"
+ asChild={!isLimitReached}
+ disabled={isLimitReached}
+ >
+ <Link href="./monitors/new">Create</Link>
+ </ButtonWithDisableTooltip>
+ }
+ />
+ <div className="col-span-full">{children}</div>
+ <div className="mt-8 md:mt-12">
+ <HelpCallout />
+ </div>
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/loading.tsx
new file mode 100644
index 000000000..ae51d6a5b
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/loading.tsx
@@ -0,0 +1,5 @@
+import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";
+
+export default function Loading() {
+ return <DataTableSkeleton />;
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
new file mode 100644
index 000000000..7041d00a9
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
@@ -0,0 +1,36 @@
+import * as React from "react";
+import Link from "next/link";
+
+import { Button } from "@openstatus/ui";
+
+import { EmptyState } from "@/components/dashboard/empty-state";
+import { Limit } from "@/components/dashboard/limit";
+import { columns } from "@/components/data-table/monitor/columns";
+import { DataTable } from "@/components/data-table/monitor/data-table";
+import { api } from "@/trpc/server";
+
+export default async function MonitorPage() {
+ const monitors = await api.monitor.getMonitorsByWorkspace.query();
+ const isLimitReached = await api.monitor.isMonitorLimitReached.query();
+
+ if (monitors?.length === 0)
+ return (
+ <EmptyState
+ icon="activity"
+ title="No monitors"
+ description="Create your first monitor"
+ action={
+ <Button asChild>
+ <Link href="./monitors/new">Create</Link>
+ </Button>
+ }
+ />
+ );
+
+ return (
+ <>
+ <DataTable columns={columns} data={monitors} />
+ <div className="mt-3">{isLimitReached ? <Limit /> : null}</div>
+ </>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx
new file mode 100644
index 000000000..822c7adcc
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+import * as React from "react";
+import { usePathname, useRouter } from "next/navigation";
+import { CalendarIcon } from "lucide-react";
+
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@openstatus/ui";
+
+import useUpdateSearchParams from "@/hooks/use-update-search-params";
+import { periods } from "../utils";
+import type { Period } from "../utils";
+
+export function DatePickerPreset({ period }: { period: Period }) {
+ const router = useRouter();
+ const pathname = usePathname();
+ const updateSearchParams = useUpdateSearchParams();
+
+ function onSelect(value: Period) {
+ const searchParams = updateSearchParams({ period: value });
+ router.replace(`${pathname}?${searchParams}`);
+ }
+
+ function renderLabel(period?: Period) {
+ if (period === "1h") return "Last hour";
+ if (period === "1d") return "Last day";
+ if (period === "3d") return "Last 3 days";
+ return "Pick a range";
+ }
+
+ return (
+ <Select defaultValue={period} onValueChange={onSelect}>
+ <SelectTrigger className="w-[150px] text-left">
+ <span className="flex items-center gap-2">
+ <CalendarIcon className="h-4 w-4" />
+ <SelectValue placeholder="Pick a range" />
+ </span>
+ </SelectTrigger>
+ <SelectContent>
+ {periods.map((period) => (
+ <SelectItem key={period} value={period}>
+ {renderLabel(period)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx
new file mode 100644
index 000000000..6fe12009b
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import * as React from "react";
+import { usePathname, useRouter } from "next/navigation";
+import { Hourglass } from "lucide-react";
+
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@openstatus/ui";
+
+import useUpdateSearchParams from "@/hooks/use-update-search-params";
+import { intervals } from "../utils";
+import type { Interval } from "../utils";
+
+export function IntervalPreset({ interval }: { interval: Interval }) {
+ const router = useRouter();
+ const pathname = usePathname();
+ const updateSearchParams = useUpdateSearchParams();
+
+ function onSelect(value: Interval) {
+ const searchParams = updateSearchParams({ interval: value });
+ router.replace(`${pathname}?${searchParams}`);
+ }
+
+ return (
+ <Select onValueChange={onSelect} defaultValue={interval}>
+ <SelectTrigger className="w-[100px]">
+ <span className="flex items-center gap-2">
+ <Hourglass className="h-4 w-4" />
+ <SelectValue />
+ </span>
+ </SelectTrigger>
+ <SelectContent>
+ {intervals.map((interval) => (
+ <SelectItem key={interval} value={interval}>
+ {interval}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/pause-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/pause-button.tsx
new file mode 100644
index 000000000..fa5eff034
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/pause-button.tsx
@@ -0,0 +1,57 @@
+"use client";
+
+import { useTransition } from "react";
+import { useRouter } from "next/navigation";
+import { PauseCircle, PlayCircle } from "lucide-react";
+
+import type { Monitor } from "@openstatus/db/src/schema";
+import { Button } from "@openstatus/ui";
+
+import { LoadingAnimation } from "@/components/loading-animation";
+import { useToastAction } from "@/hooks/use-toast-action";
+import { api } from "@/trpc/client";
+
+export function PauseButton({ monitor }: { monitor: Monitor }) {
+ const [isPending, startTransition] = useTransition();
+ const router = useRouter();
+ const { toast } = useToastAction();
+
+ async function toggle() {
+ startTransition(async () => {
+ try {
+ await api.monitor.update.mutate({
+ ...monitor,
+ active: !monitor.active,
+ });
+ toast("success");
+ router.refresh();
+ } catch {
+ toast("error");
+ }
+ });
+ }
+
+ return (
+ <Button
+ variant={monitor.active ? "outline" : "default"}
+ onClick={toggle}
+ disabled={isPending}
+ >
+ {isPending ? (
+ <LoadingAnimation variant={monitor.active ? "inverse" : "default"} />
+ ) : (
+ <>
+ {monitor.active ? (
+ <>
+ <PauseCircle className="mr-2 h-4 w-4" /> Pause
+ </>
+ ) : (
+ <>
+ <PlayCircle className="mr-2 h-4 w-4" /> Resume
+ </>
+ )}
+ </>
+ )}
+ </Button>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx
new file mode 100644
index 000000000..f11d2075f
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx
@@ -0,0 +1,52 @@
+"use client";
+
+import * as React from "react";
+import { usePathname, useRouter } from "next/navigation";
+import { CandlestickChart } from "lucide-react";
+
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectSeparator,
+ SelectTrigger,
+ SelectValue,
+} from "@openstatus/ui";
+
+import useUpdateSearchParams from "@/hooks/use-update-search-params";
+import { quantiles } from "../utils";
+import type { Quantile } from "../utils";
+
+export function QuantilePreset({ quantile }: { quantile: Quantile }) {
+ const router = useRouter();
+ const pathname = usePathname();
+ const updateSearchParams = useUpdateSearchParams();
+
+ function onSelect(value: Quantile) {
+ const searchParams = updateSearchParams({ quantile: value });
+ router.replace(`${pathname}?${searchParams}`);
+ }
+
+ return (
+ <Select onValueChange={onSelect} defaultValue={quantile}>
+ <SelectTrigger className="w-[100px] uppercase">
+ <span className="flex items-center gap-2">
+ <CandlestickChart className="h-4 w-4" />
+ <SelectValue />
+ </span>
+ </SelectTrigger>
+ <SelectContent>
+ {quantiles.map((quantile) => {
+ return (
+ <React.Fragment key={quantile}>
+ {quantile === "avg" && <SelectSeparator />}
+ <SelectItem value={quantile} className="uppercase">
+ {quantile}
+ </SelectItem>
+ </React.Fragment>
+ );
+ })}
+ </SelectContent>
+ </Select>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/date-picker-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/date-picker-preset.tsx
deleted file mode 100644
index 2a6f03f59..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/date-picker-preset.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-"use client";
-
-import * as React from "react";
-import { usePathname, useRouter } from "next/navigation";
-import { CalendarIcon } from "lucide-react";
-
-import {
- Button,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@openstatus/ui";
-
-import useUpdateSearchParams from "@/hooks/use-update-search-params";
-import { cn } from "@/lib/utils";
-import type { Period } from "../utils";
-
-export function DatePickerPreset({ period }: { period: Period }) {
- const router = useRouter();
- const pathname = usePathname();
- const updateSearchParams = useUpdateSearchParams();
-
- function onSelect(value: Period) {
- const searchParams = updateSearchParams({
- period: value,
- });
- router.replace(`${pathname}?${searchParams}`);
- }
-
- function renderLabel() {
- if (period === "hour") return "Last hour";
- if (period === "day") return "Today";
- if (period === "3d") return "Last 3 days";
- return "Pick a range";
- }
-
- return (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- id="date"
- variant={"outline"}
- className={cn(
- "w-[140px] justify-start text-left font-normal",
- !period && "text-muted-foreground",
- )}
- >
- <CalendarIcon className="mr-2 h-4 w-4" />
- {renderLabel()}
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem onClick={() => onSelect("hour")}>
- Last hour
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => onSelect("day")}>
- Today
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => onSelect("3d")}>
- Last 3 days
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/loading.tsx
index 1ec444487..01f887cf3 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/loading.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/loading.tsx
@@ -1,17 +1,15 @@
import { Skeleton } from "@openstatus/ui";
-import { Header } from "@/components/dashboard/header";
import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";
export default function Loading() {
return (
- <div className="grid gap-6 md:gap-8">
- <Header.Skeleton>
- <Skeleton className="h-9 w-32" />
- </Header.Skeleton>
- <Skeleton className="h-[396px] w-full" />
+ <div className="grid gap-4">
+ <div className="flex flex-wrap items-center gap-2 sm:justify-end">
+ <Skeleton className="h-10 w-32" />
+ </div>
<div className="grid gap-3">
- <div className="flex items-center gap-3">
+ <div className="flex items-center gap-2">
<Skeleton className="h-8 w-32" />
<Skeleton className="h-8 w-16" />
</div>
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsx
index 0f9eb825d..05269ec67 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsx
@@ -1,31 +1,19 @@
import * as React from "react";
import { notFound } from "next/navigation";
-import { endOfDay, startOfDay } from "date-fns";
import * as z from "zod";
-import { Header } from "@/components/dashboard/header";
import { columns } from "@/components/data-table/columns";
import { DataTable } from "@/components/data-table/data-table";
import { getResponseListData } from "@/lib/tb";
import { api } from "@/trpc/server";
-import { ChartWrapper } from "./_components/chart-wrapper";
-import { DatePickerPreset } from "./_components/date-picker-preset";
-import { getPeriodDate, periods } from "./utils";
-
-export const revalidate = 0;
+import { DatePickerPreset } from "../_components/date-picker-preset";
+import { getDateByPeriod, periods } from "../utils";
/**
* allowed URL search params
*/
const searchParamsSchema = z.object({
- statusCode: z.coerce.number().optional(),
- cronTimestamp: z.coerce.number().optional(),
- fromDate: z.coerce
- .number()
- .optional()
- .default(startOfDay(new Date()).getTime()),
- toDate: z.coerce.number().optional().default(endOfDay(new Date()).getTime()),
- period: z.enum(periods).optional().default("hour"),
+ period: z.enum(periods).optional().default("1h"),
});
export default async function Page({
@@ -46,33 +34,22 @@ export default async function Page({
return notFound();
}
- const date = getPeriodDate(search.data.period);
+ const date = getDateByPeriod(search.data.period);
const data = await getResponseListData({
monitorId: id,
- ...search.data,
- /**
- * We are overwriting the `fromDate` and `toDate`
- * to only support presets from the `period`
- */
fromDate: date.from.getTime(),
toDate: date.to.getTime(),
});
+ if (!data) return null;
+
return (
- // overflow-x-scroll needed for the chart.
- <div className="grid grid-cols-1 gap-6 md:gap-8">
- <Header
- title={monitor.name}
- description={monitor.url}
- actions={<DatePickerPreset period={search.data.period} />}
- />
- {data ? (
- <>
- <ChartWrapper period={search.data.period} data={data} />
- <DataTable columns={columns} data={data} />
- </>
- ) : null}
+ <div className="grid gap-4">
+ <div className="flex flex-wrap items-center gap-2 sm:justify-end">
+ <DatePickerPreset period={search.data.period} />
+ </div>
+ <DataTable columns={columns} data={data} />
</div>
);
}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/utils.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/utils.ts
deleted file mode 100644
index eb90b87e6..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/utils.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { endOfDay, startOfDay, subDays, subHours, subMonths } from "date-fns";
-
-export const periods = ["hour", "day", "3d", "7d", "30d"] as const;
-
-export type Period = (typeof periods)[number];
-
-export function getPeriodDate(period: Period) {
- if (period === "hour")
- return { from: subHours(new Date(), 1), to: new Date() };
- if (period === "day")
- return { from: startOfDay(new Date()), to: endOfDay(new Date()) };
- if (period === "3d")
- return {
- from: subDays(startOfDay(new Date()), 3),
- to: endOfDay(new Date()),
- };
- if (period === "7d")
- return {
- from: subDays(startOfDay(new Date()), 7),
- to: endOfDay(new Date()),
- };
- if (period === "30d")
- return {
- from: subMonths(startOfDay(new Date()), 1),
- to: endOfDay(new Date()),
- };
- // default to today
- return { from: startOfDay(new Date()), to: endOfDay(new Date()) };
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/loading.tsx
new file mode 100644
index 000000000..b269200de
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/loading.tsx
@@ -0,0 +1,5 @@
+import { SkeletonForm } from "@/components/forms/skeleton-form";
+
+export default function Loading() {
+ return <SkeletonForm />;
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx
new file mode 100644
index 000000000..05d80cd2d
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx
@@ -0,0 +1,29 @@
+import { MonitorForm } from "@/components/forms/monitor-form";
+import { api } from "@/trpc/server";
+
+export default async function EditPage({
+ params,
+}: {
+ params: { workspaceSlug: string; id: string };
+}) {
+ const id = Number(params.id);
+ const monitor = await api.monitor.getMonitorById.query({ id });
+ const workspace = await api.workspace.getWorkspace.query();
+
+ const monitorNotifications =
+ await api.monitor.getAllNotificationsForMonitor.query({ id });
+
+ const notifications =
+ await api.notification.getNotificationsByWorkspace.query();
+
+ return (
+ <MonitorForm
+ defaultValues={{
+ ...monitor,
+ notifications: monitorNotifications?.map(({ id }) => id),
+ }}
+ plan={workspace?.plan}
+ notifications={notifications}
+ />
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx
new file mode 100644
index 000000000..48264a1ec
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx
@@ -0,0 +1,54 @@
+import { notFound } from "next/navigation";
+
+import { Header } from "@/components/dashboard/header";
+import { Navbar } from "@/components/dashboard/navbar";
+import { api } from "@/trpc/server";
+import { PauseButton } from "./_components/pause-button";
+
+export default async function Layout({
+ children,
+ params,
+}: {
+ children: React.ReactNode;
+ params: { workspaceSlug: string; id: string };
+}) {
+ const id = params.id;
+
+ const monitor = await api.monitor.getMonitorById.query({
+ id: Number(id),
+ });
+
+ if (!monitor) {
+ return notFound();
+ }
+
+ const navigation = [
+ {
+ label: "Overview",
+ href: `/app/${params.workspaceSlug}/monitors/${id}/overview`,
+ segment: "overview",
+ },
+ {
+ label: "Data Table",
+ href: `/app/${params.workspaceSlug}/monitors/${id}/data`,
+ segment: "data",
+ },
+ {
+ label: "Settings",
+ href: `/app/${params.workspaceSlug}/monitors/${id}/edit`,
+ segment: "edit",
+ },
+ ];
+
+ return (
+ <div className="grid grid-cols-1 gap-6 md:gap-8">
+ <Header
+ title={monitor.name}
+ description={monitor.url}
+ actions={<PauseButton monitor={monitor} />}
+ />
+ <Navbar className="col-span-full" navigation={navigation} />
+ {children}
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/chart-wrapper.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx
similarity index 72%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/chart-wrapper.tsx
rename to apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx
index 84b9689a4..ee74959f7 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/chart-wrapper.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx
@@ -1,19 +1,21 @@
"use client";
-import type { Ping, Region } from "@openstatus/tinybird";
+import type { Region, ResponseGraph } from "@openstatus/tinybird";
import { regionsDict } from "@openstatus/utils";
-import type { Period } from "../utils";
+import type { Period, Quantile } from "../../utils";
import { Chart } from "./chart";
export function ChartWrapper({
data,
period,
+ quantile,
}: {
- data: Ping[];
+ data: ResponseGraph[];
period: Period;
+ quantile: Quantile;
}) {
- const group = groupDataByTimestamp(data, period);
+ const group = groupDataByTimestamp(data, period, quantile);
return <Chart data={group.data} regions={group.regions} />;
}
/**
@@ -22,16 +24,21 @@ export function ChartWrapper({
* @param period
* @returns
*/
-function groupDataByTimestamp(data: Ping[], period: Period) {
+function groupDataByTimestamp(
+ data: ResponseGraph[],
+ period: Period,
+ quantile: Quantile,
+) {
let currentTimestamp = 0;
const regions: Record<string, null> = {};
const _data = data.reduce(
(acc, curr) => {
- const { cronTimestamp, latency, region } = curr;
+ const { timestamp, region } = curr;
+ const latency = curr[`${quantile}Latency`];
const { flag, code } = regionsDict[region];
const fullNameRegion = `${flag} ${code}`;
regions[fullNameRegion] = null; // to get the region keys
- if (cronTimestamp === currentTimestamp) {
+ if (timestamp === currentTimestamp) {
// overwrite last object in acc
const last = acc.pop();
if (last) {
@@ -40,11 +47,11 @@ function groupDataByTimestamp(data: Ping[], period: Period) {
[fullNameRegion]: latency,
});
}
- } else if (cronTimestamp) {
- currentTimestamp = cronTimestamp;
+ } else if (timestamp) {
+ currentTimestamp = timestamp;
// create new object in acc
acc.push({
- timestamp: renderTimestamp(cronTimestamp, period),
+ timestamp: renderTimestamp(timestamp, period),
[fullNameRegion]: latency,
});
}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/chart.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/chart.tsx
rename to apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsx
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx
new file mode 100644
index 000000000..0ab352b88
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/loading.tsx
@@ -0,0 +1,14 @@
+import { Skeleton } from "@openstatus/ui";
+
+export default function Loading() {
+ return (
+ <div className="grid gap-4">
+ <Skeleton className="h-5 w-40" />
+ <div className="flex flex-wrap items-center gap-2 sm:justify-end">
+ <Skeleton className="h-10 w-32" />
+ <Skeleton className="h-10 w-24" />
+ </div>
+ <Skeleton className="h-[396px] w-full" />
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx
new file mode 100644
index 000000000..f42f57050
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx
@@ -0,0 +1,102 @@
+import * as React from "react";
+import { notFound } from "next/navigation";
+import { endOfDay, startOfDay } from "date-fns";
+import * as z from "zod";
+
+import { StatusDot } from "@/components/monitor/status-dot";
+import { getResponseGraphData } from "@/lib/tb";
+import { api } from "@/trpc/server";
+import { DatePickerPreset } from "../_components/date-picker-preset";
+import { IntervalPreset } from "../_components/interval-preset";
+import { QuantilePreset } from "../_components/quantile-preset";
+import {
+ getDateByPeriod,
+ getMinutesByInterval,
+ intervals,
+ periods,
+ quantiles,
+} from "../utils";
+import { ChartWrapper } from "./_components/chart-wrapper";
+
+/**
+ * allowed URL search params
+ */
+const searchParamsSchema = z.object({
+ statusCode: z.coerce.number().optional(),
+ cronTimestamp: z.coerce.number().optional(),
+ quantile: z.enum(quantiles).optional().default("p95"),
+ interval: z.enum(intervals).optional().default("30m"),
+ period: z.enum(periods).optional().default("1d"),
+ fromDate: z.coerce
+ .number()
+ .optional()
+ .default(startOfDay(new Date()).getTime()),
+ toDate: z.coerce.number().optional().default(endOfDay(new Date()).getTime()),
+});
+
+export default async function Page({
+ params,
+ searchParams,
+}: {
+ params: { workspaceSlug: string; id: string };
+ searchParams: { [key: string]: string | string[] | undefined };
+}) {
+ const id = params.id;
+ const search = searchParamsSchema.safeParse(searchParams);
+
+ const monitor = await api.monitor.getMonitorById.query({
+ id: Number(id),
+ });
+
+ if (!monitor || !search.success) {
+ return notFound();
+ }
+
+ const date = getDateByPeriod(search.data.period);
+ const minutes = getMinutesByInterval(search.data.interval);
+
+ const data = await getResponseGraphData({
+ monitorId: id,
+ ...search.data,
+ /**
+ *
+ */
+ fromDate: date.from.getTime(),
+ toDate: date.to.getTime(),
+ interval: minutes,
+ });
+
+ if (!data) return null;
+
+ const { period, quantile, interval } = search.data;
+
+ return (
+ <div className="grid gap-4">
+ <div>
+ <p className="text-muted-foreground inline-flex items-center gap-2 text-sm">
+ <StatusDot status={monitor.status} active={monitor.active} />
+ <span>
+ {monitor.active
+ ? monitor.status === "active"
+ ? "up"
+ : "down"
+ : "pause"}{" "}
+ · checked every{" "}
+ <code className="text-foreground">{monitor.periodicity}</code>
+ </span>
+ </p>
+ </div>
+ <div className="flex flex-wrap items-center gap-2 sm:justify-end">
+ {/* IDEA: add tooltip for description */}
+ <DatePickerPreset period={period} />
+ <QuantilePreset quantile={quantile} />
+ <IntervalPreset interval={interval} />
+ </div>
+ <ChartWrapper period={period} quantile={quantile} data={data} />
+ <p className="text-muted-foreground text-center text-xs">
+ Select your preferred time range, percentile for insights, and time
+ interval for granular analysis.
+ </p>
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/page.tsx
new file mode 100644
index 000000000..2265f50db
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/page.tsx
@@ -0,0 +1,9 @@
+import { redirect } from "next/navigation";
+
+export default function Page({
+ params,
+}: {
+ params: { workspaceSlug: string; id: string };
+}) {
+ return redirect(`./${params.id}/overview`);
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts
new file mode 100644
index 000000000..4fde3beeb
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts
@@ -0,0 +1,55 @@
+import {
+ endOfDay,
+ endOfHour,
+ startOfDay,
+ startOfHour,
+ subDays,
+ subHours,
+} from "date-fns";
+
+export const periods = ["1h", "1d", "3d"] as const; // If neeeded (e.g. Pro plans), "7d", "30d"
+export const quantiles = ["p99", "p95", "p90", "p75", "avg"] as const;
+export const intervals = ["1m", "10m", "30m", "1h"] as const;
+
+export type Period = (typeof periods)[number];
+export type Quantile = (typeof quantiles)[number];
+export type Interval = (typeof intervals)[number];
+
+export function getDateByPeriod(period: Period) {
+ switch (period) {
+ case "1h":
+ return {
+ from: subHours(startOfHour(new Date()), 1),
+ to: endOfHour(new Date()),
+ };
+ case "1d":
+ return {
+ from: subDays(startOfHour(new Date()), 1),
+ to: endOfDay(new Date()),
+ };
+ case "3d":
+ return {
+ from: subDays(startOfDay(new Date()), 3),
+ to: endOfDay(new Date()),
+ };
+ default:
+ const _exhaustiveCheck: never = period;
+ throw new Error(`Unhandled period: ${_exhaustiveCheck}`);
+ }
+}
+
+export function getMinutesByInterval(interval: Interval) {
+ switch (interval) {
+ case "1m":
+ return 1;
+ case "10m":
+ return 10;
+ case "30m":
+ return 30;
+ case "1h":
+ return 60;
+ default:
+ const _exhaustiveCheck: never = interval;
+ throw new Error(`Unhandled interval: ${_exhaustiveCheck}`);
+ }
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/action-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/action-button.tsx
deleted file mode 100644
index e2ed3dbbf..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/action-button.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-"use client";
-
-import * as React from "react";
-import Link from "next/link";
-import { useRouter } from "next/navigation";
-import { MoreVertical } from "lucide-react";
-import type * as z from "zod";
-
-import type { insertMonitorSchema } from "@openstatus/db/src/schema";
-import {
- AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
- AlertDialogTrigger,
- Button,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@openstatus/ui";
-
-import { LoadingAnimation } from "@/components/loading-animation";
-import { useToastAction } from "@/hooks/use-toast-action";
-import { api } from "@/trpc/client";
-
-type Schema = z.infer<typeof insertMonitorSchema>;
-
-export function ActionButton(props: Schema & { workspaceSlug: string }) {
- const router = useRouter();
- const { toast } = useToastAction();
- const [alertOpen, setAlertOpen] = React.useState(false);
- const [isPending, startTransition] = React.useTransition();
-
- async function onDelete() {
- startTransition(async () => {
- try {
- if (!props.id) return;
- await api.monitor.delete.mutate({ id: props.id });
- toast("deleted");
- router.refresh();
- setAlertOpen(false);
- } catch {
- toast("error");
- }
- });
- }
-
- async function onTest() {
- startTransition(async () => {
- const { url, body, method, headers } = props;
- const res = await fetch(`/api/checker/test`, {
- method: "POST",
- headers: new Headers({
- "Content-Type": "application/json",
- }),
- body: JSON.stringify({ url, body, method, headers }),
- });
- if (res.ok) {
- toast("test-success");
- } else {
- toast("test-error");
- }
- });
- }
-
- return (
- <AlertDialog open={alertOpen} onOpenChange={(value) => setAlertOpen(value)}>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="ghost"
- className="data-[state=open]:bg-accent h-8 w-8 p-0"
- >
- <span className="sr-only">Open menu</span>
- <MoreVertical className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <Link href={`./monitors/edit?id=${props.id}`}>
- <DropdownMenuItem>Edit</DropdownMenuItem>
- </Link>
- <Link href={`/app/${props.workspaceSlug}/monitors/${props.id}/data`}>
- <DropdownMenuItem>View data</DropdownMenuItem>
- </Link>
- <DropdownMenuItem onClick={onTest}>Test endpoint</DropdownMenuItem>
- <AlertDialogTrigger asChild>
- <DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">
- Delete
- </DropdownMenuItem>
- </AlertDialogTrigger>
- </DropdownMenuContent>
- </DropdownMenu>
- <AlertDialogContent>
- <AlertDialogHeader>
- <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
- <AlertDialogDescription>
- This action cannot be undone. This will permanently delete the
- monitor.
- </AlertDialogDescription>
- </AlertDialogHeader>
- <AlertDialogFooter>
- <AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
- onClick={(e) => {
- e.preventDefault();
- onDelete();
- }}
- disabled={isPending}
- className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
- >
- {!isPending ? "Delete" : <LoadingAnimation />}
- </AlertDialogAction>
- </AlertDialogFooter>
- </AlertDialogContent>
- </AlertDialog>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/empty-state.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/empty-state.tsx
deleted file mode 100644
index 6cb840eee..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/_components/empty-state.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import Link from "next/link";
-
-import { Button } from "@openstatus/ui";
-
-import { EmptyState as DefaultEmptyState } from "@/components/dashboard/empty-state";
-
-export function EmptyState() {
- return (
- <DefaultEmptyState
- icon="activity"
- title="No monitors"
- description="Create your first monitor"
- action={
- <Button asChild>
- <Link href="./monitors/edit">Create</Link>
- </Button>
- }
- />
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/edit/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/edit/loading.tsx
deleted file mode 100644
index 41fdbbaa9..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/edit/loading.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Skeleton } from "@openstatus/ui";
-
-import { Header } from "@/components/dashboard/header";
-import { SkeletonForm } from "@/components/forms/skeleton-form";
-
-export default function Loading() {
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <div className="col-span-full flex w-full justify-between">
- <Header.Skeleton>
- <Skeleton className="h-9 w-20" />
- </Header.Skeleton>
- </div>
- <div className="col-span-full">
- <SkeletonForm />
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/edit/page.tsx
deleted file mode 100644
index 6e6f1aa55..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/edit/page.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { notFound } from "next/navigation";
-import * as z from "zod";
-
-import { Header } from "@/components/dashboard/header";
-import { MonitorForm } from "@/components/forms/monitor-form";
-import { api } from "@/trpc/server";
-
-/**
- * allowed URL search params
- */
-const searchParamsSchema = z.object({
- id: z.coerce.number().optional(),
-});
-
-export default async function EditPage({
- params,
- searchParams,
-}: {
- params: { workspaceSlug: string };
- searchParams: { [key: string]: string | string[] | undefined };
-}) {
- const search = searchParamsSchema.safeParse(searchParams);
-
- if (!search.success) {
- return notFound();
- }
-
- const { id } = search.data;
-
- const monitor = id
- ? await api.monitor.getMonitorById.query({ id })
- : undefined;
- const workspace = await api.workspace.getWorkspace.query();
-
- const monitorNotifications = id
- ? await api.monitor.getAllNotificationsForMonitor.query({
- id,
- })
- : [];
-
- const notifications =
- await api.notification.getNotificationsByWorkspace.query();
-
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <Header
- title="Monitor"
- description={monitor ? "Update your monitor" : "Create your monitor"}
- />
- <div className="col-span-full">
- <MonitorForm
- defaultValues={
- monitor
- ? {
- ...monitor,
- notifications: monitorNotifications?.map(({ id }) => id),
- }
- : undefined
- }
- plan={workspace?.plan}
- notifications={notifications}
- />
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/loading.tsx
deleted file mode 100644
index 5fab49f41..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/loading.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Skeleton } from "@openstatus/ui";
-
-import { Header } from "@/components/dashboard/header";
-import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";
-
-export default function Loading() {
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <div className="col-span-full flex w-full justify-between">
- <Header.Skeleton>
- <Skeleton className="h-9 w-20" />
- </Header.Skeleton>
- </div>
- <div className="col-span-full w-full">
- <DataTableSkeleton />
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/layout.tsx
new file mode 100644
index 000000000..5d98ef75a
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/layout.tsx
@@ -0,0 +1,14 @@
+import { Header } from "@/components/dashboard/header";
+
+export default async function Layout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ return (
+ <div className="grid gap-6 md:grid-cols-2 md:gap-8">
+ <Header title="Monitor" description="Create your monitor" />
+ <div className="col-span-full">{children}</div>
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/loading.tsx
new file mode 100644
index 000000000..b269200de
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/loading.tsx
@@ -0,0 +1,5 @@
+import { SkeletonForm } from "@/components/forms/skeleton-form";
+
+export default function Loading() {
+ return <SkeletonForm />;
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx
new file mode 100644
index 000000000..fc7c9750c
--- /dev/null
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx
@@ -0,0 +1,16 @@
+import { MonitorForm } from "@/components/forms/monitor-form";
+import { api } from "@/trpc/server";
+
+export default async function Page() {
+ const workspace = await api.workspace.getWorkspace.query();
+ const notifications =
+ await api.notification.getNotificationsByWorkspace.query();
+
+ return (
+ <MonitorForm
+ plan={workspace?.plan}
+ notifications={notifications}
+ nextUrl="./" // back to the overview page
+ />
+ );
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/page.tsx
deleted file mode 100644
index d80ba4391..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/page.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import * as React from "react";
-import Link from "next/link";
-
-import { allPlans } from "@openstatus/plans";
-import { ButtonWithDisableTooltip } from "@openstatus/ui";
-
-import { Header } from "@/components/dashboard/header";
-import { HelpCallout } from "@/components/dashboard/help-callout";
-import { Limit } from "@/components/dashboard/limit";
-import { columns } from "@/components/data-table/monitor/columns";
-import { DataTable } from "@/components/data-table/monitor/data-table";
-import { getResponseListData } from "@/lib/tb";
-import { api } from "@/trpc/server";
-import { EmptyState } from "./_components/empty-state";
-
-export default async function MonitorPage({
- params,
-}: {
- params: { workspaceSlug: string };
-}) {
- const monitors = await api.monitor.getMonitorsByWorkspace.query();
- const workspace = await api.workspace.getWorkspace.query();
-
- const isLimit =
- (monitors?.length || 0) >=
- allPlans[workspace?.plan || "free"].limits.monitors;
-
- async function getMonitorLastStatusCode(monitorId: string) {
- const ping = await getResponseListData({
- monitorId,
- limit: 1,
- });
- const lastStatusCode =
- ping && ping.length > 0 ? ping[0].statusCode : undefined;
- return lastStatusCode;
- }
-
- const lastStatusCodes = (
- await Promise.allSettled(
- monitors?.map((monitor) =>
- getMonitorLastStatusCode(String(monitor.id)),
- ) || [],
- )
- ).map((code) => (code.status === "fulfilled" ? code.value : undefined));
-
- return (
- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">
- <Header
- title="Monitors"
- description="Overview of all your monitors."
- actions={
- <ButtonWithDisableTooltip
- tooltip="You reached the limits"
- asChild={!isLimit}
- disabled={isLimit}
- >
- <Link href="./monitors/edit">Create</Link>
- </ButtonWithDisableTooltip>
- }
- />
- {Boolean(monitors?.length) ? (
- <div className="col-span-full">
- {monitors && (
- <DataTable
- columns={columns}
- data={monitors.map((_, i) => ({
- ..._,
- lastStatusCode: lastStatusCodes[i],
- }))}
- />
- )}
- </div>
- ) : (
- <div className="col-span-full">
- <EmptyState />
- <div className="mt-3">{isLimit ? <Limit /> : null}</div>
- </div>
- )}
- <div className="mt-8 md:mt-12">
- <HelpCallout />
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx b/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx
index 689f679c4..f9b678302 100644
--- a/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/onboarding/page.tsx
@@ -1,6 +1,5 @@
import Link from "next/link";
-import { notFound } from "next/navigation";
-import * as z from "zod";
+import { redirect } from "next/navigation";
import { Button } from "@openstatus/ui";
@@ -10,35 +9,19 @@ import { StatusPageForm } from "@/components/forms/status-page-form";
import { api } from "@/trpc/server";
import { Description } from "./_components/description";
-/**
- * allowed URL search params
- */
-const searchParamsSchema = z.object({
- id: z.coerce.number().optional(), // monitorId
-});
-
export default async function Onboarding({
params,
- searchParams,
}: {
params: { workspaceSlug: string };
- searchParams: { [key: string]: string | string[] | undefined };
}) {
- const search = searchParamsSchema.safeParse(searchParams);
const { workspaceSlug } = params;
- if (!search.success) {
- return notFound();
- }
-
- // Instead of having the workspaceSlug in the search params, we can get it from the auth user
- const { id: monitorId } = search.data;
-
const allMonitors = await api.monitor.getMonitorsByWorkspace.query();
+ const allPages = await api.page.getPagesByWorkspace.query();
const allNotifications =
await api.notification.getNotificationsByWorkspace.query();
- if (!monitorId) {
+ if (allMonitors.length === 0) {
return (
<div className="flex h-full w-full flex-col gap-6 md:gap-8">
<Header
@@ -62,29 +45,33 @@ export default async function Onboarding({
);
}
- return (
- <div className="flex h-full w-full flex-col gap-6 md:gap-8">
- <Header
- title="Get Started"
- description="Create your first status page."
- actions={
- <Button variant="link" className="text-muted-foreground">
- <Link href={`/app/${workspaceSlug}/monitors`}>Skip</Link>
- </Button>
- }
- />
- <div className="grid h-full w-full gap-6 md:grid-cols-3 md:gap-8">
- <div className="md:col-span-2">
- <StatusPageForm
- {...{ workspaceSlug, allMonitors }}
- nextUrl={`/app/${workspaceSlug}/status-pages`}
- checkAllMonitors
- />
- </div>
- <div className="hidden h-full md:col-span-1 md:block">
- <Description step="status-page" />
+ if (allPages.length === 0) {
+ return (
+ <div className="flex h-full w-full flex-col gap-6 md:gap-8">
+ <Header
+ title="Get Started"
+ description="Create your first status page."
+ actions={
+ <Button variant="link" className="text-muted-foreground">
+ <Link href={`/app/${workspaceSlug}/monitors`}>Skip</Link>
+ </Button>
+ }
+ />
+ <div className="grid h-full w-full gap-6 md:grid-cols-3 md:gap-8">
+ <div className="md:col-span-2">
+ <StatusPageForm
+ {...{ workspaceSlug, allMonitors }}
+ nextUrl={`/app/${workspaceSlug}/status-pages`}
+ checkAllMonitors
+ />
+ </div>
+ <div className="hidden h-full md:col-span-1 md:block">
+ <Description step="status-page" />
+ </div>
</div>
</div>
- </div>
- );
+ );
+ }
+
+ return redirect(`/app/${workspaceSlug}/monitors`);
}
diff --git a/apps/web/src/app/play/page.tsx b/apps/web/src/app/play/page.tsx
index 55da07916..7623a7f81 100644
--- a/apps/web/src/app/play/page.tsx
+++ b/apps/web/src/app/play/page.tsx
@@ -1,4 +1,3 @@
-import { notFound } from "next/navigation";
import * as z from "zod";
import { Label } from "@openstatus/ui";
@@ -8,8 +7,6 @@ import { getHomeMonitorListData } from "@/lib/tb";
import { convertTimezoneToGMT, getRequestHeaderTimezone } from "@/lib/timezone";
import { TimezoneCombobox } from "./_components/timezone-combobox";
-const supportedTimezones = Intl.supportedValuesOf("timeZone");
-
/**
* allowed URL search params
*/
@@ -25,18 +22,9 @@ export default async function PlayPage({
const search = searchParamsSchema.safeParse(searchParams);
const requestTimezone = getRequestHeaderTimezone();
- if (!search.success) {
- return notFound();
- }
-
- if (
- search.data.timezone &&
- !supportedTimezones.includes(search.data.timezone)
- ) {
- return notFound();
- }
+ const timezone = search.success ? search.data.timezone : undefined;
- const gmt = convertTimezoneToGMT(search.data.timezone);
+ const gmt = convertTimezoneToGMT(timezone);
const data = await getHomeMonitorListData({ timezone: gmt });
@@ -63,7 +51,7 @@ export default async function PlayPage({
<div className="grid items-center gap-1">
<Label className="text-muted-foreground text-xs">Timezone</Label>
<TimezoneCombobox
- defaultValue={search.data.timezone || requestTimezone || undefined}
+ defaultValue={timezone || requestTimezone || undefined}
/>
</div>
</div>
diff --git a/apps/web/src/components/dashboard/navbar.tsx b/apps/web/src/components/dashboard/navbar.tsx
index 11c89e75a..a3e4090ec 100644
--- a/apps/web/src/components/dashboard/navbar.tsx
+++ b/apps/web/src/components/dashboard/navbar.tsx
@@ -9,6 +9,7 @@ import { Separator } from "@openstatus/ui";
import { cn } from "@/lib/utils";
type Props = {
+ // TODO: add disabled state for pro/hobby plan users
navigation: { label: string; href: string; segment: string | null }[];
className?: string;
};
diff --git a/apps/web/src/components/data-table/monitor/columns.tsx b/apps/web/src/components/data-table/monitor/columns.tsx
index 253b2e263..3911048f9 100644
--- a/apps/web/src/components/data-table/monitor/columns.tsx
+++ b/apps/web/src/components/data-table/monitor/columns.tsx
@@ -2,42 +2,28 @@
import Link from "next/link";
import type { ColumnDef } from "@tanstack/react-table";
-import * as z from "zod";
import type { Monitor } from "@openstatus/db/src/schema";
import { Badge } from "@openstatus/ui";
-import { DataTableStatusBadge } from "../data-table-status-badge";
+import { StatusDot } from "@/components/monitor/status-dot";
import { DataTableRowActions } from "./data-table-row-actions";
-export const columns: ColumnDef<
- Monitor & { lastStatusCode?: number | null }
->[] = [
+export const columns: ColumnDef<Monitor>[] = [
{
accessorKey: "name",
header: "Name",
cell: ({ row }) => {
- const active = row.getValue("active");
+ const { active, status } = row.original;
return (
- // TODO: add Link on click when we have a better details page
<Link
- href={`./monitors/${row.original.id}/data`}
+ href={`./monitors/${row.original.id}/overview`}
className="group flex items-center gap-2"
>
- {active ? (
- <span className="relative flex h-2 w-2">
- <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500/80 opacity-75 duration-1000" />
- <span className="relative inline-flex h-2 w-2 rounded-full bg-green-500" />
- </span>
- ) : (
- <span className="relative flex h-2 w-2">
- <span className="absolute inline-flex h-2 w-2 rounded-full bg-red-500" />
- </span>
- )}
+ <StatusDot active={active} status={status} />
<span className="max-w-[125px] truncate group-hover:underline">
{row.getValue("name")}
</span>
- {!active ? <Badge variant="outline">paused</Badge> : null}
</Link>
);
},
@@ -56,29 +42,27 @@ export const columns: ColumnDef<
},
},
{
- // hidden by `columnVisibility` in `data-table.tsx` but used via row.getValue("active")
- accessorKey: "active",
- header: "Active",
+ accessorKey: "description",
+ header: "Description",
cell: ({ row }) => {
- const active = row.getValue("active");
- if (!active) {
- return <span className="text-muted-foreground">paused</span>;
- }
- return <span>running</span>;
+ return (
+ <div className="flex">
+ <span className="text-muted-foreground max-w-[150px] truncate sm:max-w-[200px] lg:max-w-[250px] xl:max-w-[350px]">
+ {row.getValue("description") || "-"}
+ </span>
+ </div>
+ );
},
},
{
- accessorKey: "lastStatusCode",
- header: "Last Status",
+ accessorKey: "status",
+ header: "Status",
cell: ({ row }) => {
- const lastStatusCode = row.getValue("lastStatusCode");
- const statusCode = z.number().nullable().optional().parse(lastStatusCode);
-
- if (statusCode === undefined) {
- return <span className="text-muted-foreground">Missing</span>;
- }
+ const { active, status } = row.original;
- return <DataTableStatusBadge {...{ statusCode }} />;
+ if (!active) return <Badge variant="secondary">pause</Badge>;
+ if (status === "error") return <Badge variant="destructive">down</Badge>;
+ return <Badge variant="outline">up</Badge>;
},
},
{
diff --git a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
index 562b8a544..b27d5e233 100644
--- a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
@@ -104,10 +104,10 @@ export function DataTableRowActions<TData>({
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
- <Link href={`./monitors/edit?id=${monitor.id}`}>
+ <Link href={`./monitors/${monitor.id}/edit`}>
<DropdownMenuItem>Edit</DropdownMenuItem>
</Link>
- <Link href={`./monitors/${monitor.id}/data`}>
+ <Link href={`./monitors/${monitor.id}/overview`}>
<DropdownMenuItem>Details</DropdownMenuItem>
</Link>
<DropdownMenuSeparator />
diff --git a/apps/web/src/components/data-table/monitor/data-table.tsx b/apps/web/src/components/data-table/monitor/data-table.tsx
index 3043f47f0..fbfabd020 100644
--- a/apps/web/src/components/data-table/monitor/data-table.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table.tsx
@@ -1,7 +1,7 @@
"use client";
import * as React from "react";
-import type { ColumnDef, VisibilityState } from "@tanstack/react-table";
+import type { ColumnDef } from "@tanstack/react-table";
import {
flexRender,
getCoreRowModel,
@@ -29,19 +29,10 @@ export function DataTable<TData, TValue>({
columns,
data,
}: DataTableProps<TData, TValue>) {
- const [columnVisibility, setColumnVisibility] =
- React.useState<VisibilityState>({ active: false });
const table = useReactTable({
data,
columns,
- state: { columnVisibility },
- onColumnVisibilityChange: setColumnVisibility,
getCoreRowModel: getCoreRowModel(),
- // defaultColumn: {
- // minSize: 0,
- // size: Number.MAX_SAFE_INTEGER,
- // maxSize: Number.MAX_SAFE_INTEGER,
- // },
});
return (
@@ -52,16 +43,7 @@ export function DataTable<TData, TValue>({
<TableRow key={headerGroup.id} className="hover:bg-transparent">
{headerGroup.headers.map((header) => {
return (
- <TableHead
- key={header.id}
- // className="max-w-0 truncate sm:max-w-full"
- // style={{
- // width:
- // header.getSize() === Number.MAX_SAFE_INTEGER
- // ? "auto"
- // : header.getSize(),
- // }}
- >
+ <TableHead key={header.id}>
{header.isPlaceholder
? null
: flexRender(
@@ -82,16 +64,7 @@ export function DataTable<TData, TValue>({
data-state={row.getIsSelected() && "selected"}
>
{row.getVisibleCells().map((cell) => (
- <TableCell
- key={cell.id}
- // className="max-w-0 truncate md:max-w-full"
- // style={{
- // width:
- // cell.column.getSize() === Number.MAX_SAFE_INTEGER
- // ? "auto"
- // : cell.column.getSize(),
- // }}
- >
+ <TableCell key={cell.id}>
{flexRender(cell.column.columnDef.cell, cell.getContext())}
</TableCell>
))}
diff --git a/apps/web/src/components/forms/monitor-form.tsx b/apps/web/src/components/forms/monitor-form.tsx
index 35e7f96f7..c46615a78 100644
--- a/apps/web/src/components/forms/monitor-form.tsx
+++ b/apps/web/src/components/forms/monitor-form.tsx
@@ -65,7 +65,6 @@ import { flyRegionsDict } from "@openstatus/utils";
import { LoadingAnimation } from "@/components/loading-animation";
import { FailedPingAlertConfirmation } from "@/components/modals/failed-ping-alert-confirmation";
import { useToastAction } from "@/hooks/use-toast-action";
-import useUpdateSearchParams from "@/hooks/use-update-search-params";
import { cn } from "@/lib/utils";
import { api } from "@/trpc/client";
import type { Writeable } from "@/types/utils";
@@ -83,12 +82,14 @@ interface Props {
defaultValues?: InsertMonitor;
plan?: WorkspacePlan;
notifications?: Notification[];
+ nextUrl?: string;
}
export function MonitorForm({
defaultValues,
plan = "free",
notifications,
+ nextUrl,
}: Props) {
const form = useForm<InsertMonitor>({
resolver: zodResolver(insertMonitorSchema),
@@ -116,7 +117,6 @@ export function MonitorForm({
const [openDialog, setOpenDialog] = React.useState(false);
const { toast } = useToastAction();
const watchMethod = form.watch("method");
- const updateSearchParams = useUpdateSearchParams();
const { fields, append, remove } = useFieldArray({
name: "headers",
@@ -128,9 +128,10 @@ export function MonitorForm({
if (defaultValues) {
await api.monitor.update.mutate(props);
} else {
- const monitor = await api.monitor.create.mutate(props);
- const id = monitor?.id || null;
- router.replace(`?${updateSearchParams({ id })}`);
+ await api.monitor.create.mutate(props);
+ }
+ if (nextUrl) {
+ router.push(nextUrl);
}
router.refresh();
toast("saved");
diff --git a/apps/web/src/components/layout/app-link.tsx b/apps/web/src/components/layout/app-link.tsx
new file mode 100644
index 000000000..0948b04ed
--- /dev/null
+++ b/apps/web/src/components/layout/app-link.tsx
@@ -0,0 +1,62 @@
+"use client";
+
+import Link from "next/link";
+import type { LinkProps } from "next/link";
+import { useSelectedLayoutSegment } from "next/navigation";
+import { cva } from "class-variance-authority";
+
+import { cn } from "@/lib/utils";
+import type { ValidIcon } from "../icons";
+import { Icons } from "../icons";
+
+const linkVariants = cva(
+ "text-muted-foreground group flex w-full min-w-[200px] items-center rounded-md border px-3 py-1",
+ {
+ variants: {
+ variant: {
+ default: "hover:bg-muted/50 hover:text-foreground border-transparent",
+ active: "bg-muted/50 border-border text-foreground",
+ disabled: "pointer-events-none opacity-60",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ },
+ },
+);
+
+interface AppLinkProps extends LinkProps {
+ label: string;
+ segment?: string | null;
+ icon?: ValidIcon;
+ className?: string;
+ disabled?: boolean;
+}
+
+export function AppLink({
+ label,
+ href,
+ icon,
+ disabled,
+ className,
+ segment,
+ ...props
+}: AppLinkProps) {
+ const selectedSegment = useSelectedLayoutSegment();
+ const Icon = icon && Icons[icon];
+
+ const isActive = segment === selectedSegment;
+ const variant = disabled ? "disabled" : isActive ? "active" : "default";
+
+ return (
+ <Link
+ href={href}
+ className={cn(linkVariants({ variant, className }))}
+ aria-disabled={disabled}
+ {...props}
+ >
+ {Icon ? <Icon className={cn("mr-2 h-4 w-4")} /> : null}
+ {label}
+ </Link>
+ );
+}
diff --git a/apps/web/src/components/layout/app-menu.tsx b/apps/web/src/components/layout/app-menu.tsx
index 89ac13cb7..0a1a95cd9 100644
--- a/apps/web/src/components/layout/app-menu.tsx
+++ b/apps/web/src/components/layout/app-menu.tsx
@@ -31,11 +31,13 @@ export function AppMenu() {
<Menu className="h-6 w-6" />
</Button>
</SheetTrigger>
- <SheetContent>
+ <SheetContent side="top" className="flex flex-col">
<SheetHeader>
- <SheetTitle className="text-left">Navigation</SheetTitle>
+ <SheetTitle className="ml-2 text-left">Menu</SheetTitle>
</SheetHeader>
- <AppSidebar />
+ <div className="flex-1">
+ <AppSidebar />
+ </div>
</SheetContent>
</Sheet>
);
diff --git a/apps/web/src/components/layout/app-sidebar.tsx b/apps/web/src/components/layout/app-sidebar.tsx
index ac0c48581..ff277491e 100644
--- a/apps/web/src/components/layout/app-sidebar.tsx
+++ b/apps/web/src/components/layout/app-sidebar.tsx
@@ -1,45 +1,34 @@
"use client";
-import Link from "next/link";
-import { useParams, usePathname } from "next/navigation";
-
-import type { Workspace } from "@openstatus/db/src/schema";
+import { useParams } from "next/navigation";
import { pagesConfig } from "@/config/pages";
-import { cn } from "@/lib/utils";
import { ProBanner } from "../billing/pro-banner";
-import { Icons } from "../icons";
import { SelectWorkspace } from "../workspace/select-workspace";
+import { AppLink } from "./app-link";
export function AppSidebar() {
- const pathname = usePathname();
const params = useParams();
return (
<div className="flex h-full flex-col justify-between gap-6">
<ul className="grid gap-1">
{pagesConfig.map(({ title, href, icon, disabled }) => {
- const Icon = Icons[icon];
- const link = `/app/${params?.workspaceSlug}${href}`;
- const isActive = pathname?.startsWith(link);
return (
<li key={title} className="w-full">
- <Link
- href={link}
- className={cn(
- "hover:bg-muted/50 hover:text-foreground text-muted-foreground group flex w-full min-w-[200px] items-center rounded-md border border-transparent px-3 py-1",
- isActive && "bg-muted/50 border-border text-foreground", // font-semibold
- disabled && "pointer-events-none opacity-60",
- )}
- >
- <Icon className={cn("mr-2 h-4 w-4")} />
- {title}
- </Link>
+ <AppLink
+ label={title}
+ href={`/app/${params?.workspaceSlug}${href}`}
+ disabled={disabled}
+ segment={href.replace("/", "")}
+ icon={icon}
+ />
</li>
);
})}
</ul>
<ul className="grid gap-2">
+ {/* <li className="w-full">Help & Support</li> */}
<li className="w-full">
<ProBanner />
</li>
diff --git a/apps/web/src/components/layout/marketing-menu.tsx b/apps/web/src/components/layout/marketing-menu.tsx
index 41c1f7042..dbb03e3f0 100644
--- a/apps/web/src/components/layout/marketing-menu.tsx
+++ b/apps/web/src/components/layout/marketing-menu.tsx
@@ -1,9 +1,8 @@
"use client";
import * as React from "react";
-import Link from "next/link";
import { usePathname, useSearchParams } from "next/navigation";
-import { ArrowUpRight, Menu } from "lucide-react";
+import { Menu } from "lucide-react";
import {
Button,
@@ -14,12 +13,12 @@ import {
SheetTrigger,
} from "@openstatus/ui";
-import { cn } from "@/lib/utils";
+import { AppLink } from "./app-link";
const pages = [
- { href: "/changelog", title: "Changelog" },
- { href: "/blog", title: "Blog" },
- { href: "https://docs.openstatus.dev", title: "Docs" },
+ { href: "/changelog", label: "Changelog", segment: "changelog" },
+ { href: "/blog", label: "Blog", segment: "blog" },
+ { href: "https://docs.openstatus.dev", label: "Documentation" },
];
export function MarketingMenu() {
@@ -43,39 +42,36 @@ export function MarketingMenu() {
<Menu className="h-6 w-6" />
</Button>
</SheetTrigger>
- <SheetContent>
+ <SheetContent side="top" className="flex flex-col">
<SheetHeader>
<SheetTitle className="ml-2 text-left">Menu</SheetTitle>
</SheetHeader>
- <ul className="mt-4 grid gap-1">
- {pages.map(({ href, title }) => {
- const isActive = pathname?.startsWith(href);
- const isExternal = href.startsWith("http");
- const externalProps = isExternal
- ? {
- target: "_blank",
- rel: "noreferrer",
- }
- : {};
- return (
- <li key={href} className="-ml-1 w-full">
- <Link
- href={href}
- className={cn(
- "hover:bg-muted/50 hover:text-foreground text-muted-foreground group inline-flex w-full min-w-[200px] items-center rounded-md border border-transparent px-3 py-1",
- isActive && "bg-muted/50 border-border text-foreground",
- )}
- {...externalProps}
- >
- {title}
- {isExternal ? (
- <ArrowUpRight className="ml-1 h-4 w-4 flex-shrink-0" />
- ) : null}
- </Link>
- </li>
- );
- })}
- </ul>
+ <div className="flex flex-1 flex-col justify-between gap-4">
+ <ul className="grid gap-1">
+ {pages.map(({ href, label, segment }) => {
+ const isExternal = href.startsWith("http");
+ const externalProps = isExternal ? { target: "_blank" } : {};
+ return (
+ <li key={href} className="w-full">
+ <AppLink
+ href={href}
+ label={label}
+ segment={segment}
+ {...externalProps}
+ />
+ </li>
+ );
+ })}
+ </ul>
+ <ul className="grid gap-1">
+ <li className="w-full">
+ <AppLink href="/github" label="GitHub" icon="github" />
+ </li>
+ <li className="w-full">
+ <AppLink href="/discord" label="Discord" icon="discord" />
+ </li>
+ </ul>
+ </div>
</SheetContent>
</Sheet>
);
diff --git a/apps/web/src/components/monitor/status-dot.tsx b/apps/web/src/components/monitor/status-dot.tsx
new file mode 100644
index 000000000..2d7928de4
--- /dev/null
+++ b/apps/web/src/components/monitor/status-dot.tsx
@@ -0,0 +1,26 @@
+import type { Monitor } from "@openstatus/db/src/schema";
+
+export function StatusDot({
+ active,
+ status,
+}: Pick<Monitor, "active" | "status">) {
+ if (!active) {
+ return (
+ <span className="relative flex h-2 w-2">
+ <span className="absolute inline-flex h-2 w-2 rounded-full bg-orange-500" />
+ </span>
+ );
+ }
+
+ return status === "active" ? (
+ <span className="relative flex h-2 w-2">
+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500/80 opacity-75 duration-1000" />
+ <span className="relative inline-flex h-2 w-2 rounded-full bg-green-500" />
+ </span>
+ ) : (
+ <span className="relative flex h-2 w-2">
+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-red-500/80 opacity-75 duration-1000" />
+ <span className="absolute inline-flex h-2 w-2 rounded-full bg-red-500" />
+ </span>
+ );
+}
diff --git a/apps/web/src/components/tracker.tsx b/apps/web/src/components/tracker.tsx
index a03756c5a..adf095a55 100644
--- a/apps/web/src/components/tracker.tsx
+++ b/apps/web/src/components/tracker.tsx
@@ -154,6 +154,7 @@ const Bar = ({
count,
ok,
avgLatency,
+ p95Latency,
day,
blacklist,
context,
@@ -212,11 +213,12 @@ const Bar = ({
))}
</ul>
<div className="flex justify-between">
- <p className="text-xs font-light">
+ <p className="text-xs">
{format(new Date(cronTimestamp), dateFormat)}
</p>
- <p className="text-muted-foreground text-xs">
- avg. <span className="font-mono">{avgLatency}ms</span>
+ <p className="text-muted-foreground text-xs font-light">
+ p95{" "}
+ <span className="font-mono font-medium">{p95Latency}ms</span>
</p>
</div>
<Separator className="my-1.5" />
diff --git a/apps/web/src/content/changelog/latency-quantiles.mdx b/apps/web/src/content/changelog/latency-quantiles.mdx
new file mode 100644
index 000000000..926066542
--- /dev/null
+++ b/apps/web/src/content/changelog/latency-quantiles.mdx
@@ -0,0 +1,16 @@
+---
+title: Latency quantiles
+description: Refine response time analysis with precision using quantiles.
+image: /assets/changelog/latency-quantiles.png
+publishedAt: 2024-01-04
+---
+
+You can now refine your latency data more effectively with quantiles: `p99`,
+`p95`, `p90`, and `p75`. The average (`avg`) has been retained.
+
+The `<Tracker />` data on your status pages now displays the `p95` quantile
+instead of the average.
+
+Furthermore, the `/monitors` layout has been updated. The data table has its
+dedicated tab to prevent loading excessive data at once, along with the edit
+form. The pause button is also now more quickly accessible.
diff --git a/apps/web/src/lib/tb.ts b/apps/web/src/lib/tb.ts
index 011abd641..afea4225c 100644
--- a/apps/web/src/lib/tb.ts
+++ b/apps/web/src/lib/tb.ts
@@ -1,12 +1,14 @@
import type {
HomeStatsParams,
MonitorListParams,
+ ResponseGraphParams,
ResponseListParams,
} from "@openstatus/tinybird";
import {
getHomeMonitorList,
getHomeStats,
getMonitorList,
+ getResponseGraph,
getResponseList,
Tinybird,
} from "@openstatus/tinybird";
@@ -58,3 +60,15 @@ export async function getHomeStatsData(props: Partial<HomeStatsParams>) {
}
return;
}
+
+export async function getResponseGraphData(
+ props: Partial<ResponseGraphParams>,
+) {
+ try {
+ const res = await getResponseGraph(tb)(props);
+ return res.data;
+ } catch (e) {
+ console.error(e);
+ }
+ return;
+}
diff --git a/apps/web/src/lib/timezone.ts b/apps/web/src/lib/timezone.ts
index 5d7dfff74..31f1d11b0 100644
--- a/apps/web/src/lib/timezone.ts
+++ b/apps/web/src/lib/timezone.ts
@@ -12,7 +12,7 @@ export function getRequestHeaderTimezone() {
return requestTimezone;
}
-export function convertTimezoneToGMT(timezone?: string) {
+export function convertTimezoneToGMT(defaultTimezone?: string) {
const requestTimezone = getRequestHeaderTimezone();
/**
@@ -20,9 +20,11 @@ export function convertTimezoneToGMT(timezone?: string) {
*/
const clientTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
- const msOffset = getTimezoneOffset(
- timezone || requestTimezone || clientTimezone,
- );
+ const timezone = defaultTimezone || requestTimezone || clientTimezone;
+
+ if (!supportedTimezones.includes(timezone)) return "Etc/UTC";
+
+ const msOffset = getTimezoneOffset(timezone);
if (isNaN(msOffset)) return "Etc/UTC";
diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.ts
index 43860070c..764c8cd4e 100644
--- a/packages/api/src/router/monitor.ts
+++ b/packages/api/src/router/monitor.ts
@@ -309,4 +309,15 @@ export const monitorRouter = createTRPCRouter({
.all();
return data.map((d) => selectNotificationSchema.parse(d.notification));
}),
+
+ isMonitorLimitReached: protectedProcedure.query(async (opts) => {
+ const monitorLimit = allPlans[opts.ctx.workspace.plan].limits.monitors;
+ const monitorNumbers = (
+ await opts.ctx.db.query.monitor.findMany({
+ where: eq(monitor.workspaceId, opts.ctx.workspace.id),
+ })
+ ).length;
+
+ return monitorNumbers >= monitorLimit;
+ }),
});
diff --git a/packages/tinybird/pipes/response_graph.pipe b/packages/tinybird/pipes/response_graph.pipe
new file mode 100644
index 000000000..a56213a44
--- /dev/null
+++ b/packages/tinybird/pipes/response_graph.pipe
@@ -0,0 +1,27 @@
+VERSION 0
+
+NODE response_graph_0
+SQL >
+
+ %
+ SELECT
+ region,
+ toStartOfInterval(
+ toDateTime(cronTimestamp / 1000),
+ INTERVAL {{ Int64(interval, 30) }} MINUTE
+ ) as h,
+ toUnixTimestamp64Milli(toDateTime64(h, 3)) as timestamp,
+ round(avg(latency)) as avgLatency,
+ round(quantile(0.75)(latency)) as p75Latency,
+ round(quantile(0.9)(latency)) as p90Latency,
+ round(quantile(0.95)(latency)) as p95Latency,
+ round(quantile(0.99)(latency)) as p99Latency
+ FROM materialized_view_ping_response_3d
+ WHERE
+ monitorId = {{ String(monitorId, '1') }}
+ {% if defined(fromDate) %} AND timestamp >= {{ Int64(fromDate) }} {% end %}
+ {% if defined(toDate) %} AND timestamp <= {{ Int64(toDate) }} {% end %}
+ GROUP BY h, region
+ ORDER BY h DESC
+
+
diff --git a/packages/tinybird/pipes/status_timezone.pipe b/packages/tinybird/pipes/status_timezone.pipe
index 2a22e5103..9b6a7dfea 100644
--- a/packages/tinybird/pipes/status_timezone.pipe
+++ b/packages/tinybird/pipes/status_timezone.pipe
@@ -1,4 +1,4 @@
-VERSION 0
+VERSION 1
DESCRIPTION >
TODO: descripe what it is for!
@@ -10,24 +10,16 @@ SQL >
%
SELECT
toDateTime(cronTimestamp / 1000, 'UTC') AS day,
- -- only for debugging purposes
- toTimezone(day, {{ String(timezone, 'Europe/Berlin') }}) as with_timezone,
+ toTimezone(day, {{ String(timezone, 'Europe/London') }}) as with_timezone,
toStartOfDay(with_timezone) as start_of_day,
- avg(latency) AS avgLatency,
- count() AS count,
- count(multiIf((statusCode >= 200) AND (statusCode <= 299), 1, NULL)) AS ok
+ statusCode,
+ latency
FROM ping_response__v5
- WHERE
- (day IS NOT NULL)
- AND (day != 0)
- AND monitorId = {{ String(monitorId, '1') }}
- -- By default, we only only query the last 45 days
+ WHERE monitorId = {{ String(monitorId, '1') }}
+ -- by default, we only query the last 45 days
AND cronTimestamp >= toUnixTimestamp64Milli(
toDateTime64(toStartOfDay(date_sub(DAY, 45, now())), 3)
)
- GROUP BY cronTimestamp, monitorId
- ORDER BY day DESC
-
NODE group_by_day
@@ -36,19 +28,21 @@ SQL >
%
SELECT
start_of_day as day,
- sum(count) as count,
- sum(ok) as ok,
- round(avg(avgLatency)) as avgLatency
+ count() AS count,
+ count(multiIf((statusCode >= 200) AND (statusCode <= 299), 1, NULL)) AS ok,
+ round(avg(latency)) as avgLatency,
+ round(quantile(0.75)(latency)) as p75Latency,
+ round(quantile(0.9)(latency)) as p90Latency,
+ round(quantile(0.95)(latency)) as p95Latency,
+ round(quantile(0.99)(latency)) as p99Latency
FROM group_by_cronTimestamp
GROUP BY start_of_day
- -- ORDER BY start_of_day DESC WITH FILL STEP INTERVAL -1 DAY
ORDER BY start_of_day
WITH FILL
FROM
- toStartOfDay(toTimezone(now(), {{ String(timezone, 'Europe/Berlin') }}))
+ toStartOfDay(toTimezone(now(), {{ String(timezone, 'Europe/London') }}))
TO toStartOfDay(
- toTimezone(date_sub(DAY, 46, now()), {{ String(timezone, 'Europe/Berlin') }})
+ toTimezone(date_sub(DAY, 46, now()), {{ String(timezone, 'Europe/London') }})
) STEP INTERVAL -1 DAY
- LIMIT {{ Int32(limit, 100) }}
diff --git a/packages/tinybird/src/client.ts b/packages/tinybird/src/client.ts
index b592674c2..41eda4ccf 100644
--- a/packages/tinybird/src/client.ts
+++ b/packages/tinybird/src/client.ts
@@ -4,11 +4,13 @@ import {
tbBuildHomeStats,
tbBuildMonitorList,
tbBuildPublicStatus,
+ tbBuildResponseGraph,
tbBuildResponseList,
tbIngestPingResponse,
tbParameterHomeStats,
tbParameterMonitorList,
tbParameterPublicStatus,
+ tbParameterResponseGraph,
tbParameterResponseList,
} from "./validation";
@@ -26,15 +28,26 @@ export function getResponseList(tb: Tinybird) {
parameters: tbParameterResponseList,
data: tbBuildResponseList,
opts: {
- // cache: "no-store",
+ // cache: "default",
revalidate: 600, // 10 min cache
},
});
}
+export function getResponseGraph(tb: Tinybird) {
+ return tb.buildPipe({
+ pipe: "response_graph__v0",
+ parameters: tbParameterResponseGraph,
+ data: tbBuildResponseGraph,
+ opts: {
+ revalidate: 60, // 1 min cache
+ },
+ });
+}
+
export function getMonitorList(tb: Tinybird) {
return tb.buildPipe({
- pipe: "status_timezone__v0",
+ pipe: "status_timezone__v1",
parameters: tbParameterMonitorList,
data: tbBuildMonitorList,
opts: {
@@ -51,7 +64,7 @@ export function getMonitorList(tb: Tinybird) {
*/
export function getHomeMonitorList(tb: Tinybird) {
return tb.buildPipe({
- pipe: "status_timezone__v0",
+ pipe: "status_timezone__v1",
parameters: tbParameterMonitorList,
data: tbBuildMonitorList,
opts: {
diff --git a/packages/tinybird/src/validation.ts b/packages/tinybird/src/validation.ts
index ef45a19b3..c8a864fce 100644
--- a/packages/tinybird/src/validation.ts
+++ b/packages/tinybird/src/validation.ts
@@ -44,6 +44,29 @@ export const tbParameterResponseList = z.object({
cronTimestamp: z.number().int().optional(),
});
+/**
+ * Values from pipe response_graph
+ */
+export const tbBuildResponseGraph = z.object({
+ region: z.enum(availableRegions),
+ timestamp: z.number().int(),
+ avgLatency: z.number().int(),
+ p75Latency: z.number().int(),
+ p90Latency: z.number().int(),
+ p95Latency: z.number().int(),
+ p99Latency: z.number().int(),
+});
+
+/**
+ * Params for pipe response_graph
+ */
+export const tbParameterResponseGraph = z.object({
+ monitorId: z.string().default(""),
+ interval: z.number().int().default(10),
+ fromDate: z.number().int().default(0),
+ toDate: z.number().int().optional(),
+});
+
/**
* Params for pipe status_timezone
*/
@@ -60,6 +83,10 @@ export const tbBuildMonitorList = z.object({
count: z.number().int(),
ok: z.number().int(),
avgLatency: z.number().int(),
+ p75Latency: z.number().int(),
+ p90Latency: z.number().int(),
+ p95Latency: z.number().int(),
+ p99Latency: z.number().int(),
day: z.string().transform((val) => {
// That's a hack because clickhouse return the date in UTC but in shitty format (2021-09-01 00:00:00)
return new Date(`${val} GMT`).toISOString();
@@ -102,6 +129,8 @@ export type Ping = z.infer<typeof tbBuildResponseList>;
export type Region = (typeof availableRegions)[number]; // TODO: rename type AvailabeRegion
export type Monitor = z.infer<typeof tbBuildMonitorList>;
export type HomeStats = z.infer<typeof tbBuildHomeStats>;
+export type ResponseGraph = z.infer<typeof tbBuildResponseGraph>; // TODO: rename to ResponseQuantileChart
export type ResponseListParams = z.infer<typeof tbParameterResponseList>;
+export type ResponseGraphParams = z.infer<typeof tbParameterResponseGraph>;
export type MonitorListParams = z.infer<typeof tbParameterMonitorList>;
export type HomeStatsParams = z.infer<typeof tbParameterHomeStats>;