chore: link email templates (#1208)

* fix: on delete cascade * feat: status page form danger section * chore: add badge to quick actions * ci: apply automated fixes * fix: export * chore: link email templates * fix: lint * chore: remove workflows api route * fix: int64 * fix: go --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
openstatusHQ · Mar 5, 2025 · 1af6c3e · 1af6c3e
1 parent 8412ca5
commit 1af6c3e
Show file tree

Hide file tree

Showing 47 changed files with 454 additions and 364 deletions.
diff --git a/apps/checker/handlers/checker.go b/apps/checker/handlers/checker.go
@@ -202,6 +202,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
 					Region:        h.Region,
 					Message:       res.Error,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       res.Latency,
 				})
 			}
 			// Check if the status is degraded
@@ -212,6 +213,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
 					Region:        h.Region,
 					StatusCode:    res.Status,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       res.Latency,
 				})
 			}
 		}
@@ -225,6 +227,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
 					Region:        h.Region,
 					StatusCode:    res.Status,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       res.Latency,
 				})
 			}
 
@@ -246,6 +249,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
 					Region:        h.Region,
 					StatusCode:    res.Status,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       res.Latency,
 				})
 			}
 		}
@@ -259,6 +263,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
 					Region:        h.Region,
 					StatusCode:    res.Status,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       res.Latency,
 				})
 			}
 
@@ -269,6 +274,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
 					Region:        h.Region,
 					StatusCode:    res.Status,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       res.Latency,
 				})
 			}
 		}

diff --git a/apps/checker/handlers/tcp.go b/apps/checker/handlers/tcp.go
@@ -133,6 +133,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
 				Status:        "degraded",
 				Region:        h.Region,
 				CronTimestamp: req.CronTimestamp,
+				Latency:       latency,
 			})
 		}
 
@@ -142,6 +143,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
 				Status:        "active",
 				Region:        h.Region,
 				CronTimestamp: req.CronTimestamp,
+				Latency:       latency,
 			})
 		}
 
@@ -152,6 +154,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
 					Status:        "active",
 					Region:        h.Region,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       latency,
 				})
 			}
 
@@ -161,6 +164,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
 					Status:        "degraded",
 					Region:        h.Region,
 					CronTimestamp: req.CronTimestamp,
+					Latency:       latency,
 				})
 			}
 

