Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
🐛 api (#1293)
Thibault Le Ouay4b58137aef53
diff --git a/apps/server/src/routes/v1/monitors/get.ts b/apps/server/src/routes/v1/monitors/get.tsindex d88f4cf43..5fc2019c9 100644--- a/apps/server/src/routes/v1/monitors/get.ts+++ b/apps/server/src/routes/v1/monitors/get.ts@@ -1,4 +1,4 @@-import { createRoute } from "@hono/zod-openapi";+import { createRoute, z } from "@hono/zod-openapi";import { and, db, eq, isNull } from "@openstatus/db";import { monitor } from "@openstatus/db/src/schema";@@ -51,12 +51,24 @@ export function registerGetMonitor(api: typeof monitorsApi) {message: `Monitor ${id} not found`,});}+ const otelHeader = _monitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(_monitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;const data = MonitorSchema.parse({..._monitor,openTelemetry: _monitor.otelEndpoint? {- headers: _monitor.otelHeaders ?? undefined,+ headers: otelHeader,endpoint: _monitor.otelEndpoint ?? undefined,}: undefined,diff --git a/apps/server/src/routes/v1/monitors/get_all.ts b/apps/server/src/routes/v1/monitors/get_all.tsindex e9af393ab..7eb06f356 100644--- a/apps/server/src/routes/v1/monitors/get_all.ts+++ b/apps/server/src/routes/v1/monitors/get_all.ts@@ -39,15 +39,29 @@ export function registerGetAllMonitors(app: typeof monitorsApi) {.all();const data = z.array(MonitorSchema).parse(- _monitors.map((monitor) => ({- ...monitor,- openTelemetry: monitor.otelEndpoint- ? {- endpoint: monitor.otelEndpoint ?? undefined,- headers: monitor.otelHeaders ?? undefined,- }- : undefined,- })),+ _monitors.map((monitor) => {+ const otelHeader = monitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(monitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;+ return {+ ...monitor,+ openTelemetry: monitor.otelEndpoint+ ? {+ endpoint: monitor.otelEndpoint ?? undefined,+ headers: otelHeader,+ }+ : undefined,+ };+ }),);return c.json(data, 200);diff --git a/apps/server/src/routes/v1/monitors/post.ts b/apps/server/src/routes/v1/monitors/post.tsindex b8b643bbf..37dbc43f3 100644--- a/apps/server/src/routes/v1/monitors/post.ts+++ b/apps/server/src/routes/v1/monitors/post.ts@@ -1,4 +1,4 @@-import { createRoute } from "@hono/zod-openapi";+import { createRoute, z } from "@hono/zod-openapi";import { Events } from "@openstatus/analytics";import { and, db, eq, isNull, sql } from "@openstatus/db";@@ -104,11 +104,24 @@ export function registerPostMonitor(api: typeof monitorsApi) {.returning().get();+ const otelHeader = _newMonitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(_newMonitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;+const data = MonitorSchema.parse({..._newMonitor,openTelemetry: _newMonitor.otelEndpoint? {- headers: _newMonitor.otelHeaders ?? undefined,+ headers: otelHeader,endpoint: _newMonitor.otelEndpoint ?? undefined,}: undefined,diff --git a/apps/server/src/routes/v1/monitors/post_http.ts b/apps/server/src/routes/v1/monitors/post_http.tsindex 06f910a64..b749551e3 100644--- a/apps/server/src/routes/v1/monitors/post_http.ts+++ b/apps/server/src/routes/v1/monitors/post_http.ts@@ -1,4 +1,4 @@-import { createRoute } from "@hono/zod-openapi";+import { createRoute, z } from "@hono/zod-openapi";import { Events } from "@openstatus/analytics";import { and, db, eq, isNull, sql } from "@openstatus/db";@@ -118,11 +118,24 @@ export function registerPostMonitorHTTP(api: typeof monitorsApi) {.returning().get();+ const otelHeader = _newMonitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(_newMonitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;+const data = MonitorSchema.parse({..._newMonitor,openTelemetry: _newMonitor.otelEndpoint? {- headers: _newMonitor.otelHeaders ?? undefined,+ headers: otelHeader,endpoint: _newMonitor.otelEndpoint ?? undefined,}: undefined,diff --git a/apps/server/src/routes/v1/monitors/post_tcp.ts b/apps/server/src/routes/v1/monitors/post_tcp.tsindex 33bcfbad0..26805fdb4 100644--- a/apps/server/src/routes/v1/monitors/post_tcp.ts+++ b/apps/server/src/routes/v1/monitors/post_tcp.ts@@ -1,4 +1,4 @@-import { createRoute } from "@hono/zod-openapi";+import { createRoute, z } from "@hono/zod-openapi";import { Events } from "@openstatus/analytics";import { and, db, eq, isNull, sql } from "@openstatus/db";@@ -104,11 +104,24 @@ export function registerPostMonitorTCP(api: typeof monitorsApi) {.returning().get();+ const otelHeader = _newMonitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(_newMonitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;+const data = MonitorSchema.parse({..._newMonitor,openTelemetry: _newMonitor.otelEndpoint? {- headers: _newMonitor.otelHeaders ?? undefined,+ headers: otelHeader,endpoint: _newMonitor.otelEndpoint ?? undefined,}: undefined,diff --git a/apps/server/src/routes/v1/monitors/put.ts b/apps/server/src/routes/v1/monitors/put.tsindex d44a28ccd..fea5c9de1 100644--- a/apps/server/src/routes/v1/monitors/put.ts+++ b/apps/server/src/routes/v1/monitors/put.ts@@ -1,4 +1,4 @@-import { createRoute } from "@hono/zod-openapi";+import { createRoute, z } from "@hono/zod-openapi";import { and, db, eq, isNull } from "@openstatus/db";import { monitor } from "@openstatus/db/src/schema";@@ -111,11 +111,24 @@ export function registerPutMonitor(api: typeof monitorsApi) {.returning().get();+ const otelHeader = _newMonitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(_newMonitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;+const data = MonitorSchema.parse({..._newMonitor,openTelemetry: _newMonitor.otelEndpoint? {- headers: _newMonitor.otelHeaders ?? undefined,+ headers: otelHeader,endpoint: _newMonitor.otelEndpoint ?? undefined,}: undefined,diff --git a/apps/server/src/routes/v1/monitors/put_http.ts b/apps/server/src/routes/v1/monitors/put_http.tsindex c941442e1..0143275d5 100644--- a/apps/server/src/routes/v1/monitors/put_http.ts+++ b/apps/server/src/routes/v1/monitors/put_http.ts@@ -1,4 +1,4 @@-import { createRoute } from "@hono/zod-openapi";+import { createRoute, z } from "@hono/zod-openapi";import { and, db, eq, isNull } from "@openstatus/db";import { monitor } from "@openstatus/db/src/schema";@@ -131,11 +131,24 @@ export function registerPutHTTPMonitor(api: typeof monitorsApi) {.returning().get();+ const otelHeader = _newMonitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(_newMonitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;+const data = MonitorSchema.parse({..._newMonitor,openTelemetry: _newMonitor.otelEndpoint? {- headers: _newMonitor.otelHeaders ?? undefined,+ headers: otelHeader,endpoint: _newMonitor.otelEndpoint ?? undefined,}: undefined,diff --git a/apps/server/src/routes/v1/monitors/put_tcp.ts b/apps/server/src/routes/v1/monitors/put_tcp.tsindex ae9ef6bb1..853b36a45 100644--- a/apps/server/src/routes/v1/monitors/put_tcp.ts+++ b/apps/server/src/routes/v1/monitors/put_tcp.ts@@ -1,4 +1,4 @@-import { createRoute } from "@hono/zod-openapi";+import { createRoute, z } from "@hono/zod-openapi";import { and, db, eq, isNull } from "@openstatus/db";import { monitor } from "@openstatus/db/src/schema";@@ -116,12 +116,24 @@ export function registerPutTCPMonitor(api: typeof monitorsApi) {.where(eq(monitor.id, Number(_monitor.id))).returning().get();+ const otelHeader = _newMonitor.otelHeaders+ ? z+ .array(+ z.object({+ key: z.string(),+ value: z.string(),+ }),+ )+ .parse(JSON.parse(_newMonitor.otelHeaders))+ // biome-ignore lint/performance/noAccumulatingSpread: <explanation>+ .reduce((a, v) => ({ ...a, [v.key]: v.value }), {})+ : undefined;const data = MonitorSchema.parse({..._newMonitor,openTelemetry: _newMonitor.otelEndpoint? {- headers: _newMonitor.otelHeaders ?? undefined,+ headers: otelHeader,endpoint: _newMonitor.otelEndpoint ?? undefined,}: undefined,diff --git a/packages/db/src/seed.mts b/packages/db/src/seed.mtsindex c1d81dfe6..f0e4f400a 100644--- a/packages/db/src/seed.mts+++ b/packages/db/src/seed.mts@@ -93,6 +93,18 @@ async function main() {headers: '[{"key":"key", "value":"value"}]',body: '{"hello":"world"}',},+ {+ id: 4,+ active: true,+ workspaceId: 1,+ periodicity: "10m",+ url: "https://www.google.com",+ method: "GET",+ regions: "gru",+ public: true,+ otelEndpoint: "https://otel.com:4337",+ otelHeaders: '[{"key":"Authorization","value":"Basic"}]',+ },]).onConflictDoNothing().run();