Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
Fix tb (#646)
Thibault Le Ouay508b564a8664
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.tsxindex 954d51dd4..687c40b58 100644--- 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@@ -23,7 +23,7 @@ export function DatePickerPreset({ period }: { period: Period }) {function onSelect(value: Period) {const searchParams = updateSearchParams({ period: value });- router.replace(`${pathname}?${searchParams}`);+ router.replace(`${pathname}?${searchParams}`, { scroll: false });}return (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.tsxindex 6963c00b3..f339611fb 100644--- 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@@ -35,7 +35,7 @@ export function IntervalPreset({function onSelect(value: Interval) {const searchParams = updateSearchParams({ interval: value });- router.replace(`${pathname}?${searchParams}`);+ router.replace(`${pathname}?${searchParams}`, { scroll: false });}return (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.tsxindex 2895a6936..364e30daf 100644--- 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@@ -38,7 +38,7 @@ export function QuantilePreset({function onSelect(value: Quantile) {const searchParams = updateSearchParams({ quantile: value });- router.replace(`${pathname}?${searchParams}`);+ router.replace(`${pathname}?${searchParams}`, { scroll: false });}return (diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsxindex e08a5274f..463ad82ba 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsx@@ -35,7 +35,7 @@ export function RegionsPreset({function onOpenChange(open: boolean) {if (!open) {const searchParams = updateSearchParams({ regions: selected.join(",") });- router.replace(`${pathname}?${searchParams}`);+ router.replace(`${pathname}?${searchParams}`, { scroll: false });}}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.tsxindex 05269ec67..6477a727a 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@@ -38,6 +38,7 @@ export default async function Page({const data = await getResponseListData({monitorId: id,+ url: monitor.url,fromDate: date.from.getTime(),toDate: date.to.getTime(),});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.tsxindex 7bde2471f..7c5dde386 100644--- 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@@ -83,6 +83,7 @@ export default async function Page({const data = await getResponseGraphData({monitorId: id,+ url: monitor.url,...search.data,/***@@ -94,11 +95,13 @@ export default async function Page({const metrics = await getResponseTimeMetricsData({monitorId: id,+ url: monitor.url,interval: periodicityHours,});const metricsByRegion = await getResponseTimeMetricsByRegionData({monitorId: id,+ url: monitor.url,interval: periodicityHours,});diff --git a/apps/web/src/app/monitor/[id]/page.tsx b/apps/web/src/app/monitor/[id]/page.tsxindex a21ea4b2c..fe08e7210 100644--- a/apps/web/src/app/monitor/[id]/page.tsx+++ b/apps/web/src/app/monitor/[id]/page.tsx@@ -5,6 +5,7 @@ import { flyRegions } from "@openstatus/utils";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";//@@ -27,10 +28,17 @@ export default async function Monitor({searchParams: { [key: string]: string | string[] | undefined };}) {const search = searchParamsSchema.safeParse(searchParams);+ const monitor = await api.monitor.getMonitorById.query({+ id: Number(params.id),+ });const data = search.success? // TODO: lets hard-code our `monitorId` here- await getResponseListData({ monitorId: params.id, ...search.data })- : await getResponseListData({ monitorId: params.id });+ await getResponseListData({+ monitorId: params.id,+ url: monitor.url,+ ...search.data,+ })+ : await getResponseListData({ monitorId: params.id, url: monitor.url });if (!data || !search.success) return <div>Something went wrong</div>;return <DataTable columns={columns} data={data} />;}diff --git a/apps/web/src/components/status-page/monitor.tsx b/apps/web/src/components/status-page/monitor.tsxindex 8ee7ea3e6..ac3126794 100644--- a/apps/web/src/components/status-page/monitor.tsx+++ b/apps/web/src/components/status-page/monitor.tsx@@ -20,6 +20,7 @@ export const Monitor = async ({const data = await getMonitorListData({monitorId: String(monitor.id),timezone: gmt,+ url: monitor.url,});// TODO: we could handle the `statusReports` here instead of passing it down to the trackerdiff --git a/apps/web/src/components/status-page/status-check.tsx b/apps/web/src/components/status-page/status-check.tsxindex b317bb8ff..eae35e74b 100644--- a/apps/web/src/components/status-page/status-check.tsx+++ b/apps/web/src/components/status-page/status-check.tsx@@ -43,6 +43,7 @@ export async function StatusCheck({monitors.map((monitor) => {return getResponseListData({monitorId: String(monitor.id),+ url: monitor.url,limit: 10,});}),diff --git a/apps/web/src/lib/tb.ts b/apps/web/src/lib/tb.tsindex 6944e5298..ae85fa2bf 100644--- a/apps/web/src/lib/tb.ts+++ b/apps/web/src/lib/tb.ts@@ -61,7 +61,11 @@ export async function getHomeMonitorListData(props: Pick<MonitorListParams, "timezone">,) {try {- const res = await getHomeMonitorList(tb)({ monitorId: "1", ...props });+ const res = await getHomeMonitorList(tb)({+ monitorId: "1",+ ...props,+ url: "https://www.openstatus.dev",+ });return res.data;} catch (e) {console.error(e);diff --git a/packages/tinybird/pipes/public_status.pipe b/packages/tinybird/pipes/public_status.pipeindex 5554c2ca0..588ec1b66 100644--- a/packages/tinybird/pipes/public_status.pipe+++ b/packages/tinybird/pipes/public_status.pipe@@ -14,6 +14,7 @@ SQL >FROM ping_response_v5WHEREmonitorId = {{ String(monitorId, '1') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}AND cronTimestamp>= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL 3 HOUR, 3))GROUP BY cronTimestamp, monitorIddiff --git a/packages/tinybird/pipes/response_details.pipe b/packages/tinybird/pipes/response_details.pipeindex 42a01e46f..63ca4949e 100644--- a/packages/tinybird/pipes/response_details.pipe+++ b/packages/tinybird/pipes/response_details.pipe@@ -8,6 +8,7 @@ SQL >FROM ping_response__v7WHEREmonitorId = {{ String(monitorId, '1') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}AND cronTimestamp = {{ Int64(cronTimestamp, 1706467215188) }}AND region = {{ String(region, 'ams') }}diff --git a/packages/tinybird/pipes/response_graph.pipe b/packages/tinybird/pipes/response_graph.pipeindex 5f2077d21..c48cd6188 100644--- a/packages/tinybird/pipes/response_graph.pipe+++ b/packages/tinybird/pipes/response_graph.pipe@@ -19,6 +19,7 @@ SQL >FROM ping_response__v7WHEREmonitorId = {{ String(monitorId, '1') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}{% if defined(fromDate) %} AND timestamp >= {{ Int64(fromDate) }} {% end %}{% if defined(toDate) %} AND timestamp <= {{ Int64(toDate) }} {% end %}GROUP BY h, regiondiff --git a/packages/tinybird/pipes/response_list.pipe b/packages/tinybird/pipes/response_list.pipeindex a1fc24aa0..cbc29493f 100644--- a/packages/tinybird/pipes/response_list.pipe+++ b/packages/tinybird/pipes/response_list.pipe@@ -7,6 +7,7 @@ SQL >SELECT latency, monitorId, region, statusCode, timestamp, url, workspaceId, cronTimestamp, messageFROM ping_response__v7WHERE monitorId = {{ String(monitorId, 'openstatusPing') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}{% if defined(region) %}AND region = {{ String(region) }}{% end %}diff --git a/packages/tinybird/pipes/response_time_metrics.pipe b/packages/tinybird/pipes/response_time_metrics.pipeindex f9a9fe60e..bb733b7ae 100644--- a/packages/tinybird/pipes/response_time_metrics.pipe+++ b/packages/tinybird/pipes/response_time_metrics.pipe@@ -18,6 +18,7 @@ SQL >FROM materialized_view_ping_response_45d_ttl__v7WHEREmonitorId = {{ String(monitorId, '1') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}AND timestamp>= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}} HOUR, 3))) as lastTimestamp,@@ -26,6 +27,7 @@ SQL >FROM materialized_view_ping_response_45d_ttl__v7WHEREmonitorId = {{ String(monitorId, '1') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}AND timestamp>= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}} HOUR, 3))UNION ALL@@ -43,6 +45,7 @@ SQL >FROM materialized_view_ping_response_45d_ttl__v7WHEREmonitorId = {{ String(monitorId, '1') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}AND timestamp>= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24)}}*2 HOUR, 3))AND timestampdiff --git a/packages/tinybird/pipes/response_time_metrics_by_region.pipe b/packages/tinybird/pipes/response_time_metrics_by_region.pipeindex d3e78287f..ed759c229 100644--- a/packages/tinybird/pipes/response_time_metrics_by_region.pipe+++ b/packages/tinybird/pipes/response_time_metrics_by_region.pipe@@ -16,6 +16,7 @@ SQL >FROM materialized_view_ping_response_45d_ttl__v7WHEREmonitorId = {{ String(monitorId, '1') }}+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}AND timestamp>= toUnixTimestamp64Milli(toDateTime64(now() - INTERVAL {{ Int32(interval, 24) }} HOUR, 3))GROUP BY regiondiff --git a/packages/tinybird/pipes/status_timezone.pipe b/packages/tinybird/pipes/status_timezone.pipeindex 8d3b1d8b1..c0b013a9d 100644--- a/packages/tinybird/pipes/status_timezone.pipe+++ b/packages/tinybird/pipes/status_timezone.pipe@@ -15,6 +15,7 @@ SQL >statusCode,latencyFROM ping_response__v7+ {% if defined(url) %} AND url = {{ String(url) }} {% end %}WHERE monitorId = {{ String(monitorId, '1') }}-- by default, we only query the last 45 daysAND cronTimestamp >= toUnixTimestamp64Milli(diff --git a/packages/tinybird/src/validation.ts b/packages/tinybird/src/validation.tsindex 1da5963cd..294ad21c5 100644--- a/packages/tinybird/src/validation.ts+++ b/packages/tinybird/src/validation.ts@@ -53,6 +53,7 @@ export const tbBuildResponseList = z.object({*/export const tbParameterResponseList = z.object({monitorId: z.string().default(""), // REMINDER: remove default once alpha+ url: z.string().url().optional(),fromDate: z.number().int().default(0), // always start from a datetoDate: z.number().int().optional(),limit: z.number().int().optional().default(7500), // one day has 2448 pings (17 (regions) * 6 (per hour) * 24) * 3 days for historical data@@ -65,6 +66,7 @@ export const tbParameterResponseList = z.object({*/export const tbParameterResponseDetails = tbParameterResponseList.pick({monitorId: true,+ url: true,cronTimestamp: true,region: true,});@@ -133,6 +135,7 @@ export const tbBuildResponseGraph = z*/export const tbParameterResponseGraph = z.object({monitorId: z.string().default(""),+ url: z.string().url().optional(),interval: z.number().int().default(10),fromDate: z.number().int().default(0),toDate: z.number().int().optional(),@@ -143,6 +146,7 @@ export const tbParameterResponseGraph = z.object({*/export const tbParameterMonitorList = z.object({monitorId: z.string(),+ url: z.string().url().optional(),timezone: z.string().optional(),limit: z.number().int().default(46).optional(), // 46 days});@@ -181,6 +185,7 @@ export const tbBuildHomeStats = z.object({*/export const tbParameterPublicStatus = z.object({monitorId: z.string(),+ url: z.string().url().optional(),limit: z.number().int().default(5).optional(), // 5 last cronTimestamps});@@ -198,6 +203,7 @@ export const tbBuildPublicStatus = z.object({*/export const tbParameterResponseTimeMetrics = z.object({monitorId: z.string(),+ url: z.string().url().optional(),interval: z.number().int().default(24), // 24 hours});@@ -218,6 +224,7 @@ export const tbBuildResponseTimeMetrics = z*/export const tbParameterResponseTimeMetricsByRegion = z.object({monitorId: z.string(),+ url: z.string().url().optional(),interval: z.number().int().default(24), // 24 hours});