Skip to content

Open-source status page, incident response and uptime monitoring

🧹 some improvments (#591)

Thibault Le Ouay4ebf94fc1d1e
diff --git a/apps/server/src/checker/index.ts b/apps/server/src/checker/index.ts
index 798d688d4..85403c734 100644
--- a/apps/server/src/checker/index.ts
+++ b/apps/server/src/checker/index.ts
@@ -27,7 +27,7 @@ checkerRoute.post("/updateStatus", async (c) => {
message: z.string().optional(),
statusCode: z.number().optional(),
region: z.enum(flyRegions),
- cronTimestamp: z.number().optional(),
+ cronTimestamp: z.number(),
// status: z.enum(["active", "error"]),
});
@@ -96,22 +96,33 @@ checkerRoute.post("/updateStatus", async (c) => {
const monitor = selectMonitorSchema.parse(currentMonitor);
- if (!cronTimestamp) {
- console.log("cronTimestamp is undefined");
- }
-
const numberOfRegions = monitor.regions.length;
// If the number of affected regions is greater than half of the total region, we trigger the alerting
// 4 of 6 monitor need to fail to trigger an alerting
if (nbAffectedRegion > numberOfRegions / 2) {
- await triggerAlerting({ monitorId, statusCode, message, region });
- // create the incident and trigger the alerting
- await db.insert(incidentTable).values({
- monitorId: Number(monitorId),
- workspaceId: monitor.workspaceId,
- startedAt: new Date(),
- });
+ // let's refetch the incident to avoid race condition
+ const incident = await db
+ .select()
+ .from(incidentTable)
+ .where(
+ and(
+ eq(incidentTable.monitorId, Number(monitorId)),
+ isNull(incidentTable.resolvedAt),
+ isNull(incidentTable.acknowledgedAt),
+ eq(incidentTable.startedAt, new Date(cronTimestamp)),
+ ),
+ )
+ .get();
+ if (incident === undefined) {
+ await db.insert(incidentTable).values({
+ monitorId: Number(monitorId),
+ workspaceId: monitor.workspaceId,
+ startedAt: new Date(cronTimestamp),
+ });
+
+ await triggerAlerting({ monitorId, statusCode, message, region });
+ }
}
}
}
diff --git a/apps/server/src/v1/index.ts b/apps/server/src/v1/index.ts
index 7d36a7725..d0a833e1c 100644
--- a/apps/server/src/v1/index.ts
+++ b/apps/server/src/v1/index.ts
@@ -1,7 +1,7 @@
import { OpenAPIHono } from "@hono/zod-openapi";
import { logger } from "hono/logger";
-import type { Plan } from "@openstatus/plans";
+import type { Limits } from "@openstatus/plans/src/types";
import { middleware } from "./middleware";
import { monitorApi } from "./monitor";
@@ -10,7 +10,12 @@ import { statusReportUpdateApi } from "./statusReportUpdate";
export type Variables = {
workspaceId: string;
- workspacePlan: Plan;
+ workspacePlan: {
+ title: string;
+ description: string;
+ price: number;
+ limits: Limits;
+ };
};
export const api = new OpenAPIHono<{ Variables: Variables }>();
diff --git a/apps/server/src/v1/middleware.ts b/apps/server/src/v1/middleware.ts
index 4664512ac..ea203e788 100644
--- a/apps/server/src/v1/middleware.ts
+++ b/apps/server/src/v1/middleware.ts
@@ -1,11 +1,11 @@
import { verifyKey } from "@unkey/api";
-import type { Context, Env, Next } from "hono";
+import type { Context, Next } from "hono";
import type { Variables } from "./index";
import { getLimitByWorkspaceId } from "./utils";
export async function middleware(
- c: Context<{ Variables: Variables }, "/*", {}>,
+ c: Context<{ Variables: Variables }, "/*">,
next: Next,
) {
const key = c.req.header("x-openstatus-key");
diff --git a/apps/server/src/v1/monitor.ts b/apps/server/src/v1/monitor.ts
index a24f241c1..131b93e6f 100644
--- a/apps/server/src/v1/monitor.ts
+++ b/apps/server/src/v1/monitor.ts
@@ -54,9 +54,8 @@ const MonitorSchema = z
(val) => {
if (String(val).length > 0) {
return String(val).split(",");
- } else {
- return [];
}
+ return [];
},
z.array(z.enum(flyRegions)),
)
@@ -94,9 +93,8 @@ const MonitorSchema = z
(val) => {
if (String(val).length > 0) {
return JSON.parse(String(val));
- } else {
- return [];
}
+ return [];
},
z.array(z.object({ key: z.string(), value: z.string() })).default([]),
)
@@ -147,11 +145,10 @@ const monitorInput = z
headers: z
.preprocess(
(val) => {
- if (!!val) {
+ if (val) {
return val;
- } else {
- return [];
}
+ return [];
},
z.array(z.object({ key: z.string(), value: z.string() })).default([]),
)
diff --git a/apps/web/src/app/(content)/changelog/page.tsx b/apps/web/src/app/(content)/changelog/page.tsx
index 6c7fb64a5..fb3d71731 100644
--- a/apps/web/src/app/(content)/changelog/page.tsx
+++ b/apps/web/src/app/(content)/changelog/page.tsx
@@ -1,5 +1,4 @@
import type { Metadata } from "next";
-import Link from "next/link";
import { allChangelogs } from "contentlayer/generated";
import {
diff --git a/apps/web/src/app/_components/table-input-container.tsx b/apps/web/src/app/_components/table-input-container.tsx
index 44a5dbf67..7e3e1c7d3 100644
--- a/apps/web/src/app/_components/table-input-container.tsx
+++ b/apps/web/src/app/_components/table-input-container.tsx
@@ -16,7 +16,8 @@ export function TableInputContainer({ events }: { events: Ping[] }) {
.filter((event) => {
if (search?.status && event.statusCode !== Number(search.status)) {
return false;
- } else if (search?.region && event.region !== search.region) {
+ }
+ if (search?.region && event.region !== search.region) {
return false;
}
return true;
diff --git a/apps/web/src/app/api/checker/regions/_checker.ts b/apps/web/src/app/api/checker/regions/_checker.ts
index 6069f1077..cf618d5a0 100644
--- a/apps/web/src/app/api/checker/regions/_checker.ts
+++ b/apps/web/src/app/api/checker/regions/_checker.ts
@@ -1,16 +1,10 @@
import { Receiver } from "@upstash/qstash";
-import { nanoid } from "nanoid";
import { db, eq, schema } from "@openstatus/db";
import type { MonitorStatus } from "@openstatus/db/src/schema";
-import {
- selectMonitorSchema,
- selectNotificationSchema,
-} from "@openstatus/db/src/schema";
import {
publishPingResponse,
tbIngestPingResponse,
- Tinybird,
} from "@openstatus/tinybird";
import { env } from "@/env";
@@ -22,8 +16,6 @@ export const monitorSchema = tbIngestPingResponse.pick({
cronTimestamp: true,
});
-const tb = new Tinybird({ token: env.TINY_BIRD_API_KEY });
-
const monitor = async (
payload: Payload,
statusCode: number,
diff --git a/apps/web/src/app/api/checker/regions/arn1/route.ts b/apps/web/src/app/api/checker/regions/arn1/route.ts
deleted file mode 100644
index e3fa27216..000000000
--- a/apps/web/src/app/api/checker/regions/arn1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["arn1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/auto/route.ts b/apps/web/src/app/api/checker/regions/auto/route.ts
deleted file mode 100644
index bf05a27b4..000000000
--- a/apps/web/src/app/api/checker/regions/auto/route.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = "auto";
-export const dynamic = "force-dynamic";
-// Fix is a random region let's figure where does vercel push it
-
-export async function POST(request: Request) {
- const region = process.env.VERCEL_REGION;
- if (!region) {
- throw new Error("No region");
- }
- await checker(request, region);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/bom1/route.ts b/apps/web/src/app/api/checker/regions/bom1/route.ts
deleted file mode 100644
index c9571e4d7..000000000
--- a/apps/web/src/app/api/checker/regions/bom1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["bom1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/cdg1/route.ts b/apps/web/src/app/api/checker/regions/cdg1/route.ts
deleted file mode 100644
index 48b380f6d..000000000
--- a/apps/web/src/app/api/checker/regions/cdg1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["cdg1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/cle1/route.ts b/apps/web/src/app/api/checker/regions/cle1/route.ts
deleted file mode 100644
index 0d73d5a97..000000000
--- a/apps/web/src/app/api/checker/regions/cle1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["cle1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/cpt1/route.ts b/apps/web/src/app/api/checker/regions/cpt1/route.ts
deleted file mode 100644
index c7ff3bf82..000000000
--- a/apps/web/src/app/api/checker/regions/cpt1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["cpt1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/dub1/route.ts b/apps/web/src/app/api/checker/regions/dub1/route.ts
deleted file mode 100644
index 9cf22f9aa..000000000
--- a/apps/web/src/app/api/checker/regions/dub1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["dub1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/fra1/route.ts b/apps/web/src/app/api/checker/regions/fra1/route.ts
deleted file mode 100644
index 93b6e5b1c..000000000
--- a/apps/web/src/app/api/checker/regions/fra1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["fra1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/gru1/route.ts b/apps/web/src/app/api/checker/regions/gru1/route.ts
deleted file mode 100644
index 681572deb..000000000
--- a/apps/web/src/app/api/checker/regions/gru1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["gru1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/hkg1/route.ts b/apps/web/src/app/api/checker/regions/hkg1/route.ts
deleted file mode 100644
index 80e5c22c3..000000000
--- a/apps/web/src/app/api/checker/regions/hkg1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["hkg1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/hnd1/route.ts b/apps/web/src/app/api/checker/regions/hnd1/route.ts
deleted file mode 100644
index e3b41a3a1..000000000
--- a/apps/web/src/app/api/checker/regions/hnd1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["hnd1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/iad1/route.ts b/apps/web/src/app/api/checker/regions/iad1/route.ts
deleted file mode 100644
index dab195fe3..000000000
--- a/apps/web/src/app/api/checker/regions/iad1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["iad1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/icn1/route.ts b/apps/web/src/app/api/checker/regions/icn1/route.ts
deleted file mode 100644
index 673026b24..000000000
--- a/apps/web/src/app/api/checker/regions/icn1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["icn1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/kix1/route.ts b/apps/web/src/app/api/checker/regions/kix1/route.ts
deleted file mode 100644
index 8f08aefaf..000000000
--- a/apps/web/src/app/api/checker/regions/kix1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["kix1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/lhr1/route.ts b/apps/web/src/app/api/checker/regions/lhr1/route.ts
deleted file mode 100644
index ce9bd7206..000000000
--- a/apps/web/src/app/api/checker/regions/lhr1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["lhr1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/pdx1/route.ts b/apps/web/src/app/api/checker/regions/pdx1/route.ts
deleted file mode 100644
index d34cdd88f..000000000
--- a/apps/web/src/app/api/checker/regions/pdx1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["pdx1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/sfo1/route.ts b/apps/web/src/app/api/checker/regions/sfo1/route.ts
deleted file mode 100644
index a21d62eb0..000000000
--- a/apps/web/src/app/api/checker/regions/sfo1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["sfo1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/sin1/route.ts b/apps/web/src/app/api/checker/regions/sin1/route.ts
deleted file mode 100644
index 9fc9447c8..000000000
--- a/apps/web/src/app/api/checker/regions/sin1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["sin1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/regions/syd1/route.ts b/apps/web/src/app/api/checker/regions/syd1/route.ts
deleted file mode 100644
index 3c98c6026..000000000
--- a/apps/web/src/app/api/checker/regions/syd1/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NextResponse } from "next/server";
-
-import { checker } from "../_checker";
-
-export const runtime = "edge";
-export const preferredRegion = ["syd1"];
-export const dynamic = "force-dynamic";
-
-export async function POST(request: Request) {
- await checker(request, preferredRegion[0]);
- return NextResponse.json({ success: true });
-}
diff --git a/apps/web/src/app/api/checker/test/route.ts b/apps/web/src/app/api/checker/test/route.ts
index 2ecaa9e2a..7bea37006 100644
--- a/apps/web/src/app/api/checker/test/route.ts
+++ b/apps/web/src/app/api/checker/test/route.ts
@@ -19,6 +19,7 @@ export async function POST(request: Request) {
return NextResponse.json({ success: false }, { status: 400 });
}
+ // TODO: let's use our own go checker to check the endpoint
const check = await ping(_valid.data);
console.log(check.status);
diff --git a/apps/web/src/app/api/checker/utils.ts b/apps/web/src/app/api/checker/utils.ts
deleted file mode 100644
index 050e8b3f4..000000000
--- a/apps/web/src/app/api/checker/utils.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type {
- Monitor,
- Notification,
- NotificationProvider,
-} from "@openstatus/db/src/schema";
-import { sendDiscordMessage } from "@openstatus/notification-discord";
-import { send as sendEmail } from "@openstatus/notification-emails";
-import { sendSlackMessage } from "@openstatus/notification-slack";
-
-// type sendNotificationType = ({
-// monitor,
-// notification,
-// }: {
-// monitor: Monitor;
-// notification: Notification;
-// }) => Promise<void>;
-
-// export const providerToFunction = {
-// email: sendEmail,
-// slack: sendSlackMessage,
-// discord: sendDiscordMessage,
-// } satisfies Record<NotificationProvider, sendNotificationType>;
diff --git a/apps/web/src/app/api/integrations/vercel/callback/route.ts b/apps/web/src/app/api/integrations/vercel/callback/route.ts
deleted file mode 100644
index ab1d3263b..000000000
--- a/apps/web/src/app/api/integrations/vercel/callback/route.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { GET } from "@openstatus/vercel/src/routes/callback";
diff --git a/apps/web/src/app/api/integrations/vercel/configure/page.ts b/apps/web/src/app/api/integrations/vercel/configure/page.ts
deleted file mode 100644
index a0c36fb6e..000000000
--- a/apps/web/src/app/api/integrations/vercel/configure/page.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Configure } from "@openstatus/vercel";
-
-export default Configure;
diff --git a/apps/web/src/app/api/integrations/vercel/route.ts b/apps/web/src/app/api/integrations/vercel/route.ts
deleted file mode 100644
index f5c63b50c..000000000
--- a/apps/web/src/app/api/integrations/vercel/route.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { config, POST } from "@openstatus/vercel/src/routes/webhook";
diff --git a/apps/web/src/app/api/og/post/route.tsx b/apps/web/src/app/api/og/post/route.tsx
index 4756bbf1c..edaf0cd95 100644
--- a/apps/web/src/app/api/og/post/route.tsx
+++ b/apps/web/src/app/api/og/post/route.tsx
@@ -54,7 +54,7 @@ export async function GET(req: Request) {
backgroundImage: "radial-gradient(#cbd5e1 10%, transparent 10%)",
backgroundSize: "24px 24px",
}}
- ></div>
+ />
<div
tw="flex w-full h-full absolute inset-0 opacity-70"
style={{
@@ -62,7 +62,7 @@ export async function GET(req: Request) {
backgroundImage:
"radial-gradient(farthest-corner at 100px 100px, #cbd5e1, white 80%)", // tbd: switch color position
}}
- ></div>
+ />
<div tw="flex flex-col h-full justify-between px-24">
<div tw="flex flex-col flex-1 justify-end">
<div tw="flex flex-col px-12">
diff --git a/apps/web/src/app/api/og/route.tsx b/apps/web/src/app/api/og/route.tsx
index a1e2b559d..b0c45fd55 100644
--- a/apps/web/src/app/api/og/route.tsx
+++ b/apps/web/src/app/api/og/route.tsx
@@ -68,7 +68,7 @@ export async function GET(req: Request) {
backgroundImage: "radial-gradient(#cbd5e1 10%, transparent 10%)",
backgroundSize: "24px 24px",
}}
- ></div>
+ />
<div
tw="flex w-full h-full absolute inset-0 opacity-70"
style={{
@@ -76,7 +76,7 @@ export async function GET(req: Request) {
backgroundImage:
"radial-gradient(farthest-corner at 100px 100px, #cbd5e1, white 80%)", // tbd: switch color position
}}
- ></div>
+ />
<div tw="max-w-4xl relative flex flex-col">
<h1 style={{ fontFamily: "Cal" }} tw="text-6xl">
{title}
@@ -92,10 +92,7 @@ export async function GET(req: Request) {
{/* Empty State */}
{new Array(data.length).fill(null).map((_, i) => {
return (
- <div
- key={i}
- tw="h-16 w-3 rounded-full mr-1 bg-black/20"
- ></div>
+ <div key={i} tw="h-16 w-3 rounded-full mr-1 bg-black/20" />
);
})}
<div tw="flex flex-row-reverse absolute right-0">
@@ -118,7 +115,7 @@ export async function GET(req: Request) {
"bg-red-500": variant === "down",
"bg-yellow-500": variant === "degraded",
})}
- ></div>
+ />
);
})}
</div>
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/loading.tsx
deleted file mode 100644
index 09bbd4330..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/loading.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Skeleton } from "@openstatus/ui";
-
-import { Header } from "@/components/dashboard/header";
-
-export default function Loading() {
- return (
- <div className="grid gap-6 md:grid-cols-1 md:gap-8">
- <div className="col-span-full flex w-full justify-between">
- <Header.Skeleton>
- <Skeleton className="h-9 w-20" />
- </Header.Skeleton>
- </div>
- <Skeleton className="h-4 w-24" />
- <Skeleton className="h-48 w-full" />
- <Skeleton className="h-48 w-full" />
- </div>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/page.tsx
deleted file mode 100644
index 7aba2ba96..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/page.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import * as React from "react";
-
-import { Button } from "@openstatus/ui";
-
-import { Container } from "@/components/dashboard/container";
-import { Header } from "@/components/dashboard/header";
-import { api } from "@/trpc/server";
-
-export default async function IntegrationPage({
- params,
-}: {
- params: { workspaceSlug: string };
-}) {
- const workspace = await api.workspace.getWorkspace.query();
-
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <Header title="Integrations" description="All our integrations" />
- <Container
- title="Vercel"
- key={"vercel"}
- description="Connect your Vercel Project get insights."
- actions={[
- <a
- href={
- workspace?.id === 1
- ? "https://vercel.com/integrations/openstatus/new"
- : "#"
- }
- target="_blank"
- key={"vercel"}
- >
- <Button>{workspace?.id === 1 ? "Configure" : "Coming soon"}</Button>
- </a>,
- ]}
- ></Container>
- </div>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/vercel/configure/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/vercel/configure/page.tsx
deleted file mode 100644
index d25de4898..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/integrations/vercel/configure/page.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { revalidatePath } from "next/cache";
-import { cookies } from "next/headers";
-import { redirect } from "next/navigation";
-
-import { SubmitButton } from "@openstatus/vercel/src/components/submit-button";
-import {
- createLogDrain,
- deleteLogDrain,
- getLogDrains,
- getProjects,
-} from "@openstatus/vercel/src/libs/client";
-import { decrypt } from "@openstatus/vercel/src/libs/crypto";
-
-import { api } from "@/trpc/server";
-
-export default async function Configure({
- params,
-}: {
- params: { workspaceSlug: string };
-}) {
- const iv = cookies().get("iv")?.value;
- const encryptedToken = cookies().get("token")?.value;
- const teamId = cookies().get("teamId")?.value;
-
- if (!iv || !encryptedToken) {
- /** Redirect to access new token */
- return redirect("/app");
- }
-
- const token = decrypt(
- Buffer.from(iv || "", "base64url"),
- Buffer.from(encryptedToken || "", "base64url"),
- ).toString();
-
- let logDrains = await getLogDrains(token, teamId);
-
- const projects = await getProjects(token, teamId);
-
- for (const project of projects.projects) {
- console.log({ project });
- console.log("create integration");
- console.log(project.id);
- api.integration.createIntegration.mutate({
- workspaceSlug: params.workspaceSlug,
- input: {
- name: "Vercel",
- data: JSON.stringify(project),
- externalId: project.id,
- },
- });
- }
- // Create integration project if it doesn't exist
-
- if (logDrains.length === 0) {
- logDrains = [
- await createLogDrain(
- token,
- // @ts-expect-error We need more data - but this is a demo
- {
- deliveryFormat: "json",
- name: "OpenStatus Log Drain",
- // TODO: update with correct url
- url: "https://www.openstatus.dev/api/integrations/vercel",
- sources: ["static", "lambda", "build", "edge", "external"],
- // headers: { "key": "value"}
- },
- teamId,
- ),
- ];
- }
-
- // TODO: automatically create log drain on installation
- // async function create(formData: FormData) {
- // "use server";
- // await createLogDrain(
- // token,
- // // @ts-expect-error We need more data - but this is a demo
- // {
- // deliveryFormat: "json",
- // name: "OpenStatus Log Drain",
- // // TODO: update with correct url
- // url: "https://6be9-2a0d-3344-2324-1e04-4dc7-d06a-a389-48c0.ngrok-free.app/api/integrations/vercel",
- // sources: ["static", "lambda", "edge", "external"],
- // // headers: { "key": "value"}
- // },
- // teamId,
- // );
- // revalidatePath("/");
- // }
-
- async function _delete(formData: FormData) {
- "use server";
- const id = formData.get("id")?.toString();
- console.log({ id });
- if (id) {
- await deleteLogDrain(token, id, String(teamId));
- revalidatePath("/");
- }
- }
-
- return (
- <div className="flex w-full flex-col items-center justify-center">
- <div className="border-border m-3 grid w-full max-w-xl gap-3 rounded-lg border p-6 backdrop-blur-[2px]">
- <h1 className="font-cal text-2xl">Configure Vercel Integration</h1>
- <ul>
- {logDrains.map((item) => (
- <li
- key={item.id}
- className="flex items-center justify-between gap-2"
- >
- <p>{item.name}</p>
- <form action={_delete}>
- <input name="id" value={item.id} className="hidden" />
- <SubmitButton>Remove integration</SubmitButton>
- </form>
- </li>
- ))}
- </ul>
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/page.tsx
index ac38713c3..d30d54a32 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/page.tsx
@@ -10,11 +10,7 @@ import { DataTable } from "@/components/data-table/notification/data-table";
import { api } from "@/trpc/server";
import { EmptyState } from "./_components/empty-state";
-export default async function NotificationPage({
- params,
-}: {
- params: { workspaceSlug: string };
-}) {
+export default async function NotificationPage() {
const notifications =
await api.notification.getNotificationsByWorkspace.query();
const isLimitReached =
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/page.tsx
index ae0f8b5e2..6f2657531 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/page.tsx
@@ -1,5 +1,4 @@
import { api } from "@/trpc/server";
-import { CustomerPortalButton } from "./_components/customer-portal-button";
import { SettingsPlan } from "./_components/plan";
export default async function BillingPage() {
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx
index 3bdb5fb55..913b34569 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx
@@ -5,7 +5,6 @@ import { Button } from "@openstatus/ui";
import { Header } from "@/components/dashboard/header";
import { HelpCallout } from "@/components/dashboard/help-callout";
-import { api } from "@/trpc/server";
export default async function Layout({
children,
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/page.tsx
index 7fad94b07..884e61be2 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/page.tsx
@@ -1,11 +1,7 @@
import { StatusReportForm } from "@/components/forms/status-report-form";
import { api } from "@/trpc/server";
-export default async function NewPage({
- params,
-}: {
- params: { workspaceSlug: string };
-}) {
+export default async function NewPage() {
const monitors = await api.monitor.getMonitorsByWorkspace.query();
const pages = await api.page.getPagesByWorkspace.query();
diff --git a/apps/web/src/app/play/checker/[id]/_components/response-header-table.tsx b/apps/web/src/app/play/checker/[id]/_components/response-header-table.tsx
index f3a532525..35f012cad 100644
--- a/apps/web/src/app/play/checker/[id]/_components/response-header-table.tsx
+++ b/apps/web/src/app/play/checker/[id]/_components/response-header-table.tsx
@@ -1,5 +1,3 @@
-import { Copy } from "lucide-react";
-
import {
Table,
TableBody,
diff --git a/apps/web/src/app/play/checker/[id]/_components/response-timing-table.tsx b/apps/web/src/app/play/checker/[id]/_components/response-timing-table.tsx
index fbee15407..f1cdf98c7 100644
--- a/apps/web/src/app/play/checker/[id]/_components/response-timing-table.tsx
+++ b/apps/web/src/app/play/checker/[id]/_components/response-timing-table.tsx
@@ -27,7 +27,7 @@ export function ResponseTimingTable({ timing }: { timing: Timing }) {
<TableRow>
<TableHead className="w-[120px] md:w-[150px]">Timing</TableHead>
<TableHead className="w-[120px] md:w-[150px]">Duration</TableHead>
- <TableHead></TableHead>
+ <TableHead />
</TableRow>
</TableHeader>
<TableBody>
diff --git a/apps/web/src/app/play/checker/[id]/page.tsx b/apps/web/src/app/play/checker/[id]/page.tsx
index 85630792f..6644f5178 100644
--- a/apps/web/src/app/play/checker/[id]/page.tsx
+++ b/apps/web/src/app/play/checker/[id]/page.tsx
@@ -40,7 +40,7 @@ export default async function CheckPage({
const check =
data.checks.find((i) => i.region === selectedRegion) || data.checks?.[0];
- const { status, region, headers, latency, timing } = check;
+ const { region, headers, timing } = check;
return (
<>
diff --git a/apps/web/src/app/play/checker/_components/checker-form.tsx b/apps/web/src/app/play/checker/_components/checker-form.tsx
index 83ef7216f..1462db16c 100644
--- a/apps/web/src/app/play/checker/_components/checker-form.tsx
+++ b/apps/web/src/app/play/checker/_components/checker-form.tsx
@@ -10,7 +10,6 @@ import {
Button,
Form,
FormControl,
- FormDescription,
FormField,
FormItem,
FormLabel,
diff --git a/apps/web/src/app/status-page/[domain]/incidents/page.tsx b/apps/web/src/app/status-page/[domain]/incidents/page.tsx
index 3b5278394..7e9848db1 100644
--- a/apps/web/src/app/status-page/[domain]/incidents/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/incidents/page.tsx
@@ -1,11 +1,5 @@
-import type { Metadata } from "next";
import { notFound } from "next/navigation";
-import {
- defaultMetadata,
- ogMetadata,
- twitterMetadata,
-} from "@/app/shared-metadata";
import { Header } from "@/components/dashboard/header";
import { IncidentList } from "@/components/status-page/incident-list";
import { api } from "@/trpc/server";
diff --git a/apps/web/src/components/data-table/incident/data-table-row-actions.tsx b/apps/web/src/components/data-table/incident/data-table-row-actions.tsx
index ecd5158df..7a5063096 100644
--- a/apps/web/src/components/data-table/incident/data-table-row-actions.tsx
+++ b/apps/web/src/components/data-table/incident/data-table-row-actions.tsx
@@ -1,22 +1,12 @@
"use client";
import * as React from "react";
-import Link from "next/link";
import { useRouter } from "next/navigation";
import type { Row } from "@tanstack/react-table";
import { MoreHorizontal } from "lucide-react";
import { selectIncidentSchema } from "@openstatus/db/src/schema";
import {
- AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
- AlertDialogTrigger,
Button,
DropdownMenu,
DropdownMenuContent,
@@ -25,7 +15,6 @@ import {
DropdownMenuTrigger,
} from "@openstatus/ui";
-import { LoadingAnimation } from "@/components/loading-animation";
import { useToastAction } from "@/hooks/use-toast-action";
import { api } from "@/trpc/client";
@@ -39,7 +28,7 @@ export function DataTableRowActions<TData>({
const incident = selectIncidentSchema.parse(row.original);
const router = useRouter();
const { toast } = useToastAction();
- const [isPending, startTransition] = React.useTransition();
+ const [_isPending, startTransition] = React.useTransition();
async function resolved() {
startTransition(async () => {
diff --git a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
index b27d5e233..b980581b1 100644
--- a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
@@ -76,7 +76,8 @@ export function DataTableRowActions<TData>({
async function onTest() {
startTransition(async () => {
const { url, body, method, headers } = monitor;
- const res = await fetch(`/api/checker/test`, {
+
+ const res = await fetch("/api/checker/test", {
method: "POST",
headers: new Headers({
"Content-Type": "application/json",
diff --git a/apps/web/src/components/forms/workspace-form.tsx b/apps/web/src/components/forms/workspace-form.tsx
index 0e4da2ddf..ea93661d4 100644
--- a/apps/web/src/components/forms/workspace-form.tsx
+++ b/apps/web/src/components/forms/workspace-form.tsx
@@ -6,7 +6,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useForm } from "react-hook-form";
import * as z from "zod";
-import { insertWorkspaceSchema } from "@openstatus/db/src/schema";
import {
Button,
Form,
diff --git a/apps/web/src/components/marketing/pricing/pricing-table.tsx b/apps/web/src/components/marketing/pricing/pricing-table.tsx
index ce7365a45..4384030d5 100644
--- a/apps/web/src/components/marketing/pricing/pricing-table.tsx
+++ b/apps/web/src/components/marketing/pricing/pricing-table.tsx
@@ -101,9 +101,9 @@ export function PricingTable({
</TableHeader>
<TableBody>
{Object.entries(pricingTableConfig).map(
- ([key, { label, features }], i) => {
+ ([key, { label, features }], _i) => {
return (
- <Fragment key={i}>
+ <Fragment key={key}>
<TableRow className="bg-muted/50">
<TableCell
colSpan={selectedPlans.length + 1}
@@ -114,7 +114,7 @@ export function PricingTable({
</TableRow>
{features.map(({ label, value, badge }, i) => {
return (
- <TableRow key={i}>
+ <TableRow key={key}>
<TableCell className="gap-1">
{label}{" "}
{badge ? (
@@ -129,30 +129,30 @@ export function PricingTable({
return (
<Check className="text-foreground h-4 w-4" />
);
- } else {
- return (
- <span className="text-muted-foreground/50">
- &#8208;
- </span>
- );
}
- } else if (typeof limitValue === "number") {
+ return (
+ <span className="text-muted-foreground/50">
+ &#8208;
+ </span>
+ );
+ }
+ if (typeof limitValue === "number") {
return (
<span className="font-mono">{limitValue}</span>
);
- } else if (
+ }
+ if (
Array.isArray(limitValue) &&
limitValue.length > 0
) {
return limitValue[0];
- } else {
- return limitValue;
}
+ return limitValue;
}
return (
<TableCell
- key={i}
+ key={key}
className={cn(
"p-3",
plan.key === "team" && "bg-muted/30",
diff --git a/apps/web/src/components/marketing/stats.tsx b/apps/web/src/components/marketing/stats.tsx
index ddb588970..d2a4b247c 100644
--- a/apps/web/src/components/marketing/stats.tsx
+++ b/apps/web/src/components/marketing/stats.tsx
@@ -1,7 +1,6 @@
import { Shell } from "@/components/dashboard/shell";
import { getHomeStatsData } from "@/lib/tb";
import { numberFormatter } from "@/lib/utils";
-import { api } from "@/trpc/server";
export async function Stats() {
const tbTotalStats = await getHomeStatsData({});
diff --git a/apps/web/src/components/tracker.tsx b/apps/web/src/components/tracker.tsx
index adf095a55..fd1d11ef5 100644
--- a/apps/web/src/components/tracker.tsx
+++ b/apps/web/src/components/tracker.tsx
@@ -153,7 +153,6 @@ type BarProps = Monitor & { blacklist?: string } & Pick<
const Bar = ({
count,
ok,
- avgLatency,
p95Latency,
day,
blacklist,