Handle all of the alerting from the functions

server/routers/newt/handleNewtDisconnectingMessage.ts

@@ -1,5 +1,12 @@
 import { MessageHandler } from "@server/routers/ws";
-import { db, Newt, sites } from "@server/db";
+import {
+    db,
+    Newt,
+    sites,
+    statusHistory,
+    targetHealthCheck,
+    targets
+} from "@server/db";
 import { eq } from "drizzle-orm";
 import logger from "@server/logger";
 import { fireSiteOfflineAlert } from "@server/lib/alerts";

server/routers/newt/offlineChecker.ts

@@ -1,8 +1,13 @@
-import { db, newts, sites, targetHealthCheck, targets, statusHistory } from "@server/db";
 import {
-    hasActiveConnections,
-} from "#dynamic/routers/ws";
-import { eq, lt, isNull, and, or, ne, not } from "drizzle-orm";
+    db,
+    newts,
+    sites,
+    targetHealthCheck,
+    targets,
+    statusHistory
+} from "@server/db";
+import { hasActiveConnections } from "#dynamic/routers/ws";
+import { eq, lt, isNull, and, or, ne, not, inArray } from "drizzle-orm";
 import logger from "@server/logger";
 import { fireSiteOfflineAlert, fireSiteOnlineAlert } from "#dynamic/lib/alerts";
 
@@ -77,43 +82,11 @@ export const startNewtOfflineChecker = (): void => {
                     .set({ online: false })
                     .where(eq(sites.siteId, staleSite.siteId));
 
-                await db.insert(statusHistory).values({
-                    entityType: "site",
-                    entityId: staleSite.siteId,
-                    orgId: staleSite.orgId,
-                    status: "offline",
-                    timestamp: Math.floor(Date.now() / 1000),
-                }).execute();
-
-                const healthChecksOnSite = await db
-                    .select()
-                    .from(targetHealthCheck)
-                    .innerJoin(
-                        targets,
-                        eq(targets.targetId, targetHealthCheck.targetId)
-                    )
-                    .innerJoin(sites, eq(sites.siteId, targets.siteId))
-                    .where(eq(sites.siteId, staleSite.siteId));
-
-                for (const healthCheck of healthChecksOnSite) {
-                    logger.info(
-                        `Marking health check ${healthCheck.targetHealthCheck.targetHealthCheckId} offline due to site ${staleSite.siteId} being marked offline`
-                    );
-                    await db
-                        .update(targetHealthCheck)
-                        .set({ hcHealth: "unknown" })
-                        .where(
-                            eq(
-                                targetHealthCheck.targetHealthCheckId,
-                                healthCheck.targetHealthCheck
-                                    .targetHealthCheckId
-                            )
-                        );
-
-                    // TODO: should we be firing an alert here when the health check goes to unknown?
-                }
-
-                await fireSiteOfflineAlert(staleSite.orgId, staleSite.siteId, staleSite.name);
+                await fireSiteOfflineAlert(
+                    staleSite.orgId,
+                    staleSite.siteId,
+                    staleSite.name
+                );
             }
 
             // this part only effects self hosted. Its not efficient but we dont expect people to have very many wireguard sites
@@ -155,15 +128,11 @@ export const startNewtOfflineChecker = (): void => {
                         .set({ online: false })
                         .where(eq(sites.siteId, site.siteId));
 
-                    await db.insert(statusHistory).values({
-                        entityType: "site",
-                        entityId: site.siteId,
-                        orgId: site.orgId,
-                        status: "offline",
-                        timestamp: Math.floor(Date.now() / 1000),
-                    }).execute();
-
-                    await fireSiteOfflineAlert(site.orgId, site.siteId, site.name);
+                    await fireSiteOfflineAlert(
+                        site.orgId,
+                        site.siteId,
+                        site.name
+                    );
                 } else if (
                     lastBandwidthUpdate >= wireguardOfflineThreshold &&
                     !site.online
@@ -177,15 +146,11 @@ export const startNewtOfflineChecker = (): void => {
                         .set({ online: true })
                         .where(eq(sites.siteId, site.siteId));
 
-                    await db.insert(statusHistory).values({
-                        entityType: "site",
-                        entityId: site.siteId,
-                        orgId: site.orgId,
-                        status: "online",
-                        timestamp: Math.floor(Date.now() / 1000),
-                    }).execute();
-
-                    await fireSiteOnlineAlert(site.orgId, site.siteId, site.name);
+                    await fireSiteOnlineAlert(
+                        site.orgId,
+                        site.siteId,
+                        site.name
+                    );
                 }
             }
         } catch (error) {

server/routers/newt/pingAccumulator.ts

@@ -1,5 +1,5 @@
 import { db } from "@server/db";
-import { sites, clients, olms, statusHistory } from "@server/db";
+import { sites, clients, olms } from "@server/db";
 import { and, eq, inArray } from "drizzle-orm";
 import logger from "@server/logger";
 import { fireSiteOnlineAlert } from "#dynamic/lib/alerts";
@@ -147,13 +147,6 @@ async function flushSitePingsToDb(): Promise<void> {
             }, "flushSitePingsToDb");
 
             for (const site of newlyOnlineSites) {
-                await db.insert(statusHistory).values({
-                    entityType: "site",
-                    entityId: site.siteId,
-                    orgId: site.orgId,
-                    status: "online",
-                    timestamp: Math.floor(Date.now() / 1000),
-                }).execute();
                 await fireSiteOnlineAlert(site.orgId, site.siteId, site.name);
             }
         } catch (error) {