Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
chore: small changes (#88)
Maximilian Kaskeadcb834e59b7
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/page.tsxindex 96207c5a3..addfdcba6 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/[id]/data/page.tsx@@ -41,7 +41,7 @@ export default async function Page({}const data = await getResponseListData({- siteId: "openstatus", // TODO: use monitorId+ monitorId: id,...search.data,});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 02e7853bd..a5f10c45e 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@@ -43,27 +43,25 @@ type Schema = z.infer<typeof insertMonitorSchema>;export function ActionButton(props: Schema & { workspaceSlug: string }) {const router = useRouter();- const pathname = usePathname();- console.log(router);const [dialogOpen, setDialogOpen] = React.useState(false);const [alertOpen, setAlertOpen] = React.useState(false);- const [saving, setSaving] = React.useState(false);+ const [isPending, startTransition] = React.useTransition();async function onUpdate(values: Schema) {- setSaving(true);- await api.monitor.updateMonitor.mutate({ ...values });- router.refresh();- setSaving(false);- setDialogOpen(false);+ startTransition(async () => {+ await api.monitor.updateMonitor.mutate({ ...values });+ router.refresh();+ setDialogOpen(false);+ });}async function onDelete() {- if (!props.id) return;- setSaving(true);- await api.monitor.deleteMonitor.mutate({ id: props.id });- router.refresh();- setSaving(false);- setAlertOpen(false);+ startTransition(async () => {+ if (!props.id) return;+ await api.monitor.deleteMonitor.mutate({ id: props.id });+ router.refresh();+ setAlertOpen(false);+ });}return (@@ -115,10 +113,10 @@ export function ActionButton(props: Schema & { workspaceSlug: string }) {e.preventDefault();onDelete();}}- disabled={saving}+ disabled={isPending}className="bg-destructive text-destructive-foreground hover:bg-destructive/90">- {!saving ? "Delete" : <LoadingAnimation />}+ {!isPending ? "Delete" : <LoadingAnimation />}</AlertDialogAction></AlertDialogFooter></AlertDialogContent>@@ -139,12 +137,12 @@ export function ActionButton(props: Schema & { workspaceSlug: string }) {<Buttontype="submit"form="monitor-update"- disabled={saving}+ disabled={isPending}onSubmit={(e) => {e.preventDefault();}}>- {!saving ? "Confirm" : <LoadingAnimation />}+ {!isPending ? "Confirm" : <LoadingAnimation />}</Button></DialogFooter></DialogContent>diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/create-form.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/create-form.tsxindex 0a5a35953..de99206c5 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/create-form.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/_components/create-form.tsx@@ -24,29 +24,29 @@ type MonitorSchema = z.infer<typeof insertMonitorSchema>;interface Props {workspaceSlug: string;+ disabled?: boolean;}-export function CreateForm({ workspaceSlug }: Props) {+export function CreateForm({ workspaceSlug, disabled }: Props) {const router = useRouter();const [open, setOpen] = React.useState(false);- const [saving, setSaving] = React.useState(false);+ const [isPending, startTransition] = React.useTransition();async function onCreate(values: MonitorSchema) {- setSaving(true);- // await api.monitor.getMonitorsByWorkspace.revalidate();- await api.monitor.createMonitor.mutate({- data: values,- workspaceSlug,+ startTransition(async () => {+ await api.monitor.createMonitor.mutate({+ data: values,+ workspaceSlug,+ });+ router.refresh();+ setOpen(false);});- router.refresh();- setSaving(false);- setOpen(false);}return (<Dialog open={open} onOpenChange={(value) => setOpen(value)}><DialogTrigger asChild>- <Button>Create</Button>+ <Button disabled={disabled}>Create</Button></DialogTrigger><DialogContent className="flex max-h-screen flex-col"><DialogHeader>@@ -57,8 +57,8 @@ export function CreateForm({ workspaceSlug }: Props) {<MonitorForm id="monitor-create" onSubmit={onCreate} /></div><DialogFooter>- <Button type="submit" form="monitor-create" disabled={saving}>- {!saving ? "Confirm" : <LoadingAnimation />}+ <Button type="submit" form="monitor-create" disabled={isPending}>+ {!isPending ? "Confirm" : <LoadingAnimation />}</Button></DialogFooter></DialogContent>diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsxindex 620caed5a..13f10c1ee 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx@@ -3,12 +3,15 @@ import * as React from "react";import { Container } from "@/components/dashboard/container";import { Header } from "@/components/dashboard/header";import { Badge } from "@/components/ui/badge";+import { plansConfig } from "@/config/plans";import { cn } from "@/lib/utils";import { api } from "@/trpc/server";import { ActionButton } from "./_components/action-button";import { CreateForm } from "./_components/create-form";import { EmptyState } from "./_components/empty-state";+const limit = plansConfig.free.limits.monitors;+export default async function MonitorPage({params,}: {@@ -21,7 +24,10 @@ export default async function MonitorPage({return (<div className="grid gap-6 md:grid-cols-2 md:gap-8"><Header title="Monitors" description="Overview of all your monitors.">- <CreateForm workspaceSlug={params.workspaceSlug} />+ <CreateForm+ workspaceSlug={params.workspaceSlug}+ disabled={monitors?.length === limit}+ /></Header>{Boolean(monitors?.length) ? (monitors?.map((monitor, index) => (diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsxindex 9344410c4..3b02848d1 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsx@@ -54,24 +54,25 @@ export function ActionButton({ page, allMonitors }: ActionButtonProps) {const router = useRouter();const [dialogOpen, setDialogOpen] = React.useState(false);const [alertOpen, setAlertOpen] = React.useState(false);- const [saving, setSaving] = React.useState(false);+ const [isPending, startTransition] = React.useTransition();+async function onUpdate({...props}: z.infer<typeof insertPageSchemaWithMonitors>) {- setSaving(true);- await api.page.updatePage.mutate(props);- router.refresh();- setSaving(false);- setDialogOpen(false);+ startTransition(async () => {+ await api.page.updatePage.mutate(props);+ router.refresh();+ setDialogOpen(false);+ });}async function onDelete() {- if (!page.id) return;- setSaving(true);- await api.page.deletePage.mutate({ id: page.id });- router.refresh();- setSaving(false);- setAlertOpen(false);+ startTransition(async () => {+ if (!page.id) return;+ await api.page.deletePage.mutate({ id: page.id });+ router.refresh();+ setAlertOpen(false);+ });}return (@@ -95,7 +96,10 @@ export function ActionButton({ page, allMonitors }: ActionButtonProps) {<DropdownMenuItem>Edit</DropdownMenuItem></DialogTrigger><DropdownMenuItem>- <Link href={`/status-page/${page.slug}`}>View</Link>+ {/* TODO: forward directly to subdomain */}+ <Link href={`/status-page/${page.slug}`} target="_blank">+ View+ </Link></DropdownMenuItem><AlertDialogTrigger asChild><DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">@@ -119,10 +123,10 @@ export function ActionButton({ page, allMonitors }: ActionButtonProps) {e.preventDefault();onDelete();}}- disabled={saving}+ disabled={isPending}className="bg-destructive text-destructive-foreground hover:bg-destructive/90">- {!saving ? "Delete" : <LoadingAnimation />}+ {!isPending ? "Delete" : <LoadingAnimation />}</AlertDialogAction></AlertDialogFooter></AlertDialogContent>@@ -144,12 +148,12 @@ export function ActionButton({ page, allMonitors }: ActionButtonProps) {<Buttontype="submit"form="status-page-update"- disabled={saving}+ disabled={isPending}onSubmit={(e) => {e.preventDefault();}}>- {!saving ? "Confirm" : <LoadingAnimation />}+ {!isPending ? "Confirm" : <LoadingAnimation />}</Button></DialogFooter></DialogContent>diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/create-form.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/create-form.tsxindex c0cfd744b..d7c3e96b0 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/create-form.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/create-form.tsx@@ -32,20 +32,19 @@ interface Props {export function CreateForm({ workspaceSlug, allMonitors, disabled }: Props) {const router = useRouter();const [open, setOpen] = React.useState(false);- const [saving, setSaving] = React.useState(false);+ const [isPending, startTransition] = React.useTransition();async function onCreate({...props}: z.infer<typeof insertPageSchemaWithMonitors>) {- setSaving(true);- // await api.monitor.getMonitorsByWorkspace.revalidate();- await api.page.createPage.mutate({- ...props,- workspaceSlug,+ startTransition(async () => {+ await api.page.createPage.mutate({+ ...props,+ workspaceSlug,+ });+ router.refresh();+ setOpen(false);});- router.refresh();- setSaving(false);- setOpen(false);}return (@@ -66,8 +65,8 @@ export function CreateForm({ workspaceSlug, allMonitors, disabled }: Props) {/></div><DialogFooter>- <Button type="submit" form="status-page-create" disabled={saving}>- {!saving ? "Confirm" : <LoadingAnimation />}+ <Button type="submit" form="status-page-create" disabled={isPending}>+ {!isPending ? "Confirm" : <LoadingAnimation />}</Button></DialogFooter></DialogContent>diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsxindex a9fb657b5..844c5a872 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx@@ -2,11 +2,16 @@ import * as React from "react";import { Container } from "@/components/dashboard/container";import { Header } from "@/components/dashboard/header";+import { Badge } from "@/components/ui/badge";+import { plansConfig } from "@/config/plans";+import { cn } from "@/lib/utils";import { api } from "@/trpc/server";import { ActionButton } from "./_components/action-button";import { CreateForm } from "./_components/create-form";import { EmptyState } from "./_components/empty-state";+const limit = plansConfig.free.limits["status-pages"];+export default async function Page({params,}: {@@ -28,7 +33,7 @@ export default async function Page({<CreateFormworkspaceSlug={params.workspaceSlug}allMonitors={monitors}- disabled={!Boolean(monitors)}+ disabled={!Boolean(monitors) || pages?.length === limit}/></Header>{Boolean(pages?.length) ? (@@ -51,6 +56,24 @@ export default async function Page({<dt>Slug</dt><dd className="font-mono">{page.slug}</dd></div>+ <div className="flex min-w-0 items-center justify-between gap-3">+ <dt>Monitors</dt>+ <dd className="flex flex-wrap justify-end gap-2">+ {page.monitorsToPages.map(+ ({ monitor: { id, name, active } }, i) => (+ <Badge key={id} variant={active ? "default" : "outline"}>+ {name}+ <span+ className={cn(+ "ml-1 inline-block h-1.5 w-1.5 rounded-full",+ active ? "bg-green-500" : "bg-red-500",+ )}+ />+ </Badge>+ ),+ )}+ </dd>+ </div></dl></Container>))diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsxindex aa4261cda..3d145490e 100644--- a/apps/web/src/app/layout.tsx+++ b/apps/web/src/app/layout.tsx@@ -48,6 +48,7 @@ export default function RootLayout({return (<ClerkProvider><html lang="en">+ {/* TODO: remove plausible from root layout (to avoid tracking subdomains) */}<PlausibleProvider domain="openstatus.dev"><body className={`${inter.className} ${calSans.variable}`}><Background>{children}</Background>diff --git a/apps/web/src/app/monitor/[id]/page.tsx b/apps/web/src/app/monitor/[id]/page.tsxindex fad04fb21..e4e8c3c8f 100644--- a/apps/web/src/app/monitor/[id]/page.tsx+++ b/apps/web/src/app/monitor/[id]/page.tsx@@ -28,6 +28,7 @@ export default async function Monitor({}) {const search = searchParamsSchema.safeParse(searchParams);const data = search.success+ // TODO: lets hard-code our `monitorId` here? await getResponseListData({ monitorId: params.id, ...search.data }): await getResponseListData({ monitorId: params.id });if (!data || !search.success) return <div>Something went wrong</div>;diff --git a/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx b/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsxindex c73416073..9ad4e4fb5 100644--- a/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx+++ b/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx@@ -29,6 +29,7 @@ export default async function Monitor({}) {const search = searchParamsSchema.safeParse(searchParams);const data = search.success+ // TODO: lets hard-code our `monitorId` here? await getResponseListData({ monitorId: params.id, ...search.data }): await getResponseListData({ monitorId: params.id });diff --git a/apps/web/src/app/status-page/[domain]/page.tsx b/apps/web/src/app/status-page/[domain]/page.tsxindex 3f47ba561..6ad2dcbb2 100644--- a/apps/web/src/app/status-page/[domain]/page.tsx+++ b/apps/web/src/app/status-page/[domain]/page.tsx@@ -41,10 +41,14 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {title: page?.title,description: page?.description,twitter: {+ images: [`/api/og?monitorId=${page?.id}`],+ card: "summary_large_image",title: page?.title,description: page?.description,},openGraph: {+ type: "website",+ images: [`/api/og?monitorId=${page?.id}`],title: page?.title,description: page?.description,},diff --git a/apps/web/src/components/forms/montitor-form.tsx b/apps/web/src/components/forms/montitor-form.tsxindex f6a1fca93..6465ef3de 100644--- a/apps/web/src/components/forms/montitor-form.tsx+++ b/apps/web/src/components/forms/montitor-form.tsx@@ -28,6 +28,16 @@ import {SelectValue,} from "@/components/ui/select";import { Switch } from "@/components/ui/switch";+import { plansConfig } from "@/config/plans";++const limit = plansConfig.free.limits.periodicity;+const cronJobs = [+ { value: "1m", label: "1 minute" },+ { value: "5m", label: "5 minutes" },+ { value: "10m", label: "10 minutes" },+ { value: "30m", label: "30 minutes" },+ { value: "1h", label: "1 hour" },+] as const;type Schema = z.infer<typeof insertMonitorSchema>;@@ -142,19 +152,15 @@ export function MonitorForm({ id, defaultValues, onSubmit }: Props) {</SelectTrigger></FormControl><SelectContent>- <SelectItem value="1m" disabled>- 1 minute- </SelectItem>- <SelectItem value="5m" disabled>- 5 minutes- </SelectItem>- <SelectItem value="10m">10 minutes</SelectItem>- <SelectItem value="30m" disabled>- 30 minutes- </SelectItem>- <SelectItem value="1h" disabled>- 1 hour- </SelectItem>+ {cronJobs.map(({ label, value }) => (+ <SelectItem+ key={value}+ value={value}+ disabled={!limit.includes(value)}+ >+ {label}+ </SelectItem>+ ))}</SelectContent></Select><FormDescription>diff --git a/apps/web/src/components/status-page/monitor.tsx b/apps/web/src/components/status-page/monitor.tsxindex cb87257b0..9b1615f1a 100644--- a/apps/web/src/components/status-page/monitor.tsx+++ b/apps/web/src/components/status-page/monitor.tsx@@ -11,7 +11,7 @@ export const Monitor = async ({monitor: z.infer<typeof selectMonitorSchema>;}) => {const data = await getMonitorListData({- siteId: "openstatus", // TODO: use proper id+ monitorId: String(monitor.id),groupBy: "day",});diff --git a/apps/web/src/config/pages.ts b/apps/web/src/config/pages.tsindex bd7711bcd..896463bad 100644--- a/apps/web/src/config/pages.ts+++ b/apps/web/src/config/pages.ts@@ -27,6 +27,7 @@ export const pagesConfig: Page[] = [description: "War room where you handle the incidents.",href: "/incidents",icon: "siren",+ disabled: true,},// ...];diff --git a/apps/web/src/config/plans.ts b/apps/web/src/config/plans.tsnew file mode 100644index 000000000..ea208bb82--- /dev/null+++ b/apps/web/src/config/plans.ts@@ -0,0 +1,21 @@+import type * as z from "zod";++import type { periodicityEnum } from "@openstatus/db/src/schema";++type Plan = {+ limits: {+ monitors: number;+ "status-pages": number;+ periodicity: Partial<z.infer<typeof periodicityEnum>>[];+ };+};++export const plansConfig: Record<"free", Plan> = {+ free: {+ limits: {+ monitors: 5,+ "status-pages": 1,+ periodicity: ["10m"],+ },+ },+};diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.tsindex c8bec2b69..a895f9728 100644--- a/apps/web/src/middleware.ts+++ b/apps/web/src/middleware.ts@@ -33,8 +33,8 @@ export const getValidSubdomain = (host?: string | null) => {host = window.location.host;}// we should improve here for custom vercel deploy page- if (host && host.includes(".") && !host.includes(".vercel.app")) {- const candidate = host.split(".")[0];+ if (host && host.includes(".") && (!host.includes(".vercel.app") || !host.includes('.ngrok.app'))) {+ const candidate = host.split(".")[0];if (candidate && !candidate.includes("www")) {// Valid candidatesubdomain = candidate;diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.tsindex 1b9fcb022..58ea0c660 100644--- a/packages/api/src/router/page.ts+++ b/packages/api/src/router/page.ts@@ -237,7 +237,7 @@ export const pageRouter = createTRPCRouter({const monitors = await opts.ctx.db.select().from(monitor)- .where(inArray(monitor.id, monitorsId))+ .where(and(inArray(monitor.id, monitorsId), eq(monitor.active, true))) // REMINDER: this is hardcoded.all();return selectPageSchemaWithRelation.parse({ ...result, monitors });