Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: page-components tracker statuspage (#1788)
Maximilian Kaske3452a96aa3a9
diff --git a/apps/status-page/src/app/(public)/client.tsx b/apps/status-page/src/app/(public)/client.tsxindex c31d2d913..4dc206f06 100644--- a/apps/status-page/src/app/(public)/client.tsx+++ b/apps/status-page/src/app/(public)/client.tsx@@ -343,11 +343,11 @@ function ThemePlaygroundEvents({<StatusEventTitle className="inline-flex gap-1">{report.title}</StatusEventTitle>- {report.monitorsToStatusReports.length > 0 ? (+ {report.statusReportsToPageComponents.length > 0 ? (<StatusEventAffected>- {report.monitorsToStatusReports.map((affected) => (- <StatusEventAffectedBadge key={affected.monitor.id}>- {affected.monitor.name}+ {report.statusReportsToPageComponents.map((affected) => (+ <StatusEventAffectedBadge key={affected.pageComponent.id}>+ {affected.pageComponent.name}</StatusEventAffectedBadge>))}</StatusEventAffected>diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsxindex 89900e219..36e1b1480 100644--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx@@ -77,13 +77,17 @@ export default function Page() {<StatusEventTitleCheck />) : null}</StatusEventTitle>- {report.monitorsToStatusReports.length > 0 ? (+ {report.statusReportsToPageComponents.length > 0 ? (<StatusEventAffected>- {report.monitorsToStatusReports.map((affected) => (- <StatusEventAffectedBadge key={affected.monitor.id}>- {affected.monitor.name}- </StatusEventAffectedBadge>- ))}+ {report.statusReportsToPageComponents.map(+ (affected) => (+ <StatusEventAffectedBadge+ key={affected.pageComponent.id}+ >+ {affected.pageComponent.name}+ </StatusEventAffectedBadge>+ ),+ )}</StatusEventAffected>) : null}<StatusEventTimelineReport@@ -115,14 +119,14 @@ export default function Page() {><StatusEventContent><StatusEventTitle>{maintenance.title}</StatusEventTitle>- {maintenance.maintenancesToMonitors.length > 0 ? (+ {maintenance.maintenancesToPageComponents.length > 0 ? (<StatusEventAffected>- {maintenance.maintenancesToMonitors.map(+ {maintenance.maintenancesToPageComponents.map((affected) => (<StatusEventAffectedBadge- key={affected.monitor.id}+ key={affected.pageComponent.id}>- {affected.monitor.name}+ {affected.pageComponent.name}</StatusEventAffectedBadge>),)}diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsxindex 4ca843829..20cb72671 100644--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsx@@ -50,9 +50,9 @@ export default function MaintenancePage() {<StatusEventContent hoverable={false}><StatusEventTitle>{maintenance.title}</StatusEventTitle><StatusEventAffected>- {maintenance.maintenancesToMonitors.map((affected) => (- <StatusEventAffectedBadge key={affected.monitor.id}>- {affected.monitor.name}+ {maintenance.maintenancesToPageComponents.map((affected) => (+ <StatusEventAffectedBadge key={affected.pageComponent.id}>+ {affected.pageComponent.name}</StatusEventAffectedBadge>))}</StatusEventAffected>diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsxindex bdd8db626..1cd49cd63 100644--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsx@@ -59,11 +59,11 @@ export default function ReportPage() {{report.title}{isReportResolvedOnly ? <StatusEventTitleCheck /> : null}</StatusEventTitle>- {report.monitorsToStatusReports.length > 0 ? (+ {report.statusReportsToPageComponents.length > 0 ? (<StatusEventAffected>- {report.monitorsToStatusReports.map((affected) => (- <StatusEventAffectedBadge key={affected.monitor.id}>- {affected.monitor.name}+ {report.statusReportsToPageComponents.map((affected) => (+ <StatusEventAffectedBadge key={affected.pageComponent.id}>+ {affected.pageComponent.name}</StatusEventAffectedBadge>))}</StatusEventAffected>diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/feed/json/route.ts b/apps/status-page/src/app/(status-page)/[domain]/(public)/feed/json/route.tsindex 4d05b2b30..5ae6cedc6 100644--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/feed/json/route.ts+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/feed/json/route.ts@@ -73,10 +73,10 @@ export async function GET(from: maintenance.from,to: maintenance.to,updatedAt: maintenance.updatedAt,- // @deprecated Use components instead- monitors: maintenance.maintenancesToMonitors.map(- (item) => item.monitor.id,- ),+ // @deprecated Use components instead - returning monitor IDs for backwards compatibility+ monitors: maintenance.maintenancesToPageComponents+ .map((item) => item.pageComponent.monitorId)+ .filter((id): id is number => id !== null),// New field - references page component IDspageComponents: maintenance.maintenancesToPageComponents.map((item) => item.pageComponentId,@@ -87,8 +87,10 @@ export async function GET(title: report.title,updatedAt: report.updatedAt,status: report.status,- // @deprecated Use components instead- monitors: report.monitorsToStatusReports.map((item) => item.monitor.id),+ // @deprecated Use components instead - returning monitor IDs for backwards compatibility+ monitors: report.statusReportsToPageComponents+ .map((item) => item.pageComponent.monitorId)+ .filter((id): id is number => id !== null),// New field - references page component IDspageComponents: report.statusReportsToPageComponents.map((item) => item.pageComponentId,diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsxindex a8d600711..eda639b62 100644--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx@@ -27,6 +27,7 @@ import { StatusFeed } from "@/components/status-page/status-feed";import { StatusMonitor } from "@/components/status-page/status-monitor";import { StatusTrackerGroup } from "@/components/status-page/status-tracker-group";import { Separator } from "@/components/ui/separator";+import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";import { useTRPC } from "@/lib/trpc/client";import { cn } from "@/lib/utils";import { useQuery } from "@tanstack/react-query";@@ -35,6 +36,7 @@ import { notFound, useParams } from "next/navigation";import { useMemo } from "react";export default function Page() {+ const prefix = usePathnamePrefix();const { domain } = useParams<{ domain: string }>();const { cardType, barType, showUptime } = useStatusPage();const trpc = useTRPC();@@ -72,12 +74,12 @@ export default function Page() {const { data: uptimeData, isLoading } = useQuery({...trpc.statusPage.getUptime.queryOptions({slug: domain,- monitorIds:- pageInitial?.monitors?.map((monitor) => monitor.id.toString()) || [],+ pageComponentIds:+ pageInitial?.pageComponents?.map((c) => c.id.toString()) || [],cardType,barType,}),- enabled: !!pageInitial && pageInitial.monitors.length > 0,+ enabled: !!pageInitial && pageInitial.pageComponents.length > 0,});// NOTE: we need to filter out the incidents as we don't want to show all of them in the banner - a single one is enough@@ -149,7 +151,7 @@ export default function Page() {key={`${e.type}-${e.id}`}><Link- href={`./events/report/${report.id}`}+ href={`${prefix ? `/${prefix}` : ""}/events/report/${report.id}`}className="rounded-lg"><StatusBannerContainer status={e.status}>@@ -160,14 +162,14 @@ export default function Page() {isLast={true}withSeparator={false}/>- {report.monitorsToStatusReports.length > 0 ? (+ {report.statusReportsToPageComponents.length > 0 ? (<StatusEventAffected>- {report.monitorsToStatusReports.map(+ {report.statusReportsToPageComponents.map((affected) => (<StatusEventAffectedBadge- key={affected.monitor.id}+ key={affected.pageComponent.id}>- {affected.monitor.name}+ {affected.pageComponent.name}</StatusEventAffectedBadge>),)}@@ -190,7 +192,7 @@ export default function Page() {key={e.id}><Link- href={`./events/maintenance/${maintenance.id}`}+ href={`${prefix ? `/${prefix}` : ""}/events/maintenance/${maintenance.id}`}className="rounded-lg"><StatusBannerContainer status={e.status}>@@ -199,14 +201,15 @@ export default function Page() {maintenance={maintenance}withDot={false}/>- {maintenance.maintenancesToMonitors.length > 0 ? (+ {maintenance.maintenancesToPageComponents.length >+ 0 ? (<StatusEventAffected>- {maintenance.maintenancesToMonitors.map(+ {maintenance.maintenancesToPageComponents.map((affected) => (<StatusEventAffectedBadge- key={affected.monitor.id}+ key={affected.pageComponent.id}>- {affected.monitor.name}+ {affected.pageComponent.name}</StatusEventAffectedBadge>),)}@@ -239,16 +242,23 @@ export default function Page() {{page.trackers.length > 0 ? (<StatusContent className="gap-5">{page.trackers.map((tracker, index) => {- if (tracker.type === "monitor") {- const monitor = tracker.monitor;+ if (tracker.type === "component") {+ const component = tracker.component;++ // Fetch uptime data by component IDconst { data, uptime } =- uptimeData?.find((m) => m.id === monitor.id) ?? {};+ uptimeData?.find((u) => u.pageComponentId === component.id) ??+ {};+return (<StatusMonitor- key={`monitor-${monitor.id}`}- status={monitor.status}+ key={`component-${component.id}`}+ status={component.status}data={data}- monitor={monitor}+ monitor={{+ name: component.name,+ description: component.description,+ }}uptime={uptime}showUptime={showUptime}isLoading={isLoading}@@ -264,15 +274,21 @@ export default function Page() {// NOTE: we only want to open the first group if it is the first onedefaultOpen={firstGroupIndex === index && index === 0}>- {tracker.monitors.map((monitor) => {+ {tracker.components.map((component) => {const { data, uptime } =- uptimeData?.find((m) => m.id === monitor.id) ?? {};+ uptimeData?.find(+ (u) => u.pageComponentId === component.id,+ ) ?? {};+return (<StatusMonitor- key={`monitor-${monitor.id}`}- status={monitor.status}+ key={`component-${component.id}`}+ status={component.status}data={data}- monitor={monitor}+ monitor={{+ name: component.name,+ description: component.description,+ }}uptime={uptime}showUptime={showUptime}isLoading={isLoading}@@ -295,8 +311,8 @@ export default function Page() {).map((report) => ({...report,- affected: report.monitorsToStatusReports.map(- (monitor) => monitor.monitor.name,+ affected: report.statusReportsToPageComponents.map(+ (component) => component.pageComponent.name,),updates: report.statusReportUpdates,}))}@@ -309,8 +325,8 @@ export default function Page() {).map((maintenance) => ({...maintenance,- affected: maintenance.maintenancesToMonitors.map(- (monitor) => monitor.monitor.name,+ affected: maintenance.maintenancesToPageComponents.map(+ (component) => component.pageComponent.name,),}))}/>diff --git a/apps/status-page/src/components/status-page/status-monitor.tsx b/apps/status-page/src/components/status-page/status-monitor.tsxindex 0e47e4be4..24c0d15e5 100644--- a/apps/status-page/src/components/status-page/status-monitor.tsx+++ b/apps/status-page/src/components/status-page/status-monitor.tsx@@ -43,7 +43,7 @@ export function StatusMonitor({uptime?: string;monitor: {name: string;- description: string;+ description?: string | null;};data?: Data;isLoading?: boolean;diff --git a/packages/api/src/router/statusPage.e2e.test.ts b/packages/api/src/router/statusPage.e2e.test.tsindex 01b0c6982..d69fb0b01 100644--- a/packages/api/src/router/statusPage.e2e.test.ts+++ b/packages/api/src/router/statusPage.e2e.test.ts@@ -823,20 +823,28 @@ describe("statusPage.get endpoint validation", () => {expect(tracker).toHaveProperty("type");expect(tracker).toHaveProperty("order");- if (tracker.type === "monitor") {- expect(tracker).toHaveProperty("monitor");- expect(tracker.monitor).toHaveProperty("id");- expect(tracker.monitor).toHaveProperty("name");- expect(tracker.monitor).toHaveProperty("status");+ if (tracker.type === "component") {+ expect(tracker).toHaveProperty("component");+ expect(tracker.component).toHaveProperty("id");+ expect(tracker.component).toHaveProperty("name");+ expect(tracker.component).toHaveProperty("status");+ expect(tracker.component).toHaveProperty("type");+ expect(["monitor", "external"]).toContain(tracker.component.type);expect(["success", "degraded", "error", "info"]).toContain(- tracker.monitor.status,+ tracker.component.status,);++ // Monitor-type components should have monitor relation+ if (tracker.component.type === "monitor") {+ expect(tracker.component).toHaveProperty("monitor");+ expect(tracker.component.monitor).toBeDefined();+ }} else if (tracker.type === "group") {expect(tracker).toHaveProperty("groupId");expect(tracker).toHaveProperty("groupName");- expect(tracker).toHaveProperty("monitors");+ expect(tracker).toHaveProperty("components");expect(tracker).toHaveProperty("status");- expect(Array.isArray(tracker.monitors)).toBe(true);+ expect(Array.isArray(tracker.components)).toBe(true);expect(["success", "degraded", "error", "info"]).toContain(tracker.status,);diff --git a/packages/api/src/router/statusPage.ts b/packages/api/src/router/statusPage.tsindex 1d03aefc7..5c28496f3 100644--- a/packages/api/src/router/statusPage.ts+++ b/packages/api/src/router/statusPage.ts@@ -21,6 +21,7 @@ import { TRPCError } from "@trpc/server";import { endOfDay, startOfDay, subDays } from "date-fns";import { createTRPCRouter, publicProcedure } from "../trpc";import {+ type StatusData,fillStatusDataFor45Days,fillStatusDataFor45DaysNoop,getEvents,@@ -28,10 +29,6 @@ import {getWorstVariant,isMonitorComponent,setDataByType,- transformMaintenanceWithPageComponents,- transformStatusReportWithPageComponents,- transformToMaintenancesToMonitors,- transformToMonitorsToStatusReports,} from "./statusPage.utils";import {getMetricsLatencyMultiProcedure,@@ -128,6 +125,60 @@ export const statusPageRouter = createTRPCRouter({const monitorComponents = pageComponents.filter(isMonitorComponent);+ // Transform all page components (both monitor and external types)+ const components = pageComponents.map((c) => {+ const events = getEvents({+ maintenances: _page.maintenances,+ incidents: c.monitor?.incidents ?? [],+ reports: _page.statusReports,+ pageComponentId: c.id,+ monitorId: c.monitorId ?? undefined,+ componentType: c.type,+ });++ // Calculate status based on component type+ let status: "success" | "degraded" | "error" | "info";++ if (c.type === "external") {+ // External: only reports and maintenances affect status+ status = events.some((e) => e.type === "report" && !e.to)+ ? "degraded"+ : events.some(+ (e) =>+ e.type === "maintenance" &&+ e.to &&+ e.from.getTime() <= new Date().getTime() &&+ e.to.getTime() >= new Date().getTime(),+ )+ ? "info"+ : "success";+ } else {+ // Monitor: incidents, reports, and maintenances affect status+ status =+ events.some((e) => e.type === "incident" && !e.to) &&+ barType !== "manual"+ ? "error"+ : events.some((e) => e.type === "report" && !e.to)+ ? "degraded"+ : events.some(+ (e) =>+ e.type === "maintenance" &&+ e.to &&+ e.from.getTime() <= new Date().getTime() &&+ e.to.getTime() >= new Date().getTime(),+ )+ ? "info"+ : "success";+ }++ return {+ ...c,+ status,+ events,+ };+ });++ // Keep monitors for backward compatibility with existing fieldsconst monitors = monitorComponents.map((c) => {const events = getEvents({maintenances: _page.maintenances,@@ -208,19 +259,19 @@ export const statusPageRouter = createTRPCRouter({const monitorGroups = _page.pageComponentGroups;- // Create trackers array with grouped and ungrouped monitors+ // Create trackers array with grouped and ungrouped componentsconst groupedMap = new Map<number | null,{groupId: number | null;groupName: string | null;- monitors: typeof monitors;+ components: typeof components;minOrder: number;}>();- monitors.forEach((monitor) => {- const groupId = monitor.monitorGroupId ?? null;+ components.forEach((component) => {+ const groupId = component.groupId ?? null;const group = groupId? monitorGroups.find((g) => g?.id === groupId): null;@@ -230,24 +281,24 @@ export const statusPageRouter = createTRPCRouter({groupedMap.set(groupId, {groupId,groupName,- monitors: [],- minOrder: monitor.order ?? 0,+ components: [],+ minOrder: component.order ?? 0,});}const currentGroup = groupedMap.get(groupId);if (currentGroup) {- currentGroup.monitors.push(monitor);+ currentGroup.components.push(component);currentGroup.minOrder = Math.min(currentGroup.minOrder,- monitor.order ?? 0,+ component.order ?? 0,);}});// Convert to trackers array- type MonitorTracker = {- type: "monitor";- monitor: (typeof monitors)[number];+ type PageComponentTracker = {+ type: "component";+ component: (typeof components)[number];order: number;};@@ -255,27 +306,27 @@ export const statusPageRouter = createTRPCRouter({type: "group";groupId: number;groupName: string;- monitors: typeof monitors;+ components: typeof components;status: "success" | "degraded" | "error" | "info" | "empty";order: number;};- type Tracker = MonitorTracker | GroupTracker;+ type Tracker = PageComponentTracker | GroupTracker;const trackers: Tracker[] = Array.from(groupedMap.values()).flatMap((group): Tracker[] => {if (group.groupId === null) {- // Ungrouped monitors - return as individual trackers- return group.monitors.map(- (monitor): MonitorTracker => ({- type: "monitor",- monitor,- order: monitor.order ?? 0,+ // Ungrouped components - return as individual trackers+ return group.components.map(+ (component): PageComponentTracker => ({+ type: "component",+ component,+ order: component.order ?? 0,}),);}- // Grouped monitors - return as single group tracker- const sortedMonitors = group.monitors.sort(+ // Grouped components - return as single group tracker+ const sortedComponents = group.components.sort((a, b) => (a.groupOrder ?? 0) - (b.groupOrder ?? 0),);return [@@ -283,10 +334,10 @@ export const statusPageRouter = createTRPCRouter({type: "group",groupId: group.groupId,groupName: group.groupName ?? "",- monitors: sortedMonitors,+ components: sortedComponents,status: getWorstVariant(- group.monitors.map(- (m) => m.status as "success" | "degraded" | "error" | "info",+ group.components.map(+ (c) => c.status as "success" | "degraded" | "error" | "info",),),order: group.minOrder,@@ -297,40 +348,26 @@ export const statusPageRouter = createTRPCRouter({const whiteLabel = ws.data?.limits["white-label"] ?? false;- // Pre-build a Map for O(1) lookups to avoid N+1 query problem- const monitorByIdMap = new Map(- pageComponents- .filter(isMonitorComponent)- .map((c) => [c.monitorId, c.monitor]),- );-// Transform statusReports to include monitorsToStatusReports format- const statusReports = _page.statusReports- .sort((a, b) => {- // Sort reports without updates to the beginning- if (- a.statusReportUpdates.length === 0 &&- b.statusReportUpdates.length === 0- )- return 0;- if (a.statusReportUpdates.length === 0) return -1;- if (b.statusReportUpdates.length === 0) return -1;- return (- b.statusReportUpdates[- b.statusReportUpdates.length - 1- ].date.getTime() -- a.statusReportUpdates[- a.statusReportUpdates.length - 1- ].date.getTime()- );- })- .map((report) =>- transformStatusReportWithPageComponents(report, monitorByIdMap),+ const statusReports = _page.statusReports.sort((a, b) => {+ // Sort reports without updates to the beginning+ if (+ a.statusReportUpdates.length === 0 &&+ b.statusReportUpdates.length === 0+ )+ return 0;+ if (a.statusReportUpdates.length === 0) return -1;+ if (b.statusReportUpdates.length === 0) return -1;+ return (+ b.statusReportUpdates[+ b.statusReportUpdates.length - 1+ ].date.getTime() -+ a.statusReportUpdates[a.statusReportUpdates.length - 1].date.getTime());+ });- // Transform maintenances to include maintenancesToMonitors format- const maintenances = _page.maintenances.map((m) =>- transformMaintenanceWithPageComponents(m, monitorByIdMap),+ const maintenances = _page.maintenances.sort(+ (a, b) => a.from.getTime() - b.from.getTime(),);return selectPublicPageSchemaWithRelation.parse({@@ -380,29 +417,15 @@ export const statusPageRouter = createTRPCRouter({if (!_maintenance) return null;- const pageComponents = selectPageComponentWithMonitorRelation- .array()- .parse(- _maintenance.maintenancesToPageComponents.map((m) => m.pageComponent),- );-- // Transform to expected format (maintenancesToMonitors)- const maintenancesToMonitors = transformToMaintenancesToMonitors(- _maintenance.id,- pageComponents,- );-- return selectMaintenancePageSchema.parse({- ..._maintenance,- maintenancesToMonitors,- });+ const props: z.infer<typeof selectMaintenancePageSchema> = _maintenance;+ return selectMaintenancePageSchema.parse(props);}),getUptime: publicProcedure.input(z.object({slug: z.string().toLowerCase(),- monitorIds: z.string().array(),+ pageComponentIds: z.string().array(),cardType: z.enum(["requests", "duration", "dominant", "manual"]).prefault("requests"),@@ -430,8 +453,8 @@ export const statusPageRouter = createTRPCRouter({},pageComponents: {where: inArray(- pageComponent.monitorId,- opts.input.monitorIds.map(Number),+ pageComponent.id,+ opts.input.pageComponentIds.map(Number),),with: {monitor: {@@ -450,9 +473,10 @@ export const statusPageRouter = createTRPCRouter({.array().parse(_page.pageComponents);- const monitors = pageComponents.filter(isMonitorComponent);+ // Early return if no components to process+ if (pageComponents.length === 0) return [];- if (monitors.length !== opts.input.monitorIds.length) return null;+ const monitors = pageComponents.filter(isMonitorComponent);const monitorsByType = {http: monitors.filter((c) => c.monitor.jobType === "http"),@@ -486,72 +510,86 @@ export const statusPageRouter = createTRPCRouter({| Awaited<ReturnType<(typeof proceduresByType)["dns"]>>["data"]>();- if (statusHttp?.data) {- statusHttp.data.forEach((status) => {- const monitorId = status.monitorId;- if (!statusDataByMonitorId.has(monitorId)) {- statusDataByMonitorId.set(monitorId, []);- }- statusDataByMonitorId.get(monitorId)?.push(status);- });- }-- if (statusTcp?.data) {- statusTcp.data.forEach((status) => {- const monitorId = status.monitorId;- if (!statusDataByMonitorId.has(monitorId)) {- statusDataByMonitorId.set(monitorId, []);- }- statusDataByMonitorId.get(monitorId)?.push(status);- });- }-- if (statusDns?.data) {- statusDns.data.forEach((status) => {- const monitorId = status.monitorId;- if (!statusDataByMonitorId.has(monitorId)) {- statusDataByMonitorId.set(monitorId, []);- }- statusDataByMonitorId.get(monitorId)?.push(status);- });+ // Consolidate status data from all monitor types into the map+ for (const statusResult of [statusHttp, statusTcp, statusDns]) {+ if (statusResult?.data) {+ statusResult.data.forEach((status) => {+ const monitorId = status.monitorId;+ if (!statusDataByMonitorId.has(monitorId)) {+ statusDataByMonitorId.set(monitorId, []);+ }+ statusDataByMonitorId.get(monitorId)?.push(status);+ });+ }}const lookbackPeriod = WORKSPACES.includes(_page.workspaceId ?? 0)? 30: 45;- return monitors.map((c) => {- const monitorId = c.monitor.id.toString();+ return pageComponents.map((c) => {const events = getEvents({maintenances: _page.maintenances,- incidents: c.monitor.incidents ?? [],+ incidents: c.monitor?.incidents ?? [],reports: _page.statusReports,- monitorId: c.monitor.id,+ pageComponentId: c.id,+ monitorId: c.monitorId ?? undefined,+ componentType: c.type,});- const rawData = statusDataByMonitorId.get(monitorId) || [];- const filledData =- process.env.NOOP_UPTIME === "true"- ? fillStatusDataFor45DaysNoop({- errorDays: [],- degradedDays: [],- lookbackPeriod,- })- : fillStatusDataFor45Days(rawData, monitorId, lookbackPeriod);++ // Determine whether to use real Tinybird data or synthetic data+ const shouldUseRealData =+ c.type === "monitor" &&+ c.monitor &&+ opts.input.barType !== "manual" &&+ process.env.NOOP_UPTIME !== "true";++ let filledData: StatusData[];+ if (shouldUseRealData) {+ // Monitor components with real data: use Tinybird data+ const monitorId = c.monitor?.id.toString() || "";+ const rawData = statusDataByMonitorId.get(monitorId) || [];+ filledData = fillStatusDataFor45Days(+ rawData,+ monitorId,+ lookbackPeriod,+ );+ } else {+ // External components, manual mode, or NOOP mode: use synthetic data+ filledData = fillStatusDataFor45DaysNoop({+ errorDays: [],+ degradedDays: [],+ lookbackPeriod,+ });+ }++ // External components always use manual mode since they don't have real monitoring data+ const effectiveBarType =+ c.type === "external" ? "manual" : opts.input.barType;+ const effectiveCardType =+ c.type === "external" ? "manual" : opts.input.cardType;+const processedData = setDataByType({events,data: filledData,- cardType: opts.input.cardType,- barType: opts.input.barType,+ cardType: effectiveCardType,+ barType: effectiveBarType,});const uptime = getUptime({data: filledData,events,- barType: opts.input.barType,- cardType: opts.input.cardType,+ barType: effectiveBarType,+ cardType: effectiveCardType,});return {- ...c.monitor,+ id: c.id,+ pageComponentId: c.id,+ name: c.name,+ description: c.description,+ type: c.type,+ // For monitor-type components, include monitor fields+ ...(c.monitor ? { monitor: c.monitor } : {}),data: processedData,uptime,};@@ -617,22 +655,8 @@ export const statusPageRouter = createTRPCRouter({if (!_report) return null;- const pageComponents = selectPageComponentWithMonitorRelation- .array()- .parse(- _report.statusReportsToPageComponents.map((r) => r.pageComponent),- );-- // Transform to expected format (monitorsToStatusReports)- const monitorsToStatusReports = transformToMonitorsToStatusReports(- _report.id,- pageComponents,- );-- return selectStatusReportPageSchema.parse({- ..._report,- monitorsToStatusReports,- });+ const result: z.infer<typeof selectStatusReportPageSchema> = _report;+ return selectStatusReportPageSchema.parse(result);}),getNoopReport: publicProcedure.query(async () => {@@ -643,39 +667,31 @@ export const statusPageRouter = createTRPCRouter({const identifiedDate = new Date(date.setMinutes(date.getMinutes() - 32));const investigatingDate = new Date(date.setMinutes(date.getMinutes() - 4));- return selectStatusReportPageSchema.parse({+ const props: z.infer<typeof selectStatusReportPageSchema> = {id: 1,pageId: 1,+ workspaceId: 1,status: "investigating" as const,title: "API Latency Issues",- message: "We are currently investigating elevated API response times.",createdAt: new Date(new Date().setDate(new Date().getDate() - 2)),updatedAt: new Date(new Date().setDate(new Date().getDate() - 1)),- monitorsToStatusReports: [+ statusReportsToPageComponents: [{- monitorId: 1,+ pageComponentId: 1,statusReportId: 1,- monitor: {+ pageComponent: {+ workspaceId: 1,+ pageId: 1,id: 1,- jobType: "http" as const,- periodicity: "30s" as const,- status: "active" as const,- active: true,- regions: ["ams", "fra"],- url: "https://api.example.com",name: "API Monitor",+ type: "monitor" as const,+ monitorId: 1,+ order: 1,+ groupId: null,+ groupOrder: null,description: "Main API endpoint",- headers: null,- body: null,- method: "GET" as const,- public: true,- deletedAt: null,createdAt: new Date(new Date().setDate(new Date().getDate() - 30)),updatedAt: new Date(new Date().setDate(new Date().getDate() - 30)),- workspaceId: 1,- timeout: 30000,- degradedAfter: null,- assertions: null,},},],@@ -720,7 +736,9 @@ export const statusPageRouter = createTRPCRouter({updatedAt: investigatingDate,},],- });+ };++ return selectStatusReportPageSchema.parse(props);}),getMonitors: publicProcedurediff --git a/packages/api/src/router/statusPage.utils.test.ts b/packages/api/src/router/statusPage.utils.test.tsindex 73cbda91e..596c20aec 100644--- a/packages/api/src/router/statusPage.utils.test.ts+++ b/packages/api/src/router/statusPage.utils.test.ts@@ -1,6 +1,14 @@import { describe, expect, it } from "bun:test";+import type {+ Incident,+ Maintenance,+ PageComponent,+ StatusReport,+ StatusReportUpdate,+} from "@openstatus/db/src/schema";import {fillStatusDataFor45Days,+ getEvents,getUptime,setDataByType,} from "./statusPage.utils";@@ -896,3 +904,262 @@ describe("getUptime", () => {});});});++describe("getEvents - pageComponent filtering", () => {+ // Helper to create a mock page component+ function createMockPageComponent(+ id: number,+ monitorId?: number,+ ): PageComponent {+ return {+ id,+ workspaceId: 1,+ pageId: 1,+ type: monitorId ? ("monitor" as const) : ("external" as const),+ monitorId: monitorId ?? null,+ name: `Component ${id}`,+ description: null,+ order: 0,+ groupId: null,+ groupOrder: 0,+ createdAt: new Date(),+ updatedAt: new Date(),+ };+ }++ // Helper to create a mock maintenance+ function createMockMaintenance(+ id: number,+ pageComponentIds: number[],+ ): Maintenance & {+ maintenancesToPageComponents: {+ pageComponent: PageComponent | null;+ }[];+ } {+ const now = new Date();+ const from = new Date(now.getTime() - 1000 * 60 * 60); // 1 hour ago+ const to = new Date(now.getTime() + 1000 * 60 * 60); // 1 hour from now++ return {+ id,+ title: `Maintenance ${id}`,+ message: "Test maintenance",+ from,+ to,+ workspaceId: 1,+ pageId: 1,+ createdAt: new Date(),+ updatedAt: new Date(),+ maintenancesToPageComponents: pageComponentIds.map((pcId) => ({+ pageComponent: createMockPageComponent(pcId, pcId * 10),+ })),+ };+ }++ // Helper to create a mock status report+ function createMockStatusReport(+ id: number,+ pageComponentIds: number[],+ status: "investigating" | "resolved" = "investigating",+ ): StatusReport & {+ statusReportsToPageComponents: {+ pageComponent: PageComponent | null;+ }[];+ statusReportUpdates: StatusReportUpdate[];+ } {+ const now = new Date();+ const updateDate = new Date(now.getTime() - 1000 * 60 * 60); // 1 hour ago++ return {+ id,+ title: `Status Report ${id}`,+ status,+ workspaceId: 1,+ pageId: 1,+ createdAt: new Date(),+ updatedAt: new Date(),+ statusReportsToPageComponents: pageComponentIds.map((pcId) => ({+ pageComponent: createMockPageComponent(pcId, pcId * 10),+ })),+ statusReportUpdates: [+ {+ id: id * 100,+ statusReportId: id,+ date: updateDate,+ status: "investigating",+ message: "Investigating the issue",+ createdAt: new Date(),+ updatedAt: new Date(),+ },+ ],+ };+ }++ // Helper to create a mock incident+ function createMockIncident(id: number, monitorId: number): Incident {+ const now = new Date();+ const startedAt = new Date(now.getTime() - 1000 * 60 * 60); // 1 hour ago++ return {+ id,+ title: `Incident ${id}`,+ summary: "Test incident",+ status: "investigating",+ monitorId,+ workspaceId: 1,+ startedAt,+ acknowledgedAt: null,+ acknowledgedBy: null,+ resolvedAt: null,+ resolvedBy: null,+ incidentScreenshotUrl: null,+ recoveryScreenshotUrl: null,+ autoResolved: false,+ createdAt: startedAt,+ updatedAt: new Date(),+ };+ }++ it("should filter maintenances by pageComponentId", () => {+ const maintenances = [+ createMockMaintenance(1, [1, 2]),+ createMockMaintenance(2, [3, 4]),+ createMockMaintenance(3, [1, 5]),+ ];++ const events = getEvents({+ maintenances,+ incidents: [],+ reports: [],+ pageComponentId: 1,+ pastDays: 365,+ });++ const maintenanceEvents = events.filter((e) => e.type === "maintenance");+ expect(maintenanceEvents).toHaveLength(2);+ expect(maintenanceEvents.map((e) => e.id).sort()).toEqual([1, 3]);+ });++ it("should filter status reports by pageComponentId", () => {+ const reports = [+ createMockStatusReport(1, [1, 2]),+ createMockStatusReport(2, [3, 4]),+ createMockStatusReport(3, [1, 5]),+ ];++ const events = getEvents({+ maintenances: [],+ incidents: [],+ reports,+ pageComponentId: 1,+ pastDays: 365,+ });++ const reportEvents = events.filter((e) => e.type === "report");+ expect(reportEvents).toHaveLength(2);+ expect(reportEvents.map((e) => e.id).sort()).toEqual([1, 3]);+ });++ it("should exclude incidents for external components", () => {+ const incidents = [createMockIncident(1, 10), createMockIncident(2, 20)];++ const events = getEvents({+ maintenances: [],+ incidents,+ reports: [],+ componentType: "external",+ pastDays: 365,+ });++ const incidentEvents = events.filter((e) => e.type === "incident");+ expect(incidentEvents).toHaveLength(0);+ });++ it("should include incidents for monitor components", () => {+ const incidents = [createMockIncident(1, 10), createMockIncident(2, 20)];++ const events = getEvents({+ maintenances: [],+ incidents,+ reports: [],+ monitorId: 10,+ componentType: "monitor",+ pastDays: 365,+ });++ const incidentEvents = events.filter((e) => e.type === "incident");+ expect(incidentEvents).toHaveLength(1);+ expect(incidentEvents[0].id).toBe(1);+ });++ it("should maintain backward compatibility with monitorId filtering", () => {+ const maintenances = [+ createMockMaintenance(1, [1]),+ createMockMaintenance(2, [2]),+ ];++ const events = getEvents({+ maintenances,+ incidents: [],+ reports: [],+ monitorId: 10,+ pastDays: 365,+ });++ const maintenanceEvents = events.filter((e) => e.type === "maintenance");+ expect(maintenanceEvents).toHaveLength(1);+ expect(maintenanceEvents[0].id).toBe(1);+ });++ it("should prioritize pageComponentId over monitorId", () => {+ const maintenances = [+ createMockMaintenance(1, [1]),+ createMockMaintenance(2, [2]),+ ];++ const events = getEvents({+ maintenances,+ incidents: [],+ reports: [],+ pageComponentId: 1,+ monitorId: 20,+ pastDays: 365,+ });++ const maintenanceEvents = events.filter((e) => e.type === "maintenance");+ expect(maintenanceEvents).toHaveLength(1);+ expect(maintenanceEvents[0].id).toBe(1);+ });++ it("should return success status for resolved reports", () => {+ const reports = [createMockStatusReport(1, [1], "resolved")];++ const events = getEvents({+ maintenances: [],+ incidents: [],+ reports,+ pageComponentId: 1,+ pastDays: 365,+ });++ const reportEvents = events.filter((e) => e.type === "report");+ expect(reportEvents).toHaveLength(1);+ expect(reportEvents[0].status).toBe("success");+ });++ it("should return degraded status for unresolved reports", () => {+ const reports = [createMockStatusReport(1, [1], "investigating")];++ const events = getEvents({+ maintenances: [],+ incidents: [],+ reports,+ pageComponentId: 1,+ pastDays: 365,+ });++ const reportEvents = events.filter((e) => e.type === "report");+ expect(reportEvents).toHaveLength(1);+ expect(reportEvents[0].status).toBe("degraded");+ });+});diff --git a/packages/api/src/router/statusPage.utils.ts b/packages/api/src/router/statusPage.utils.tsindex 980c60fa6..7071d17d0 100644--- a/packages/api/src/router/statusPage.utils.ts+++ b/packages/api/src/router/statusPage.utils.ts@@ -129,7 +129,7 @@ export function transformMaintenanceWithPageComponents<};}-type StatusData = {+export type StatusData = {day: string;count: number;ok: number;@@ -224,7 +224,9 @@ export function getEvents({maintenances,incidents,reports,+ pageComponentId,monitorId,+ componentType,pastDays = 45,}: {maintenances: (Maintenance & {@@ -239,22 +241,30 @@ export function getEvents({}[];statusReportUpdates: StatusReportUpdate[];})[];+ pageComponentId?: number;monitorId?: number;+ componentType?: "monitor" | "external";pastDays?: number;}): Event[] {const events: Event[] = [];const pastThreshod = new Date();pastThreshod.setDate(pastThreshod.getDate() - pastDays);- // Filter maintenances - if monitorId is provided, filter by monitor via pageComponent, otherwise include all+ // Filter maintenances - prioritize pageComponentId, fallback to monitorId for backward compatibilitymaintenances- .filter((maintenance) =>- monitorId- ? maintenance.maintenancesToPageComponents.some(- (m) => m.pageComponent?.monitorId === monitorId,- )- : true,- )+ .filter((maintenance) => {+ if (pageComponentId) {+ return maintenance.maintenancesToPageComponents.some(+ (m) => m.pageComponent?.id === pageComponentId,+ );+ }+ if (monitorId) {+ return maintenance.maintenancesToPageComponents.some(+ (m) => m.pageComponent?.monitorId === monitorId,+ );+ }+ return true;+ }).forEach((maintenance) => {if (maintenance.from < pastThreshod) return;events.push({@@ -267,30 +277,41 @@ export function getEvents({});});- // Filter incidents - if monitorId is provided, filter by monitor, otherwise include all- incidents- .filter((incident) => (monitorId ? incident.monitorId === monitorId : true))- .forEach((incident) => {- if (!incident.createdAt || incident.createdAt < pastThreshod) return;- events.push({- id: incident.id,- name: "Downtime",- from: incident.createdAt,- to: incident.resolvedAt,- type: "incident",- status: "error" as const,+ // Filter incidents - only for monitor-type components+ // External components don't have incidents+ if (componentType !== "external") {+ incidents+ .filter((incident) =>+ monitorId ? incident.monitorId === monitorId : true,+ )+ .forEach((incident) => {+ if (!incident.createdAt || incident.createdAt < pastThreshod) return;+ events.push({+ id: incident.id,+ name: "Downtime",+ from: incident.createdAt,+ to: incident.resolvedAt,+ type: "incident",+ status: "error" as const,+ });});- });+ }- // Filter reports - if monitorId is provided, filter by monitor via pageComponent, otherwise include all+ // Filter reports - prioritize pageComponentId, fallback to monitorId for backward compatibilityreports- .filter((report) =>- monitorId- ? report.statusReportsToPageComponents.some(- (m) => m.pageComponent?.monitorId === monitorId,- )- : true,- )+ .filter((report) => {+ if (pageComponentId) {+ return report.statusReportsToPageComponents.some(+ (r) => r.pageComponent?.id === pageComponentId,+ );+ }+ if (monitorId) {+ return report.statusReportsToPageComponents.some(+ (r) => r.pageComponent?.monitorId === monitorId,+ );+ }+ return true;+ }).map((report) => {const updates = report.statusReportUpdates.sort((a, b) => a.date.getTime() - b.date.getTime(),diff --git a/packages/api/src/router/statusReport.ts b/packages/api/src/router/statusReport.tsindex aa1488eab..4eeadfe48 100644--- a/packages/api/src/router/statusReport.ts+++ b/packages/api/src/router/statusReport.ts@@ -12,7 +12,6 @@ import {} from "@openstatus/db";import {insertStatusReportUpdateSchema,- selectMonitorSchema,selectPageComponentSchema,selectPageSchema,selectStatusReportSchema,@@ -111,7 +110,6 @@ export const statusReportRouter = createTRPCRouter({where: and(...whereConditions),with: {statusReportUpdates: true,- monitorsToStatusReports: { with: { monitor: true } },statusReportsToPageComponents: { with: { pageComponent: true } },page: { with: { pageComponents: true } },},@@ -125,7 +123,6 @@ export const statusReportRouter = createTRPCRouter({return selectStatusReportSchema.extend({updates: z.array(selectStatusReportUpdateSchema).prefault([]),- monitors: z.array(selectMonitorSchema).prefault([]),pageComponents: z.array(selectPageComponentSchema).prefault([]),page: selectPageSchema.extend({pageComponents: z.array(selectPageComponentSchema).prefault([]),@@ -136,9 +133,6 @@ export const statusReportRouter = createTRPCRouter({result.map((report) => ({...report,updates: report.statusReportUpdates,- monitors: report.monitorsToStatusReports.map(- ({ monitor }) => monitor,- ),pageComponents: report.statusReportsToPageComponents.map(({ pageComponent }) => pageComponent,),diff --git a/packages/db/src/schema/shared.ts b/packages/db/src/schema/shared.tsindex f55c305bf..53c8e46f6 100644--- a/packages/db/src/schema/shared.ts+++ b/packages/db/src/schema/shared.ts@@ -37,15 +37,7 @@ export const selectStatusReportPageSchema = selectStatusReportSchema.extend({z.object({pageComponentId: z.number(),statusReportId: z.number(),- }),- )- .prefault([]),- monitorsToStatusReports: z- .array(- z.object({- monitorId: z.number(),- statusReportId: z.number(),- monitor: selectPublicMonitorSchema,+ pageComponent: selectPageComponentSchema,}),).prefault([]),@@ -57,15 +49,7 @@ export const selectMaintenancePageSchema = selectMaintenanceSchema.extend({z.object({pageComponentId: z.number(),maintenanceId: z.number(),- }),- )- .prefault([]),- maintenancesToMonitors: z- .array(- z.object({- monitorId: z.number(),- maintenanceId: z.number(),- monitor: selectPublicMonitorSchema,+ pageComponent: selectPageComponentSchema,}),).prefault([]),@@ -124,19 +108,43 @@ const selectPublicMonitorWithStatusSchema = selectPublicMonitorBaseSchemaname: data.externalName || data.name,}));+export const statusPageEventSchema = z.object({+ id: z.number(),+ name: z.string(),+ from: z.date(),+ to: z.date().nullable(),+ status: z.enum(["success", "degraded", "error", "info"]).prefault("success"),+ type: z.enum(["maintenance", "incident", "report"]),+});++// Page component with status - used for new tracker system+const selectPublicPageComponentWithStatusSchema =+ selectPageComponentSchema.extend({+ status: z+ .enum(["success", "degraded", "error", "info"])+ .prefault("success"),+ events: z.array(statusPageEventSchema).prefault([]),+ // For monitor-type components - omit status since it's now at component level+ monitor: selectPublicMonitorBaseSchema+ .extend({+ incidents: selectIncidentSchema.array().nullish(),+ })+ .nullish(),+ });+const trackersSchema = z.array(z.discriminatedUnion("type", [z.object({- type: z.literal("monitor"),- monitor: selectPublicMonitorWithStatusSchema,+ type: z.literal("component"),+ component: selectPublicPageComponentWithStatusSchema,order: z.number(),}),z.object({type: z.literal("group"),groupId: z.number(),groupName: z.string(),- monitors: z.array(selectPublicMonitorWithStatusSchema),+ components: z.array(selectPublicPageComponentWithStatusSchema),status: z.enum(["success", "degraded", "error", "info"]).prefault("success"),@@ -146,15 +154,6 @@ const trackersSchema = z).prefault([]);-export const statusPageEventSchema = z.object({- id: z.number(),- name: z.string(),- from: z.date(),- to: z.date().nullable(),- status: z.enum(["success", "degraded", "error", "info"]).prefault("success"),- type: z.enum(["maintenance", "incident", "report"]),-});-export const selectPageComponentWithMonitorRelation =selectPageComponentSchema.extend({monitor: selectPublicMonitorBaseSchema@@ -214,3 +213,6 @@ export type PublicMonitor = z.infer<typeof selectPublicMonitorSchema>;export type PublicPage = z.infer<typeof legacy_selectPublicPageSchemaWithRelation>;+export type PublicPageComponentWithStatus = z.infer<+ typeof selectPublicPageComponentWithStatusSchema+>;