Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
🗑️ remove cron procedure (#724)
Thibault Le Ouayea28cc7615a6
diff --git a/apps/docs/api-reference/status_report/post-status_report:idupdate.mdx b/apps/docs/api-reference/status_report/post-status_report:id/update.mdxsimilarity index 100%rename from apps/docs/api-reference/status_report/post-status_report:idupdate.mdxrename to apps/docs/api-reference/status_report/post-status_report:id/update.mdxdiff --git a/apps/docs/mint.json b/apps/docs/mint.jsonindex 417ce4c92..7efd5fd57 100644--- a/apps/docs/mint.json+++ b/apps/docs/mint.json@@ -164,7 +164,7 @@"api-reference/status_report/get-status_report","api-reference/status_report/delete-status_report:id","api-reference/status_report/post-status_report",- "api-reference/status_report/post-status_report:idupdate"+ "api-reference/status_report/post-status_report:id/update"]},{diff --git a/apps/web/src/app/api/checker/cron/_cron.ts b/apps/web/src/app/api/checker/cron/_cron.tsindex bad70fb15..b1acf1cf3 100644--- a/apps/web/src/app/api/checker/cron/_cron.ts+++ b/apps/web/src/app/api/checker/cron/_cron.ts@@ -1,12 +1,16 @@import type { NextRequest } from "next/server";import { CloudTasksClient } from "@google-cloud/tasks";import type { google } from "@google-cloud/tasks/build/protos/protos";-import type { z } from "zod";+import { z } from "zod";-import { createTRPCContext } from "@openstatus/api";-import { edgeRouter } from "@openstatus/api/src/edge";+import { and, db, eq } from "@openstatus/db";import type { MonitorStatus } from "@openstatus/db/src/schema";-import { selectMonitorSchema } from "@openstatus/db/src/schema";+import {+ monitor,+ monitorStatusTable,+ selectMonitorSchema,+ selectMonitorStatusSchema,+} from "@openstatus/db/src/schema";import { env } from "@/env";import type { payloadSchema } from "../schema";@@ -44,23 +48,34 @@ export const cron = async ({console.log(`Start cron for ${periodicity}`);const timestamp = Date.now();- const ctx = createTRPCContext({ req, serverSideCall: true });- // FIXME: we should the proper type- ctx.auth = { userId: "cron" } as any;- const caller = edgeRouter.createCaller(ctx);-- const monitors = await caller.monitor.getMonitorsForPeriodicity({- periodicity: periodicity,- });-+ // const ctx = createTRPCContext({ req, serverSideCall: true });+ // // FIXME: we should the proper type+ // ctx.auth = { userId: "cron" } as any;+ // const caller = edgeRouter.createCaller(ctx);++ // const monitors = await caller.monitor.getMonitorsForPeriodicity({+ // periodicity: periodicity,+ // });+ const result = await db+ .select()+ .from(monitor)+ .where(and(eq(monitor.periodicity, periodicity), eq(monitor.active, true)))+ .all();+ const monitors = z.array(selectMonitorSchema).parse(result);const allResult = [];for (const row of monitors) {const selectedRegions = row.regions.length > 1 ? row.regions : ["auto"];- const monitorStatus = await caller.monitor.getMonitorStatusByMonitorId({- monitorId: row.id,- });+ const result = await db+ .select()+ .from(monitorStatusTable)+ .where(eq(monitorStatusTable.monitorId, row.id))+ .all();+ const monitorStatus = z.array(selectMonitorStatusSchema).parse(result);+ // const monitorStatus = await caller.monitor.getMonitorStatusByMonitorId({+ // monitorId: row.id,+ // });for (const region of selectedRegions) {const status =diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.tsindex 07d0802ab..09518b518 100644--- a/packages/api/src/router/monitor.ts+++ b/packages/api/src/router/monitor.ts@@ -19,12 +19,7 @@ import {import { allPlans } from "@openstatus/plans";import { trackNewMonitor } from "../analytics";-import {- createTRPCRouter,- cronProcedure,- protectedProcedure,- publicProcedure,-} from "../trpc";+import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";export const monitorRouter = createTRPCRouter({create: protectedProcedure@@ -287,58 +282,6 @@ export const monitorRouter = createTRPCRouter({return z.array(selectMonitorSchema).parse(monitors);}),- getMonitorsForPeriodicity: cronProcedure- .input(z.object({ periodicity: monitorPeriodicitySchema }))- .query(async (opts) => {- const result = await opts.ctx.db- .select()- .from(monitor)- .where(- and(- eq(monitor.periodicity, opts.input.periodicity),- eq(monitor.active, true),- ),- )- .all();- return z.array(selectMonitorSchema).parse(result);- }),-- getMonitorStatusByMonitorId: cronProcedure- .input(z.object({ monitorId: z.number() }))- .query(async (opts) => {- const result = await opts.ctx.db- .select()- .from(monitorStatusTable)- .where(eq(monitorStatusTable.monitorId, opts.input.monitorId))- .all();- return z.array(selectMonitorStatusSchema).parse(result);- }),-- // FOR TESTING- upsertMonitorStatus: cronProcedure- .input(insertMonitorStatusSchema)- .mutation(async (opts) => {- const { status, region, monitorId } = opts.input;- await opts.ctx.db- .insert(monitorStatusTable)- .values({ status, region, monitorId: Number(monitorId) })- .onConflictDoUpdate({- target: [monitorStatusTable.monitorId, monitorStatusTable.region],- set: { status, updatedAt: new Date() },- });- }),-- getAllPagesForMonitor: cronProcedure- .input(z.object({ monitorId: z.number() }))- .query(async (opts) => {- const allPages = await opts.ctx.db- .select()- .from(monitorsToPages)- .where(eq(monitorsToPages.monitorId, opts.input.monitorId))- .all();- return allPages;- }),-// rename to getActiveMonitorsCountgetTotalActiveMonitors: publicProcedure.query(async (opts) => {const monitors = await opts.ctx.dbdiff --git a/packages/api/src/trpc.ts b/packages/api/src/trpc.tsindex 983ff6ab9..5ae3f9f3c 100644--- a/packages/api/src/trpc.ts+++ b/packages/api/src/trpc.ts@@ -206,27 +206,3 @@ export const formdataMiddleware = t.middleware(async (opts) => {* @see https://trpc.io/docs/procedures*/export const protectedProcedure = t.procedure.use(enforceUserIsAuthed);--/**- * Reusable middleware that enforces only cron before running the- * procedure- */-const enforeUserIsCron = t.middleware(async ({ ctx, next }) => {- if (!ctx.auth?.userId || ctx.auth.userId !== "cron") {- throw new TRPCError({ code: "UNAUTHORIZED" });- }-- return next({- ctx: {- auth: {- ...ctx.auth,- userId: ctx.auth.userId,- },- },- });-});--/**- * Protected (cron) procedure- */-export const cronProcedure = t.procedure.use(enforeUserIsCron);