Add new intervals and tcp mode to health checks

server/routers/newt/buildConfiguration.ts

@@ -213,7 +213,9 @@ export async function buildTargetConfigurationForNewtClient(siteId: number) {
             hcHeaders: targetHealthCheck.hcHeaders,
             hcMethod: targetHealthCheck.hcMethod,
             hcTlsServerName: targetHealthCheck.hcTlsServerName,
-            hcStatus: targetHealthCheck.hcStatus
+            hcStatus: targetHealthCheck.hcStatus,
+            hcHealthyThreshold: targetHealthCheck.hcHealthyThreshold,
+            hcUnhealthyThreshold: targetHealthCheck.hcUnhealthyThreshold
         })
         .from(targets)
         .innerJoin(resources, eq(targets.resourceId, resources.resourceId))
@@ -247,17 +249,12 @@ export async function buildTargetConfigurationForNewtClient(siteId: number) {
 
     const healthCheckTargets = allTargets.map((target) => {
         // make sure the stuff is defined
-        if (
-            !target.hcPath ||
-            !target.hcHostname ||
-            !target.hcPort ||
-            !target.hcInterval ||
-            !target.hcMethod
-        ) {
-            // logger.debug(
-            //     `Skipping adding target health check ${target.targetId} due to missing health check fields`
-            // );
-            return null; // Skip targets with missing health check fields
+        const isTCP = target.hcMode?.toLowerCase() === "tcp";
+        if (!target.hcHostname || !target.hcPort || !target.hcInterval) {
+            return null;
+        }
+        if (!isTCP && (!target.hcPath || !target.hcMethod)) {
+            return null;
         }
 
         // parse headers
@@ -287,7 +284,9 @@ export async function buildTargetConfigurationForNewtClient(siteId: number) {
             hcHeaders: hcHeadersSend,
             hcMethod: target.hcMethod,
             hcTlsServerName: target.hcTlsServerName,
-            hcStatus: target.hcStatus
+            hcStatus: target.hcStatus,
+            hcHealthyThreshold: target.hcHealthyThreshold,
+            hcUnhealthyThreshold: target.hcUnhealthyThreshold
         };
     });
 

server/routers/newt/handleNewtPingMessage.ts

@@ -9,6 +9,7 @@ import { eq, lt, isNull, and, or, ne, not } from "drizzle-orm";
 import logger from "@server/logger";
 import { sendNewtSyncMessage } from "./sync";
 import { recordPing } from "./pingAccumulator";
+import { fireSiteOfflineAlert } from "#dynamic/lib/alerts";
 
 // Track if the offline checker interval is running
 let offlineCheckerInterval: NodeJS.Timeout | null = null;
@@ -40,6 +41,8 @@ export const startNewtOfflineChecker = (): void => {
             const staleSites = await db
                 .select({
                     siteId: sites.siteId,
+                    orgId: sites.orgId,
+                    name: sites.name,
                     newtId: newts.newtId,
                     lastPing: sites.lastPing
                 })
@@ -104,6 +107,8 @@ export const startNewtOfflineChecker = (): void => {
                             )
                         );
                 }
+
+                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

server/routers/newt/targets.ts

@@ -43,17 +43,18 @@ export async function addTargets(
         }
 
         // Ensure all necessary fields are present
-        if (
-            !hc.hcPath ||
-            !hc.hcHostname ||
-            !hc.hcPort ||
-            !hc.hcInterval ||
-            !hc.hcMethod
-        ) {
+        const isTCP = hc.hcMode?.toLowerCase() === "tcp";
+        if (!hc.hcHostname || !hc.hcPort || !hc.hcInterval) {
             logger.debug(
                 `Skipping target ${target.targetId} due to missing health check fields`
             );
-            return null; // Skip targets with missing health check fields
+            return null;
+        }
+        if (!isTCP && (!hc.hcPath || !hc.hcMethod)) {
+            logger.debug(
+                `Skipping target ${target.targetId} due to missing HTTP health check fields`
+            );
+            return null;
         }
 
         const hcHeadersParse = hc.hcHeaders ? JSON.parse(hc.hcHeaders) : null;
@@ -90,7 +91,9 @@ export async function addTargets(
             hcHeaders: hcHeadersSend,
             hcMethod: hc.hcMethod,
             hcStatus: hcStatus,
-            hcTlsServerName: hc.hcTlsServerName
+            hcTlsServerName: hc.hcTlsServerName,
+            hcHealthyThreshold: hc.hcHealthyThreshold,
+            hcUnhealthyThreshold: hc.hcUnhealthyThreshold
         };
     });