Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
🚀 trigger checker after creation (#1317)
Thibault Le Ouay10a3702447cf
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsx b/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsxindex 4c6474293..5c0751bf3 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/create/page.tsx@@ -20,12 +20,18 @@ export default function Page() {const trpc = useTRPC();const queryClient = useQueryClient();const router = useRouter();++ const triggerCheckMutation = useMutation(+ trpc.checker.triggerChecker.mutationOptions({}),+ );+const createMonitorMutation = useMutation(trpc.monitor.new.mutationOptions({onSuccess: (data) => {queryClient.invalidateQueries({queryKey: trpc.monitor.list.queryKey(),});+ triggerCheckMutation.mutate({ id: data.id });router.push(`/monitors/${data.id}/edit`);},}),diff --git a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsxindex ae2f02c4c..96b6c6254 100644--- a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx+++ b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx@@ -91,10 +91,14 @@ export function Client() {const { data: workspace, refetch } = useQuery(trpc.workspace.get.queryOptions(),);+ const triggerCheckMutation = useMutation(+ trpc.checker.triggerChecker.mutationOptions({}),+ );const createMonitorMutation = useMutation(trpc.monitor.new.mutationOptions({- onSuccess: () => {+ onSuccess: (data) => {setSearchParams({ step: "2" });+ triggerCheckMutation.mutate({ id: data.id });refetch();queryClient.invalidateQueries({queryKey: trpc.monitor.list.queryKey(),diff --git a/packages/api/package.json b/packages/api/package.jsonindex a51a34a4b..296c03cc2 100644--- a/packages/api/package.json+++ b/packages/api/package.json@@ -12,6 +12,7 @@"@openstatus/db": "workspace:*","@openstatus/emails": "workspace:*","@openstatus/error": "workspace:*",+ "@openstatus/utils": "workspace:*","@openstatus/tinybird": "workspace:*","@t3-oss/env-core": "0.7.1","@trpc/client": "11.4.3",diff --git a/packages/api/src/router/checker.ts b/packages/api/src/router/checker.tsindex c0bec1956..d84b410ab 100644--- a/packages/api/src/router/checker.ts+++ b/packages/api/src/router/checker.ts@@ -8,7 +8,14 @@ import {statusAssertion,textBodyAssertion,} from "@openstatus/assertions";+import { and, db, eq } from "@openstatus/db";+import { monitor, selectMonitorSchema } from "@openstatus/db/src/schema";import { monitorFlyRegionSchema } from "@openstatus/db/src/schema/constants";+import {+ type httpPayloadSchema,+ type tpcPayloadSchema,+ transformHeaders,+} from "@openstatus/utils";import { z } from "zod";import { env } from "../env";import { createTRPCRouter, protectedProcedure } from "../trpc";@@ -247,6 +254,93 @@ export async function testTcp(input: z.infer<typeof tcpTestInput>) {}}+export async function triggerChecker(+ input: z.infer<typeof selectMonitorSchema>,+) {+ let payload:+ | z.infer<typeof httpPayloadSchema>+ | z.infer<typeof tpcPayloadSchema>+ | null = null;++ if (process.env.NODE_ENV !== "production") {+ return;+ }++ const timestamp = Date.now();++ if (input.jobType === "http") {+ payload = {+ workspaceId: String(input.workspaceId),+ monitorId: String(input.id),+ url: input.url,+ method: input.method || "GET",+ cronTimestamp: timestamp,+ body: input.body,+ headers: input.headers,+ status: "active",+ assertions: input.assertions ? JSON.parse(input.assertions) : null,+ degradedAfter: input.degradedAfter,+ timeout: input.timeout,+ trigger: "cron",+ otelConfig: input.otelEndpoint+ ? {+ endpoint: input.otelEndpoint,+ headers: transformHeaders(input.otelHeaders),+ }+ : undefined,+ retry: input.retry || 3,+ };+ }+ if (input.jobType === "tcp") {+ payload = {+ workspaceId: String(input.workspaceId),+ monitorId: String(input.id),+ uri: input.url,+ status: "active",+ assertions: input.assertions ? JSON.parse(input.assertions) : null,+ cronTimestamp: timestamp,+ degradedAfter: input.degradedAfter,+ timeout: input.timeout,+ trigger: "cron",+ retry: input.retry || 3,+ otelConfig: input.otelEndpoint+ ? {+ endpoint: input.otelEndpoint,+ headers: transformHeaders(input.otelHeaders),+ }+ : undefined,+ };+ }+ const allResult = [];++ for (const region of input.regions) {+ const res = fetch(generateUrl({ row: input }), {+ method: "POST",+ headers: {+ Authorization: `Basic ${env.CRON_SECRET}`,+ "Content-Type": "application/json",+ "fly-prefer-region": region,+ },+ body: JSON.stringify(payload),+ signal: AbortSignal.timeout(ABORT_TIMEOUT),+ });+ allResult.push(res);+ }++ await Promise.allSettled(allResult);+}++function generateUrl({ row }: { row: z.infer<typeof selectMonitorSchema> }) {+ switch (row.jobType) {+ case "http":+ return `https://openstatus-checker.fly.dev/checker/http?monitor_id=${row.id}`;+ case "tcp":+ return `https://openstatus-checker.fly.dev/checker/tcp?monitor_id=${row.id}`;+ default:+ throw new Error("Invalid jobType");+ }+}+export const checkerRouter = createTRPCRouter({testHttp: protectedProcedure.meta({ track: Events.TestMonitor })@@ -261,4 +355,28 @@ export const checkerRouter = createTRPCRouter({.mutation(async ({ input }) => {return testTcp(input);}),++ triggerChecker: protectedProcedure+ .input(z.object({ id: z.number() }))+ .mutation(async (opts) => {+ const m = await db+ .select()+ .from(monitor)+ .where(+ and(+ eq(monitor.id, opts.input.id),+ eq(monitor.workspaceId, opts.ctx.workspace.id),+ ),+ )+ .get();+ if (!m) {+ throw new TRPCError({+ code: "NOT_FOUND",+ message: "Monitor not found",+ });+ }+ const input = selectMonitorSchema.parse(m);++ return await triggerChecker(input);+ }),});diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 98d1f389c..d353035c6 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -879,6 +879,9 @@ importers:'@openstatus/tinybird':specifier: workspace:*version: link:../tinybird+ '@openstatus/utils':+ specifier: workspace:*+ version: link:../utils'@t3-oss/env-core':specifier: 0.7.1version: 0.7.1([email protected])([email protected])