Skip to content

Open-source status page, incident response and uptime monitoring

chore: add trigger cron vs api (#1044)

Maximilian Kaske12db1cd1be10
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
index e934babe5..0bfeb41a8 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
@@ -18,6 +18,7 @@ import { columns } from "@/components/data-table/columns";
import { DataTable } from "@/components/data-table/data-table";
import { LoadingAnimation } from "@/components/loading-animation";
import { ResponseDetailTabs } from "@/components/ping-response-analysis/response-detail-tabs";
+import type { Trigger } from "@/lib/monitor/utils";
import { api } from "@/trpc/client";
import type { monitorFlyRegionSchema } from "@openstatus/db/src/schema/constants";
import type { z } from "zod";
@@ -38,6 +39,7 @@ export type Monitor = {
cronTimestamp: number | null;
error: boolean;
assertions?: string | null;
+ trigger: Trigger | null;
};
export function DataTableWrapper({
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 ef6524d10..0296f3f4e 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
@@ -52,6 +52,7 @@ export default async function Page({
{ id: "statusCode", value: search.statusCode },
{ id: "region", value: search.regions },
{ id: "error", value: search.error },
+ { id: "trigger", value: search.trigger },
].filter((v) => v.value !== null)}
pagination={{
pageIndex: search.pageIndex,
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts
index 4fc8f9418..6b51ac2c8 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts
@@ -1,4 +1,4 @@
-import { periods } from "@/lib/monitor/utils";
+import { periods, triggers } from "@/lib/monitor/utils";
import { flyRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
@@ -18,5 +18,6 @@ export const searchParamsParsers = {
regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)),
pageSize: parseAsInteger.withDefault(10),
pageIndex: parseAsInteger.withDefault(0),
+ trigger: parseAsArrayOf(parseAsStringLiteral(triggers)),
};
export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/web/src/components/data-table/columns.tsx b/apps/web/src/components/data-table/columns.tsx
index b39e875b9..77d97b0dd 100644
--- a/apps/web/src/components/data-table/columns.tsx
+++ b/apps/web/src/components/data-table/columns.tsx
@@ -13,6 +13,8 @@ import {
} from "@openstatus/ui";
import { flyRegionsDict } from "@openstatus/utils";
+import type { Trigger } from "@/lib/monitor/utils";
+import { TriggerIconWithTooltip } from "../monitor/trigger-icon-with-tooltip";
import { DataTableColumnHeader } from "./data-table-column-header";
import { DataTableStatusBadge } from "./data-table-status-badge";
@@ -107,4 +109,15 @@ export const columns: ColumnDef<Ping>[] = [
return value.includes(row.getValue(id));
},
},
+ {
+ accessorKey: "trigger",
+ header: () => null,
+ cell: ({ row }) => {
+ const value = row.getValue("trigger") as Trigger;
+ return <TriggerIconWithTooltip triggerType={value} />;
+ },
+ filterFn: (row, id, value) => {
+ return value.includes(row.getValue(id));
+ },
+ },
];
diff --git a/apps/web/src/components/data-table/data-table-column-header.tsx b/apps/web/src/components/data-table/data-table-column-header.tsx
index 4620e2fdc..5781cea57 100644
--- a/apps/web/src/components/data-table/data-table-column-header.tsx
+++ b/apps/web/src/components/data-table/data-table-column-header.tsx
@@ -27,7 +27,7 @@ export function DataTableColumnHeader<TData, TValue>({
onClick={() => {
column.toggleSorting(undefined);
}}
- className={className}
+ className={cn("-ml-3", className)}
{...props}
>
<span>{title}</span>
diff --git a/apps/web/src/components/data-table/data-table-toolbar.tsx b/apps/web/src/components/data-table/data-table-toolbar.tsx
index 5117dd515..f9d146c0c 100644
--- a/apps/web/src/components/data-table/data-table-toolbar.tsx
+++ b/apps/web/src/components/data-table/data-table-toolbar.tsx
@@ -7,7 +7,9 @@ import { useRouter, useSearchParams } from "next/navigation";
import { Button } from "@openstatus/ui/src/components/button";
import { flyRegionsDict } from "@openstatus/utils";
+import { Icons } from "@/components/icons";
import { codesDict } from "@/data/code-dictionary";
+import { triggerDict } from "@/data/trigger-dictionary";
import { DataTableFacetedFilter } from "./data-table-faceted-filter";
import { DataTableFacetedInputDropdown } from "./data-table-faceted-input-dropdown";
@@ -62,14 +64,30 @@ export function DataTableToolbar<TData>({
]}
/>
)}
- <DataTableFacetedInputDropdown
- title="Latency"
- column={table.getColumn("latency")}
- options={[
- { value: "min", label: "Min." },
- { value: "max", label: "Max." },
- ]}
- />
+ {table.getColumn("latency") && (
+ <DataTableFacetedInputDropdown
+ title="Latency"
+ column={table.getColumn("latency")}
+ options={[
+ { value: "min", label: "Min." },
+ { value: "max", label: "Max." },
+ ]}
+ />
+ )}
+ {table.getColumn("trigger") && (
+ <DataTableFacetedFilter
+ column={table.getColumn("trigger")}
+ title="Trigger"
+ options={(["cron", "api"] as const).map((key) => {
+ const { label, icon, value } = triggerDict[key];
+ return {
+ label,
+ value,
+ icon: Icons[icon],
+ };
+ })}
+ />
+ )}
{isFiltered && (
<Button
variant="ghost"
diff --git a/apps/web/src/components/icons.tsx b/apps/web/src/components/icons.tsx
index bae04adac..998a8ff98 100644
--- a/apps/web/src/components/icons.tsx
+++ b/apps/web/src/components/icons.tsx
@@ -34,6 +34,7 @@ import {
MessageCircle,
Minus,
Moon,
+ Network,
Newspaper,
Package,
PanelTop,
@@ -100,6 +101,7 @@ export const Icons = {
zap: Zap,
eye: Eye,
"eye-off": EyeOff,
+ network: Network,
users: Users,
key: KeyRound,
"credit-card": CreditCard,
diff --git a/apps/web/src/components/monitor/trigger-icon-with-tooltip.tsx b/apps/web/src/components/monitor/trigger-icon-with-tooltip.tsx
new file mode 100644
index 000000000..fcd025665
--- /dev/null
+++ b/apps/web/src/components/monitor/trigger-icon-with-tooltip.tsx
@@ -0,0 +1,36 @@
+import type { Trigger } from "@/lib/monitor/utils";
+import { cn } from "@/lib/utils";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@openstatus/ui/src/components/tooltip";
+
+import { type IconProps, Icons } from "@/components/icons";
+import { triggerDict } from "@/data/trigger-dictionary";
+
+interface TriggerIconWithTooltipProps extends IconProps {
+ triggerType: Trigger;
+}
+
+export function TriggerIconWithTooltip({
+ triggerType,
+ className,
+ ...props
+}: TriggerIconWithTooltipProps) {
+ const config = triggerDict[triggerType];
+ const Icon = Icons[config.icon];
+ return (
+ <TooltipProvider delayDuration={50}>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Icon className={cn("h-4 w-4", className)} {...props} />
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{config.label}</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ );
+}
diff --git a/apps/web/src/data/trigger-dictionary.ts b/apps/web/src/data/trigger-dictionary.ts
new file mode 100644
index 000000000..2b4703b24
--- /dev/null
+++ b/apps/web/src/data/trigger-dictionary.ts
@@ -0,0 +1,27 @@
+import type { ValidIcon } from "@/components/icons";
+import type { Trigger } from "@/lib/monitor/utils";
+
+export const triggerDict = {
+ cron: {
+ value: "cron",
+ label: "Scheduled",
+ icon: "clock",
+ },
+ api: {
+ value: "api",
+ label: "On-Demand",
+ icon: "network",
+ },
+ unknown: {
+ value: "unknown",
+ label: "Unknown",
+ icon: "cog",
+ },
+} satisfies Record<
+ string,
+ {
+ icon: ValidIcon;
+ label: string;
+ value: Trigger | "unknown";
+ }
+>;
diff --git a/apps/web/src/lib/monitor/utils.ts b/apps/web/src/lib/monitor/utils.ts
index ee8fc4afc..40dfae91c 100644
--- a/apps/web/src/lib/monitor/utils.ts
+++ b/apps/web/src/lib/monitor/utils.ts
@@ -12,10 +12,12 @@ import type { MonitorPeriodicity } from "@openstatus/db/src/schema";
export const periods = ["1h", "1d", "3d", "7d", "14d"] as const; // If neeeded (e.g. Pro plans), "7d", "30d"
export const quantiles = ["p99", "p95", "p90", "p75", "p50"] as const;
export const intervals = ["1m", "10m", "30m", "1h"] as const;
+export const triggers = ["cron", "api"] as const;
export type Period = (typeof periods)[number];
export type Quantile = (typeof quantiles)[number];
export type Interval = (typeof intervals)[number];
+export type Trigger = (typeof triggers)[number];
export function getDateByPeriod(period: Period) {
switch (period) {
diff --git a/packages/tinybird/src/os-client.ts b/packages/tinybird/src/os-client.ts
index 0b9315bf5..e866af326 100644
--- a/packages/tinybird/src/os-client.ts
+++ b/packages/tinybird/src/os-client.ts
@@ -239,6 +239,11 @@ export class OSTinybird {
workspaceId: z.string(),
cronTimestamp: z.number().int().nullable().default(Date.now()),
assertions: z.string().nullable().optional(),
+ trigger: z
+ .enum(["cron", "api"])
+ .optional()
+ .nullable()
+ .default("cron"),
}),
opts: {
cache: "no-store",
diff --git a/packages/tinybird/src/validation.ts b/packages/tinybird/src/validation.ts
index 482a308a0..e769212f8 100644
--- a/packages/tinybird/src/validation.ts
+++ b/packages/tinybird/src/validation.ts
@@ -95,6 +95,7 @@ export const tbBuildResponseList = z.object({
region: monitorFlyRegionSchema,
message: z.string().nullable().optional(),
assertions: z.string().nullable().optional(),
+ trigger: z.enum(["cron", "api"]).optional().nullable().default("cron"),
});
/**