Merge pull request #2888 from fosrl/dev

Fix imports

server/lib/alerts/events/healthCheckEvents.ts

@@ -9,7 +9,7 @@ export async function fireHealthCheckHealthyAlert(
     return;
 }
 
-export async function fireHealthCheckNotHealthyAlert(
+export async function fireHealthCheckUnhealthyAlert(
     orgId: string,
     healthCheckId: number,
     healthCheckName?: string,

server/lib/alerts/events/resourceEvents.ts

@@ -0,0 +1,20 @@
+export async function fireResourceHealthyAlert(
+    orgId: string,
+    resourceId: number,
+    resourceName?: string | null,
+    extra?: Record<string, unknown>
+): Promise<void> {}
+
+export async function fireResourceUnhealthyAlert(
+    orgId: string,
+    resourceId: number,
+    resourceName?: string | null,
+    extra?: Record<string, unknown>
+): Promise<void> {}
+
+export async function fireResourceToggleAlert(
+    orgId: string,
+    resourceId: number,
+    resourceName?: string | null,
+    extra?: Record<string, unknown>
+): Promise<void> {}

server/lib/alerts/index.ts

@@ -1,2 +1,3 @@
 export * from "./events/siteEvents";
 export * from "./events/healthCheckEvents";
+export * from "./events/resourceEvents";

server/private/lib/alerts/events/healthCheckEvents.ts

@@ -102,7 +102,7 @@ export async function fireHealthCheckUnhealthyAlert(
         });
     } catch (err) {
         logger.error(
-            `fireHealthCheckNotHealthyAlert: unexpected error for healthCheckId ${healthCheckId}`,
+            `fireHealthCheckUnhealthyAlert: unexpected error for healthCheckId ${healthCheckId}`,
             err
         );
     }

server/private/lib/alerts/index.ts

@@ -17,3 +17,4 @@ export * from "./sendAlertWebhook";
 export * from "./sendAlertEmail";
 export * from "./events/siteEvents";
 export * from "./events/healthCheckEvents";
+export * from "./events/resourceEvents";

server/routers/target/handleHealthcheckStatusMessage.ts

@@ -14,7 +14,10 @@ import {
     fireHealthCheckHealthyAlert,
     fireHealthCheckUnhealthyAlert
 } from "#dynamic/lib/alerts";
-import { fireResourceHealthyAlert, fireResourceUnhealthyAlert } from "@server/private/lib/alerts/events/resourceEvents";
+import {
+    fireResourceHealthyAlert,
+    fireResourceUnhealthyAlert
+} from "#dynamic/lib/alerts";
 
 interface TargetHealthStatus {
     status: string;
@@ -223,13 +226,13 @@ export const handleHealthcheckStatusMessage: MessageHandler = async (
                 await fireHealthCheckUnhealthyAlert(
                     orgId,
                     targetCheck.targetHealthCheckId,
-                    targetCheck.name
+                    targetCheck.name ?? undefined
                 );
             } else if (healthStatus.status === "healthy") {
                 await fireHealthCheckHealthyAlert(
                     orgId,
                     targetCheck.targetHealthCheckId,
-                    targetCheck.name
+                    targetCheck.name ?? undefined
                 );
             }