Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
chore: small improvements (#314)
Maximilian Kaske72e0e2bf0aff
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/action-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/action-button.tsxindex 5f27e321b..b35d9936c 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/action-button.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/action-button.tsx@@ -50,6 +50,24 @@ export function ActionButton(props: Schema & { workspaceSlug: string }) {});}+ async function onTest() {+ startTransition(async () => {+ const { url, body, method, headers } = props;+ const res = await fetch(`/api/checker/test`, {+ method: "POST",+ headers: new Headers({+ "Content-Type": "application/json",+ }),+ body: JSON.stringify({ url, body, method, headers }),+ });+ if (res.ok) {+ toast("test-success");+ } else {+ toast("test-error");+ }+ });+ }+return (<AlertDialog open={alertOpen} onOpenChange={(value) => setAlertOpen(value)}><DropdownMenu>@@ -69,6 +87,7 @@ export function ActionButton(props: Schema & { workspaceSlug: string }) {<Link href={`/app/${props.workspaceSlug}/monitors/${props.id}/data`}><DropdownMenuItem>View data</DropdownMenuItem></Link>+ <DropdownMenuItem onClick={onTest}>Test endpoint</DropdownMenuItem><AlertDialogTrigger asChild><DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">Deletediff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsxindex f684f5f1e..b7bcc04a6 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx@@ -1,12 +1,15 @@import * as React from "react";import Link from "next/link";+import type { ExtendedMonitor } from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/plans";import { Badge, ButtonWithDisableTooltip } from "@openstatus/ui";import { Container } from "@/components/dashboard/container";import { Header } from "@/components/dashboard/header";import { Limit } from "@/components/dashboard/limit";+import { DataTableStatusBadge } from "@/components/data-table/data-table-status-badge";+import { getResponseListData } from "@/lib/tb";import { cn } from "@/lib/utils";import { api } from "@/trpc/server";import { ActionButton } from "./_components/action-button";@@ -28,6 +31,8 @@ export default async function MonitorPage({(monitors?.length || 0) >=allPlans[workspace?.plan || "free"].limits.monitors;+ const { workspaceSlug } = params;+return (<div className="grid gap-6 md:grid-cols-2 md:gap-8"><Header@@ -45,60 +50,7 @@ export default async function MonitorPage({/>{Boolean(monitors?.length) ? (monitors?.map((monitor, index) => (- <Container- key={index}- title={monitor.name}- description={monitor.description}- actions={[- <Badge- key="status-badge"- variant={monitor.active ? "default" : "outline"}- className="capitalize"- >- {monitor.active ? "active" : "inactive"}- <span- className={cn(- "ml-1 h-1.5 w-1.5 rounded-full",- monitor.active ? "bg-green-500" : "bg-red-500",- )}- />- </Badge>,- <ActionButton- key="action-button"- {...monitor}- workspaceSlug={params.workspaceSlug}- />,- ]}- >- <dl className="[&_dt]:text-muted-foreground grid gap-2 [&>*]:text-sm [&_dt]:font-light">- <div className="flex min-w-0 items-center justify-between gap-3">- <dt>Frequency</dt>- <dd className="font-mono">{monitor.periodicity}</dd>- </div>- <div className="flex min-w-0 items-center justify-between gap-3">- <dt>URL</dt>- <dd className="overflow-hidden text-ellipsis font-semibold">- {monitor.url}- </dd>- </div>- <div className="flex min-w-0 items-center justify-between gap-3">- <dt>Method</dt>- <dd className="overflow-hidden text-ellipsis font-semibold">- <Badge- variant="outline"- className={cn(- "font-mono",- monitor.method === "GET"- ? "border-blue-100 bg-blue-50 text-blue-600"- : "border-amber-100 bg-amber-50 text-amber-600",- )}- >- {monitor.method}- </Badge>- </dd>- </div>- </dl>- </Container>+ <Monitor key={index} {...{ monitor, workspaceSlug }} />))) : (<EmptyState />@@ -107,3 +59,67 @@ export default async function MonitorPage({</div>);}++async function Monitor({+ monitor,+ workspaceSlug,+}: {+ monitor: ExtendedMonitor;+ workspaceSlug: string;+}) {+ const lastResponses = await getResponseListData({+ monitorId: String(monitor.id),+ limit: 1,+ });++ const lastStatusCode =+ lastResponses && lastResponses.length > 0+ ? lastResponses[0].statusCode+ : undefined;++ return (+ <Container+ title={monitor.name}+ description={monitor.description}+ actions={[+ <Badge+ key="status-badge"+ variant={monitor.active ? "default" : "outline"}+ className="capitalize"+ >+ {monitor.active ? "active" : "inactive"}+ <span+ className={cn(+ "ml-1 h-1.5 w-1.5 rounded-full",+ monitor.active ? "bg-green-500" : "bg-red-500",+ )}+ />+ </Badge>,+ <ActionButton key="action-button" {...{ ...monitor, workspaceSlug }} />,+ ]}+ >+ <dl className="[&_dt]:text-muted-foreground grid gap-2 [&>*]:text-sm [&_dt]:font-light">+ <div className="flex min-w-0 items-center justify-between gap-3">+ <dt>Frequency</dt>+ <dd className="font-mono">{monitor.periodicity}</dd>+ </div>+ <div className="flex min-w-0 items-center justify-between gap-3">+ <dt>URL</dt>+ <dd className="overflow-hidden text-ellipsis font-semibold">+ {monitor.url}+ </dd>+ </div>+ <div className="flex min-w-0 items-center justify-between gap-3">+ <dt>Last Status</dt>+ <dd className="overflow-hidden text-ellipsis">+ {lastStatusCode ? (+ <DataTableStatusBadge statusCode={lastStatusCode} />+ ) : (+ <span className="text-muted-foreground">No data</span>+ )}+ </dd>+ </div>+ </dl>+ </Container>+ );+}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsxindex 624bf0f39..0deac5664 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsx@@ -1,7 +1,7 @@import Link from "next/link";import type * as z from "zod";-import type { allMonitorsSchema } from "@openstatus/db/src/schema";+import type { allMonitorsExtendedSchema } from "@openstatus/db/src/schema";import { Button } from "@openstatus/ui";import { EmptyState as DefaultEmptyState } from "@/components/dashboard/empty-state";@@ -9,7 +9,7 @@ import { EmptyState as DefaultEmptyState } from "@/components/dashboard/empty-stexport function EmptyState({allMonitors,}: {- allMonitors?: z.infer<typeof allMonitorsSchema>;+ allMonitors?: z.infer<typeof allMonitorsExtendedSchema>;}) {// Navigate user to monitor if they don't have oneif (!Boolean(allMonitors?.length)) {diff --git a/apps/web/src/app/app/page.tsx b/apps/web/src/app/app/page.tsxindex 1f5ed5539..a41fbce4a 100644--- a/apps/web/src/app/app/page.tsx+++ b/apps/web/src/app/app/page.tsx@@ -23,9 +23,27 @@ export default function Page() {<div className="grid gap-4"><div className="text-center"><p className="mb-1 text-lg font-bold">Creating Workspace</p>- <p className="text-muted-foreground">+ <p className="text-muted-foreground mb-3">Should be done in a second.</p>+ <p className="text-muted-foreground text-sm font-light">+ If you are stuck for longer, please contact us via{" "}+ <a+ href="https://openstatus.dev/discord"+ target="_blank"+ className="font-normal"+ >+ Discord+ </a>{" "}+ or{" "}+ <a+ href="mailto:[email protected]"+ className="font-normal"+ >+ </a>+ .+ </p></div><LoadingAnimation variant="inverse" size="lg" /></div>diff --git a/apps/web/src/components/data-table/columns.tsx b/apps/web/src/components/data-table/columns.tsxindex d875121a2..ad438887f 100644--- a/apps/web/src/components/data-table/columns.tsx+++ b/apps/web/src/components/data-table/columns.tsx@@ -7,9 +7,9 @@ import type { Ping } from "@openstatus/tinybird";import { Badge } from "@openstatus/ui";import { regionsDict } from "@/data/regions-dictionary";-import { cn } from "@/lib/utils";import { DataTableColumnHeader } from "./data-table-column-header";import { DataTableRowActions } from "./data-table-row-action";+import { DataTableStatusBadge } from "./data-table-status-badge";export const columns: ColumnDef<Ping>[] = [{@@ -32,24 +32,7 @@ export const columns: ColumnDef<Ping>[] = [),cell: ({ row }) => {const statusCode = String(row.getValue("statusCode"));- const isOk = statusCode.startsWith("2");- return (- <Badge- variant="outline"- className={cn(- "px-2 py-0.5 text-xs",- isOk ? "border-green-100 bg-green-50" : "border-red-100 bg-red-50",- )}- >- {statusCode}- <div- className={cn(- "bg-foreground ml-1 h-1.5 w-1.5 rounded-full",- isOk ? "bg-green-500" : "bg-red-500",- )}- />- </Badge>- );+ return <DataTableStatusBadge {...{ statusCode }} />;},filterFn: (row, id, value) => {// needed because value is number, not stringdiff --git a/apps/web/src/components/data-table/data-table-status-badge.tsx b/apps/web/src/components/data-table/data-table-status-badge.tsxnew file mode 100644index 000000000..16fe5f72f--- /dev/null+++ b/apps/web/src/components/data-table/data-table-status-badge.tsx@@ -0,0 +1,28 @@+import { Badge } from "@openstatus/ui";++import { cn } from "@/lib/utils";++export function DataTableStatusBadge({+ statusCode,+}: {+ statusCode: string | number;+}) {+ const isOk = String(statusCode).startsWith("2");+ return (+ <Badge+ variant="outline"+ className={cn(+ "px-2 py-0.5 text-xs",+ isOk ? "border-green-100 bg-green-50" : "border-red-100 bg-red-50",+ )}+ >+ {statusCode}+ <div+ className={cn(+ "bg-foreground ml-1 h-1.5 w-1.5 rounded-full",+ isOk ? "bg-green-500" : "bg-red-500",+ )}+ />+ </Badge>+ );+}diff --git a/apps/web/src/components/forms/status-page-form.tsx b/apps/web/src/components/forms/status-page-form.tsxindex 3cf2964de..3d6cecb8c 100644--- a/apps/web/src/components/forms/status-page-form.tsx+++ b/apps/web/src/components/forms/status-page-form.tsx@@ -23,6 +23,7 @@ import {FormMessage,Input,InputWithAddons,+ useToast,} from "@openstatus/ui";import { useDebounce } from "@/hooks/use-debounce";@@ -81,6 +82,7 @@ export function StatusPageForm({const watchTitle = form.watch("title");const debouncedSlug = useDebounce(watchSlug, 1000); // using debounce to not exhaust the serverconst { toast } = useToastAction();+ const { toast: defaultToast } = useToast();const updateSearchParams = useUpdateSearchParams();const checkUniqueSlug = useCallback(async () => {@@ -131,7 +133,17 @@ export function StatusPageForm({const id = page?.id || null;router.replace(`?${updateSearchParams({ id })}`); // to stay on same page and enable 'Advanced' tab}- toast("saved");+ defaultToast({+ title: "Saved successfully.",+ description: "Your status page is ready to go.",+ action: (+ <Button variant="outline">+ <a href={`https://${props.slug}.openstatus.dev`} target="_blank">+ Visit+ </a>+ </Button>+ ),+ });if (nextUrl) {router.push(nextUrl);}diff --git a/apps/web/src/components/layout/app-header.tsx b/apps/web/src/components/layout/app-header.tsxindex 961d1837d..2af2f04c2 100644--- a/apps/web/src/components/layout/app-header.tsx+++ b/apps/web/src/components/layout/app-header.tsx@@ -24,7 +24,7 @@ export function AppHeader() {<header className="border-border sticky top-3 z-50 w-full md:top-6"><Shell className="bg-background/70 flex w-full items-center justify-between px-3 py-3 backdrop-blur-lg md:px-6 md:py-3"><Link- href="/"+ href={`/${isSignedIn ? "app" : ""}`}className="font-cal text-muted-foreground hover:text-foreground text-lg">OpenStatusdiff --git a/apps/web/src/hooks/use-toast-action.tsx b/apps/web/src/hooks/use-toast-action.tsxindex 134fdbbd0..f242a4021 100644--- a/apps/web/src/hooks/use-toast-action.tsx+++ b/apps/web/src/hooks/use-toast-action.tsx@@ -3,8 +3,8 @@ import type { ToastType } from "@openstatus/ui";const config = {error: {- title: "Something went wrong.",- description: "Please try again.",+ title: "Something went wrong",+ description: "Please try again",variant: "destructive",action: (<Button variant="outline" asChild className="text-foreground">@@ -15,19 +15,19 @@ const config = {),},"unique-slug": {- title: "Slug is already taken.",+ title: "Slug is already taken",description: "Please select another slug. Every slug is unique.",},success: { title: "Success" },- deleted: { title: "Deleted successfully." }, // TODO: we are not informing the user besides the visual changes when an entry has been deleted- saved: { title: "Saved successfully." },+ deleted: { title: "Deleted successfully" }, // TODO: we are not informing the user besides the visual changes when an entry has been deleted+ saved: { title: "Saved successfully" },"test-error": {- title: "Endpoint configuration failed.",+ title: "Connection Failed",// description: "Be sure to include the auth headers.",variant: "destructive",},"test-success": {- title: "Endpoint configuration passed.",+ title: "Connection Established",},} as const satisfies Record<string, ToastType>;diff --git a/packages/api/src/router/domain.ts b/packages/api/src/router/domain.tsindex 4d898bf0a..1b7c52ae0 100644--- a/packages/api/src/router/domain.ts+++ b/packages/api/src/router/domain.ts@@ -1,20 +1,7 @@-import { TRPCError } from "@trpc/server";import { z } from "zod";-import { analytics, trackAnalytics } from "@openstatus/analytics";-import { eq } from "@openstatus/db";-import {- allMonitorsSchema,- insertMonitorSchema,- monitor,- selectMonitorSchema,- user,- usersToWorkspaces,-} from "@openstatus/db/src/schema";-import { env } from "../env";import { createTRPCRouter, protectedProcedure } from "../trpc";-import { hasUserAccessToWorkspace } from "./utils";export const domainConfigResponseSchema = z.object({configuredBy: zdiff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.tsindex 63cf0c84a..cda63ff9c 100644--- a/packages/api/src/router/monitor.ts+++ b/packages/api/src/router/monitor.ts@@ -5,14 +5,12 @@ import { analytics, trackAnalytics } from "@openstatus/analytics";import { and, eq } from "@openstatus/db";import {allMonitorsExtendedSchema,- allMonitorsSchema,insertMonitorSchema,METHODS,monitor,monitorsToPages,periodicityEnum,selectMonitorExtendedSchema,- selectMonitorSchema,} from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/plans";diff --git a/packages/db/src/schema/monitor.ts b/packages/db/src/schema/monitor.tsindex f84007c48..9b1334762 100644--- a/packages/db/src/schema/monitor.ts+++ b/packages/db/src/schema/monitor.ts@@ -160,6 +160,6 @@ export const selectMonitorExtendedSchema = selectMonitorSchema.extend({),});-export const allMonitorsSchema = z.array(selectMonitorExtendedSchema);-export const allMonitorsExtendedSchema = z.array(selectMonitorExtendedSchema);+export type ExtendedMonitor = z.infer<typeof selectMonitorExtendedSchema>;+export type ExtendedMonitors = z.infer<typeof allMonitorsExtendedSchema>;