Skip to content

Open-source status page, incident response and uptime monitoring

fix: tinybird improvements (#62)

Thibault Le Ouayd303e2fef27f
diff --git a/.gitignore b/.gitignore
index a5f2d86b5..4c349eaa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,7 @@ yarn-error.log*
# vercel
.vercel
-
+.venv
# packages
dist
packages/emails/.react-email
diff --git a/apps/web/package.json b/apps/web/package.json
index b276583a0..6fe77344a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -43,6 +43,7 @@
"date-fns": "^2.30.0",
"lucide-react": "^0.244.0",
"micro": "10.0.1",
+ "nanoid": "^4.0.2",
"next": "13.4.8",
"next-plausible": "3.7.2",
"react": "18.2.0",
diff --git a/apps/web/src/app/api/checker/regions/_checker.ts b/apps/web/src/app/api/checker/regions/_checker.ts
index e956dad28..cfc961b1c 100644
--- a/apps/web/src/app/api/checker/regions/_checker.ts
+++ b/apps/web/src/app/api/checker/regions/_checker.ts
@@ -1,4 +1,5 @@
import { Receiver } from "@upstash/qstash/cloudflare";
+import { nanoid } from "nanoid";
import { z } from "zod";
import {
@@ -26,7 +27,7 @@ const monitor = async (
}: { latency: number; url: string; region: string; cronTimestamp: number },
) => {
await publishPingResponse(tb)({
- id: "openstatus",
+ id: nanoid(),
workspaceId: "openstatus",
pageId: "openstatus",
monitorId: "openstatusPing",
diff --git a/apps/web/src/app/monitor/[id]/page.tsx b/apps/web/src/app/monitor/[id]/page.tsx
index 10f2ae51a..fad04fb21 100644
--- a/apps/web/src/app/monitor/[id]/page.tsx
+++ b/apps/web/src/app/monitor/[id]/page.tsx
@@ -28,8 +28,8 @@ export default async function Monitor({
}) {
const search = searchParamsSchema.safeParse(searchParams);
const data = search.success
- ? await getResponseListData({ siteId: params.id, ...search.data })
- : await getResponseListData({ siteId: params.id });
+ ? await getResponseListData({ monitorId: params.id, ...search.data })
+ : await getResponseListData({ monitorId: params.id });
if (!data || !search.success) return <div>Something went wrong</div>;
return <DataTable columns={columns} data={data} />;
}
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
index 72f3ba119..b33a67650 100644
--- a/apps/web/src/app/page.tsx
+++ b/apps/web/src/app/page.tsx
@@ -8,7 +8,7 @@ import { getMonitorListData } from "@/lib/tb";
import { HeroForm } from "./_components/hero-form";
export default async function Page() {
- const data = await getMonitorListData({ siteId: "openstatus" });
+ const data = await getMonitorListData({ monitorId: "openstatusPing" });
return (
<main className="flex min-h-screen w-full flex-col space-y-6 p-4 md:p-8">
@@ -47,7 +47,7 @@ export default async function Page() {
{data && (
<Tracker
data={data}
- id="openstatus"
+ id="openstatusPing"
name="Ping"
url="https://openstatus.dev/api/ping"
/>
diff --git a/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx b/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx
index 9940a2c0f..c73416073 100644
--- a/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx
+++ b/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx
@@ -29,8 +29,8 @@ export default async function Monitor({
}) {
const search = searchParamsSchema.safeParse(searchParams);
const data = search.success
- ? await getResponseListData({ siteId: params.id, ...search.data })
- : await getResponseListData({ siteId: params.id });
+ ? await getResponseListData({ monitorId: params.id, ...search.data })
+ : await getResponseListData({ monitorId: params.id });
if (!data) return <div>Something went wrong</div>;
diff --git a/apps/web/src/app/play/page.tsx b/apps/web/src/app/play/page.tsx
index 21fe1a4ad..4e095d8df 100644
--- a/apps/web/src/app/play/page.tsx
+++ b/apps/web/src/app/play/page.tsx
@@ -22,8 +22,8 @@ export default async function PlayPage({
const params = search.success ? search.data : undefined;
const data = search.success
- ? await getMonitorListData({ siteId: "openstatus", ...params })
- : await getMonitorListData({ siteId: "openstatus" });
+ ? await getMonitorListData({ monitorId: "openstatusPing", ...params })
+ : await getMonitorListData({ monitorId: "openstatusPing" });
return (
<div className="relative flex flex-col items-center justify-center gap-4">
@@ -32,10 +32,11 @@ export default async function PlayPage({
</div>
<p className="font-cal mb-2 text-3xl">Status</p>
<p className="text-lg font-light">Learn more on how to build your own.</p>
+
{data && (
<Tracker
data={data}
- id="openstatus"
+ id="openstatusPing"
name="Ping"
url="https://openstatus.dev/api/ping"
/>
diff --git a/apps/web/src/components/tracker.tsx b/apps/web/src/components/tracker.tsx
index b98d98284..c79ecd004 100644
--- a/apps/web/src/components/tracker.tsx
+++ b/apps/web/src/components/tracker.tsx
@@ -164,7 +164,7 @@ const Bar = ({
</p>
{context === "play" ? (
<Link
- href={`/monitor/openstatus?fromDate=${cronTimestamp}&toDate=${toDate}`}
+ href={`/monitor/openstatusPing?fromDate=${cronTimestamp}&toDate=${toDate}`}
className="text-muted-foreground hover:text-foreground"
>
<Eye className="h-4 w-4" />
diff --git a/apps/web/src/lib/tb.ts b/apps/web/src/lib/tb.ts
index cc592989c..34c00600a 100644
--- a/apps/web/src/lib/tb.ts
+++ b/apps/web/src/lib/tb.ts
@@ -15,7 +15,10 @@ const tb = new Tinybird({ token: env.TINY_BIRD_API_KEY });
// TODO: add security layer
export async function getResponseListData(
props: Partial<
- Pick<ResponseListParams, "siteId" | "region" | "cronTimestamp" | "limit">
+ Pick<
+ ResponseListParams,
+ "siteId" | "region" | "cronTimestamp" | "limit" | "monitorId"
+ >
>,
) {
try {
diff --git a/packages/tinybird/pipes/monitor_list.pipe b/packages/tinybird/pipes/monitor_list.pipe
index cc9c9c5f3..30aa4279c 100644
--- a/packages/tinybird/pipes/monitor_list.pipe
+++ b/packages/tinybird/pipes/monitor_list.pipe
@@ -1,20 +1,20 @@
-VERSION 0
+VERSION 1
TOKEN "monitor_list__v0_endpoint_read_0539" READ
-NODE monitor_list__v0_0
+NODE monitor_list__v1_0
SQL >
%
- SELECT
- {% if defined(groupBy) and groupBy == "day" %}
+ SELECT
+ {% if defined(groupBy) and groupBy == "day" %}
toUnixTimestamp64Milli(toDateTime64(DATE(cronTimestamp / 1000), 3))
{% else %}
cronTimestamp
{% end %}
AS cronTimestamp, ROUND(AVG(latency)) as avgLatency, COUNT(*) as count, COUNT(CASE WHEN statusCode BETWEEN 200 AND 299 THEN 1 ELSE NULL END) as ok
FROM ping_response__v2
- WHERE id = {{ String(siteId, 'openstatus') }} AND cronTimestamp IS NOT NULL
+ WHERE monitorId = {{ String(monitorId, 'openstatusPing') }} AND cronTimestamp IS NOT NULL
GROUP BY cronTimestamp
ORDER BY cronTimestamp DESC
LIMIT {{Int32(limit, 1000)}}
diff --git a/packages/tinybird/pipes/response_list.pipe b/packages/tinybird/pipes/response_list.pipe
index 12b9c310c..22041f6d1 100644
--- a/packages/tinybird/pipes/response_list.pipe
+++ b/packages/tinybird/pipes/response_list.pipe
@@ -1,12 +1,12 @@
-VERSION 1
+VERSION 2
-NODE response_list__v1_0
+NODE response_list__v2_0
SQL >
%
SELECT *
FROM ping_response__v2
- WHERE id = {{ String(siteId, 'openstatus') }}
+ WHERE monitorId = {{ String(monitorId, 'openstatusPing') }}
{% if defined(region) %}
AND region = {{ String(region) }}
{% end %}
@@ -20,4 +20,4 @@ SQL >
AND cronTimestamp <= {{ Int64(toDate) }}
{% end %}
ORDER BY timestamp DESC
- LIMIT {{Int32(limit, 100)}}
+ LIMIT {{Int32(limit, 100)}}
\ No newline at end of file
diff --git a/packages/tinybird/src/client.ts b/packages/tinybird/src/client.ts
index 98cd48dcf..13bd5bebd 100644
--- a/packages/tinybird/src/client.ts
+++ b/packages/tinybird/src/client.ts
@@ -22,7 +22,7 @@ export function publishPingResponse(tb: Tinybird) {
export function getResponseList(tb: Tinybird) {
return tb.buildPipe({
- pipe: "response_list__v1",
+ pipe: "response_list__v2",
parameters: tbParameterResponseList,
data: tbBuildResponseList,
opts: {
@@ -33,7 +33,7 @@ export function getResponseList(tb: Tinybird) {
export function getMonitorList(tb: Tinybird) {
return tb.buildPipe({
- pipe: "monitor_list__v0",
+ pipe: "monitor_list__v1",
parameters: tbParameterMonitorList,
data: tbBuildMonitorList,
opts: {
diff --git a/packages/tinybird/src/validation.ts b/packages/tinybird/src/validation.ts
index a8ca0a0e7..ed460fe02 100644
--- a/packages/tinybird/src/validation.ts
+++ b/packages/tinybird/src/validation.ts
@@ -68,8 +68,8 @@ export const tbBuildResponseList = z.object({
* Params for pipe response_list__v1
*/
export const tbParameterResponseList = z.object({
- siteId: z.string().optional().default("openstatus"), // REMINDER: remove default once alpha
- monitorId: z.string().optional().default("openstatus"), // REMINDER: remove default once alpha
+ siteId: z.string().optional().default(""), // REMINDER: remove default once alpha
+ monitorId: z.string().default(""), // REMINDER: remove default once alpha
fromDate: z.number().int().default(0), // always start from a date
toDate: z.number().int().optional(),
limit: z.number().int().optional().default(2500), // one day has 2448 pings (17 (regions) * 6 (per hour) * 24)
@@ -89,6 +89,7 @@ export const groupByRange = ["day", "cron"] as const;
*/
export const tbParameterMonitorList = z.object({
siteId: z.string().optional().default("openstatus"), // REMINDER: remove default once alpha
+ monitorId: z.string().optional().default(""), // REMINDER: remove default once alpha
limit: z.number().int().optional().default(2500), // one day has 2448 pings (17 (regions) * 6 (per hour) * 24)
cronTimestamp: z.number().int().optional(),
groupBy: z.enum(groupByRange).optional(), // TODO: rename to frequency: z.enum(["1d", "auto"]) - where "auto" the default periodicity setup
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e95ff43d0..db56dacb5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -137,6 +137,9 @@ importers:
micro:
specifier: 10.0.1
version: 10.0.1
+ nanoid:
+ specifier: ^4.0.2
+ version: 4.0.2
next:
specifier: 13.4.8
@@ -6605,6 +6608,12 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
+ resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
+ engines: {node: ^14 || ^16 || >=18}
+ hasBin: true
+ dev: false
+
resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
dev: false