diff --git a/apps/checker/update.go b/apps/checker/update.go
@@ -18,6 +18,7 @@ type UpdateData struct {
 	Region        string `json:"region"`
 	CronTimestamp int64  `json:"cronTimestamp"`
 	StatusCode    int    `json:"statusCode,omitempty"`
+	Latency       int64  `json:"latency,omitempty"`
 }
 
 func UpdateStatus(ctx context.Context, updateData UpdateData) {

diff --git a/apps/server/src/env.ts b/apps/server/src/env.ts
@@ -15,6 +15,7 @@ export const env = createEnv({
     QSTASH_TOKEN: z.string(),
     NODE_ENV: z.string().default("development"),
     SUPER_ADMIN_TOKEN: z.string(),
+    RESEND_API_KEY: z.string(),
   },
 
   /**

diff --git a/apps/server/src/libs/cache/memory.ts b/apps/server/src/libs/cache/memory.ts
@@ -48,4 +48,4 @@ export class MemoryCache {
   }
 }
 
-const cache = new MemoryCache();
+const _cache = new MemoryCache();
diff --git a/apps/server/src/routes/checker/alerting.ts b/apps/server/src/routes/checker/alerting.ts
@@ -6,7 +6,10 @@ import {
 } from "@openstatus/db/src/schema";
 
 import { checkerAudit } from "@/utils/audit-log";
-import type { MonitorFlyRegion } from "@openstatus/db/src/schema/constants";
+import type {
+  MonitorFlyRegion,
+  Region,
+} from "@openstatus/db/src/schema/constants";
 import { Redis } from "@openstatus/upstash";
 import { providerToFunction } from "./utils";
 
@@ -19,13 +22,17 @@ export const triggerNotifications = async ({
   notifType,
   cronTimestamp,
   incidentId,
+  region,
+  latency,
 }: {
   monitorId: string;
   statusCode?: number;
   message?: string;
   notifType: "alert" | "recovery" | "degraded";
   cronTimestamp: number;
   incidentId: string;
+  region?: Region;
+  latency?: number;
 }) => {
   console.log(`💌 triggerAlerting for ${monitorId}`);
   const notifications = await db
@@ -64,6 +71,8 @@ export const triggerNotifications = async ({
           message,
           incidentId,
           cronTimestamp,
+          region,
+          latency,
         });
         break;
       case "recovery":
@@ -74,6 +83,8 @@ export const triggerNotifications = async ({
           message,
           incidentId,
           cronTimestamp,
+          region,
+          latency,
         });
         break;
       case "degraded":
@@ -83,6 +94,8 @@ export const triggerNotifications = async ({
           statusCode,
           message,
           cronTimestamp,
+          region,
+          latency,
         });
         break;
     }

diff --git a/apps/server/src/routes/checker/index.ts b/apps/server/src/routes/checker/index.ts
@@ -33,15 +33,23 @@ checkerRoute.post("/updateStatus", async (c) => {
     region: z.enum(flyRegions),
     cronTimestamp: z.number(),
     status: monitorStatusSchema,
+    latency: z.number().optional(),
   });
 
   const result = payloadSchema.safeParse(json);
 
   if (!result.success) {
     return c.text("Unprocessable Entity", 422);
   }
-  const { monitorId, message, region, statusCode, cronTimestamp, status } =
-    result.data;
+  const {
+    monitorId,
+    message,
+    region,
+    statusCode,
+    cronTimestamp,
+    status,
+    latency,
+  } = result.data;
 
   console.log(`📝 update monitor status ${JSON.stringify(result.data)}`);
 
@@ -103,6 +111,8 @@ checkerRoute.post("/updateStatus", async (c) => {
           notifType: "degraded",
           cronTimestamp,
           incidentId: `${cronTimestamp}`,
+          region,
+          latency,
         });
       }
     }
@@ -182,6 +192,8 @@ checkerRoute.post("/updateStatus", async (c) => {
             incidentId: newIncident.length
               ? String(newIncident[0]?.id)
               : `${cronTimestamp}`,
+            region,
+            latency,
           });
 
           if (newIncident.length > 0) {
@@ -287,6 +299,8 @@ checkerRoute.post("/updateStatus", async (c) => {
             notifType: "recovery",
             cronTimestamp,
             incidentId: String(incident.id),
+            region,
+            latency,
           });
 
           const monitor = await db

diff --git a/apps/server/src/routes/checker/utils.ts b/apps/server/src/routes/checker/utils.ts
@@ -30,6 +30,7 @@ import {
   sendAlert as sendPagerdutyAlert,
 } from "@openstatus/notification-pagerduty";
 
+import type { Region } from "@openstatus/db/src/schema/constants";
 import {
   sendAlert as sendOpsGenieAlert,
   sendDegraded as sendOpsGenieDegraded,
@@ -43,13 +44,17 @@ type SendNotification = ({
   message,
   incidentId,
   cronTimestamp,
+  latency,
+  region,
 }: {
   monitor: Monitor;
   notification: Notification;
   statusCode?: number;
   message?: string;
   incidentId?: string;
   cronTimestamp: number;
+  latency?: number;
+  region?: Region;
 }) => Promise<void>;
 
 type Notif = {

diff --git a/apps/server/src/routes/v1/statusReportUpdates/post.ts b/apps/server/src/routes/v1/statusReportUpdates/post.ts
@@ -7,12 +7,15 @@ import {
   statusReport,
   statusReportUpdate,
 } from "@openstatus/db/src/schema";
-import { sendEmailHtml } from "@openstatus/emails";
 
+import { env } from "@/env";
 import { OpenStatusApiError, openApiErrorResponses } from "@/libs/errors";
+import { EmailClient } from "@openstatus/emails";
 import type { statusReportUpdatesApi } from "./index";
 import { StatusReportUpdateSchema } from "./schema";
 
+const emailClient = new EmailClient({ apiKey: env.RESEND_API_KEY });
+
 const createStatusUpdate = createRoute({
   method: "post",
   tags: ["status_report_update"],
@@ -89,21 +92,27 @@ export function registerPostStatusReportUpdate(
         )
         .all();
 
-      const pageInfo = await db
-        .select()
-        .from(page)
-        .where(eq(page.id, _statusReport.pageId))
-        .get();
-      if (pageInfo) {
-        const subscribersEmails = subscribers.map((subscriber) => ({
-          to: subscriber.email,
-          subject: `New status update for ${pageInfo.title}`,
-          html: `<p>Hi,</p><p>${pageInfo.title} just posted an update on their status page:</p><p>New Status : ${statusReportUpdate.status}</p><p>${statusReportUpdate.message}</p></p><p></p><p>Powered by OpenStatus</p><p></p><p></p><p></p><p></p><p></p>
-            `,
-          from: "Notification OpenStatus <[email protected]>",
-        }));
+      const _page = await db.query.page.findFirst({
+        where: eq(page.id, _statusReport.pageId),
+        with: {
+          monitorsToPages: {
+            with: {
+              monitor: true,
+            },
+          },
+        },
+      });
 
-        await sendEmailHtml(subscribersEmails);
+      if (_page && subscribers.length > 0) {
+        await emailClient.sendStatusReportUpdate({
+          to: subscribers.map((subscriber) => subscriber.email),
+          pageTitle: _page.title,
+          reportTitle: _statusReport.title,
+          status: _statusReport.status,
+          message: _statusReportUpdate.message,
+          date: _statusReportUpdate.date.toISOString(),
+          monitors: _page.monitorsToPages.map((i) => i.monitor.name),
+        });
       }
     }
 

diff --git a/apps/server/src/routes/v1/statusReports/post.ts b/apps/server/src/routes/v1/statusReports/post.ts
@@ -10,11 +10,14 @@ import {
   statusReportUpdate,
 } from "@openstatus/db/src/schema";
 
+import { env } from "@/env";
 import { OpenStatusApiError, openApiErrorResponses } from "@/libs/errors";
-import { sendBatchEmailHtml } from "@openstatus/emails/src/send";
+import { EmailClient } from "@openstatus/emails";
 import type { statusReportsApi } from "./index";
 import { StatusReportSchema } from "./schema";
 
+const emailClient = new EmailClient({ apiKey: env.RESEND_API_KEY });
+
 const postRoute = createRoute({
   method: "post",
   tags: ["status_report"],
@@ -142,24 +145,27 @@ export function registerPostStatusReport(api: typeof statusReportsApi) {
         )
         .all();
 
-      const pageInfo = await db
-        .select()
-        .from(page)
-        .where(eq(page.id, _newStatusReport.pageId))
-        .get();
-
-      if (pageInfo) {
-        const emails = subscribers.map((subscriber) => {
-          return {
-            to: subscriber.email,
-            subject: `New status update for ${pageInfo.title}`,
-            html: `<p>Hi,</p><p>${pageInfo.title} just posted an update on their status page:</p><p>New Status : ${statusReportUpdate.status}</p><p>${statusReportUpdate.message}</p></p><p></p><p>Powered by OpenStatus</p><p></p><p></p><p></p><p></p><p></p>
-          `,
-            from: "Notification OpenStatus <[email protected]>",
-          };
-        });
+      const pageInfo = await db.query.page.findFirst({
+        where: eq(page.id, _newStatusReport.pageId),
+        with: {
+          monitorsToPages: {
+            with: {
+              monitor: true,
+            },
+          },
+        },
+      });
 
-        await sendBatchEmailHtml(emails);
+      if (pageInfo && subscribers.length > 0) {
+        await emailClient.sendStatusReportUpdate({
+          to: subscribers.map((subscriber) => subscriber.email),
+          pageTitle: pageInfo.title,
+          reportTitle: _newStatusReport.title,
+          status: _newStatusReport.status,
+          message: _newStatusReportUpdate.message,
+          date: _newStatusReportUpdate.date.toISOString(),
+          monitors: pageInfo.monitorsToPages.map((i) => i.monitor.name),
+        });
       }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,4 +48,4 @@ export class MemoryCache { @@
       }
     }
-    const cache = new MemoryCache();
+    const _cache = new MemoryCache();