@oneuptime/common 12.0.14 → 12.0.16

package/build/dist/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalStatusPageMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ExternalStatusPageMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js

@@ -17,35 +17,32 @@ import CaptureSpan from "../../Telemetry/CaptureSpan";
 export default class IncomingRequestCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
         // Server Monitoring Checks
-        var _a;
+        var _a, _b, _c;
         logger.debug("Checking IncomingRequestCriteria for Monitor: " +
             input.dataToProcess.monitorId.toString());
         logger.debug("Data to process: " + JSON.stringify(input.dataToProcess, null, 2));
         logger.debug("Criteria Filter: " + JSON.stringify(input.criteriaFilter, null, 2));
         let value = input.criteriaFilter.value;
-        let overTimeValue = undefined;
-        if (input.criteriaFilter.evaluateOverTime &&
-            input.criteriaFilter.evaluateOverTimeOptions) {
-            try {
-                overTimeValue = await EvaluateOverTime.getValueOverTime({
-                    projectId: input.dataToProcess.projectId,
-                    monitorId: input.dataToProcess.monitorId,
-                    evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
-                    metricType: input.criteriaFilter.checkOn,
-                });
-                if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
-                    overTimeValue = undefined;
-                }
-            }
-            catch (err) {
-                logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
-                logger.error(err);
-                overTimeValue = undefined;
-            }
+        const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
+            projectId: input.dataToProcess.projectId,
+            monitorId: input.dataToProcess.monitorId,
+            criteriaFilter: input.criteriaFilter,
+            monitoringInterval: input.monitoringInterval,
+        });
+        /*
+         * The window could not back this over-time filter (nothing recorded yet,
+         * or the monitor has not been running long enough to cover it). Return
+         * the decision the no-data policy already made instead of falling
+         * through to the value that arrived with this one check - that fallback
+         * is what let "all values over the last N minutes" fire off a single
+         * bad reading.
+         */
+        if (overTime.earlyReturn) {
+            return overTime.earlyReturn.result;
         }
+        const overTimeValue = overTime.value;
         if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
-            const currentIsOnline = overTimeValue ||
-                input.dataToProcess.isOnline;
+            const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : input.dataToProcess.isOnline;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsOnline,
                 criteriaFilter: input.criteriaFilter,
@@ -53,8 +50,7 @@ export default class IncomingRequestCriteria {
         }
         // timeout.
         if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
-            const currentIsTimeout = overTimeValue ||
-                input.dataToProcess.isTimeout;
+            const currentIsTimeout = (_b = overTimeValue) !== null && _b !== void 0 ? _b : input.dataToProcess.isTimeout;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsTimeout,
                 criteriaFilter: input.criteriaFilter,
@@ -66,7 +62,7 @@ export default class IncomingRequestCriteria {
                 input.dataToProcess.monitorId.toString());
             const lastCheckTime = input.dataToProcess.incomingRequestReceivedAt;
             logger.debug("Last Check Time: " + lastCheckTime);
-            const differenceInMinutes = OneUptimeDate.getDifferenceInMinutes(lastCheckTime, ((_a = input.dataToProcess) === null || _a === void 0 ? void 0 : _a.checkedAt) ||
+            const differenceInMinutes = OneUptimeDate.getDifferenceInMinutes(lastCheckTime, ((_c = input.dataToProcess) === null || _c === void 0 ? void 0 : _c.checkedAt) ||
                 OneUptimeDate.getCurrentDate());
             logger.debug("Difference in minutes: " + differenceInMinutes);
             if (!value) {

package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/Criteria/LogMonitorCriteria.js

@@ -9,12 +9,30 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import CaptureSpan from "../../Telemetry/CaptureSpan";
 import CompareCriteria from "./CompareCriteria";
-import { CheckOn, } from "../../../../Types/Monitor/CriteriaFilter";
+import CountAnomaly from "./CountAnomaly";
+import { AnomalyDetectionMethod, AnomalyDetectionSensitivity, CheckOn, CriteriaFilterUtil, } from "../../../../Types/Monitor/CriteriaFilter";
+import OneUptimeDate from "../../../../Types/Date";
+import LogCountBaselineService from "../../../Services/LogCountBaselineService";
+import { MetricBaselineService as MetricBaselineServiceClass } from "../../../Services/MetricBaselineService";
+import logger from "../../Logger";
 export default class LogMonitorCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
         // Server Monitoring Checks
         let threshold = input.criteriaFilter.value;
         if (input.criteriaFilter.checkOn === CheckOn.LogCount) {
+            /*
+             * Anomaly filters skip the static threshold entirely: the
+             * observed log rate is compared to this monitor's scope in the
+             * same-hour-of-week LogCountBaseline, mirroring the metric
+             * monitor's baseline path.
+             */
+            if (CriteriaFilterUtil.isAnomalyFilterType(input.criteriaFilter.filterType)) {
+                return await LogMonitorCriteria.evaluateLogCountAnomaly({
+                    logResponse: input.dataToProcess,
+                    criteriaFilter: input.criteriaFilter,
+                    monitorStep: input.monitorStep,
+                });
+            }
             threshold = CompareCriteria.convertToNumber(threshold);
             const currentLogCount = input.dataToProcess.logCount || 0;
             return CompareCriteria.compareCriteriaNumbers({
@@ -25,6 +43,71 @@ export default class LogMonitorCriteria {
         }
         return null;
     }
+    /*
+     * Anomaly path for log counts: normalizes the observed count to a
+     * per-minute rate (the baseline's sample unit) and compares it to the
+     * rolling same-hour-of-week baseline of the monitor's scope (services
+     * and severities; body/attribute filters are not baselined — the
+     * baseline is that scope's full volume, a documented superset).
+     *
+     * Missing or unreliable baselines mean the rule is still learning —
+     * never alert from a thin baseline. Zero-variance baselines are
+     * skipped too: any deviation at all would fire.
+     */
+    static async evaluateLogCountAnomaly(input) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const logMonitorStep = (_b = (_a = input.monitorStep) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.logMonitor;
+        const windowSeconds = (logMonitorStep === null || logMonitorStep === void 0 ? void 0 : logMonitorStep.lastXSecondsOfLogs) &&
+            logMonitorStep.lastXSecondsOfLogs > 0
+            ? logMonitorStep.lastXSecondsOfLogs
+            : 60;
+        const logCount = input.logResponse.logCount || 0;
+        const observedPerMinute = (logCount * 60) / windowSeconds;
+        const sensitivity = ((_d = (_c = input.criteriaFilter.metricMonitorOptions) === null || _c === void 0 ? void 0 : _c.anomalyDetection) === null || _d === void 0 ? void 0 : _d.sensitivity) ||
+            AnomalyDetectionSensitivity.Medium;
+        const sigmaCount = MetricBaselineServiceClass.sigmaForSensitivity(sensitivity);
+        const method = ((_f = (_e = input.criteriaFilter.metricMonitorOptions) === null || _e === void 0 ? void 0 : _e.anomalyDetection) === null || _f === void 0 ? void 0 : _f.method) || AnomalyDetectionMethod.MeanStddev;
+        let baseline = null;
+        try {
+            baseline = await LogCountBaselineService.getBaseline({
+                projectId: input.logResponse.projectId.toString(),
+                telemetryServiceIds: (_g = logMonitorStep === null || logMonitorStep === void 0 ? void 0 : logMonitorStep.telemetryServiceIds) === null || _g === void 0 ? void 0 : _g.map((id) => {
+                    return id.toString();
+                }),
+                severityTexts: logMonitorStep === null || logMonitorStep === void 0 ? void 0 : logMonitorStep.severityTexts,
+                hourOfWeek: MetricBaselineServiceClass.computeHourOfWeek(OneUptimeDate.getCurrentDate()),
+                windowDays: (_j = (_h = input.criteriaFilter.metricMonitorOptions) === null || _h === void 0 ? void 0 : _h.anomalyDetection) === null || _j === void 0 ? void 0 : _j.windowDays,
+                minSamples: (_l = (_k = input.criteriaFilter.metricMonitorOptions) === null || _k === void 0 ? void 0 : _k.anomalyDetection) === null || _l === void 0 ? void 0 : _l.minSamples,
+            });
+        }
+        catch (err) {
+            logger.error("Error fetching log count baseline for anomaly criteria");
+            logger.error(err);
+            return null;
+        }
+        if (!baseline || !baseline.isReliable) {
+            // Cold start: the baseline is still learning; nothing to compare to.
+            return null;
+        }
+        const evaluation = CountAnomaly.evaluate({
+            observedPerMinute,
+            stats: baseline,
+            sigmaCount,
+            method,
+            filterType: input.criteriaFilter.filterType,
+        });
+        if (!evaluation || !evaluation.breaches) {
+            return null;
+        }
+        const direction = evaluation.observedSigma >= 0 ? "above" : "below";
+        return (`Log count ${logCount} over the last ${windowSeconds} seconds ` +
+            `(${observedPerMinute.toFixed(2)} logs/min) is ` +
+            `${Math.abs(evaluation.observedSigma).toFixed(2)}σ ${direction} the same-hour baseline ` +
+            `(${method === AnomalyDetectionMethod.MedianMad ? "median" : "mean"} ` +
+            `${evaluation.center.toFixed(2)} logs/min, σ ${evaluation.spread.toFixed(2)}, ` +
+            `${baseline.sampleCount} samples over ${baseline.windowDays} days, ` +
+            `sensitivity ${sensitivity}).`);
+    }
 }
 __decorate([
     CaptureSpan(),

package/build/dist/Server/Utils/Monitor/Criteria/LogMonitorCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"LogMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/LogMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,OAAO,GAER,MAAM,0CAA0C,CAAC;AAGlD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEjB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAGtD;QACC,2BAA2B;QAE3B,IAAI,SAAS,GACX,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAE7B,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtD,SAAS,GAAG,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEvD,MAAM,eAAe,GAClB,KAAK,CAAC,aAAoC,CAAC,QAAQ,IAAI,CAAC,CAAC;YAE5D,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,eAAe;gBACtB,SAAS,EAAE,SAAmB;gBAC9B,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAxBqB;IADnB,WAAW,EAAE;;;;kEAwBb"}
+{"version":3,"file":"LogMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/LogMonitorCriteria.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js

@@ -12,35 +12,32 @@ import OneUptimeDate from "../../../../Types/Date";
 import { CheckOn, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
 import EvaluateOverTime from "./EvaluateOverTime";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
-import logger from "../../Logger";
 export default class ServerMonitorCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
+        var _a, _b;
         let threshold = input.criteriaFilter.value;
         const dataToProcess = input.dataToProcess;
         const sslResponse = dataToProcess.sslResponse;
-        let overTimeValue = undefined;
-        if (input.criteriaFilter.evaluateOverTime &&
-            input.criteriaFilter.evaluateOverTimeOptions) {
-            try {
-                overTimeValue = await EvaluateOverTime.getValueOverTime({
-                    projectId: input.dataToProcess.projectId,
-                    monitorId: input.dataToProcess.monitorId,
-                    evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
-                    metricType: input.criteriaFilter.checkOn,
-                });
-                if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
-                    overTimeValue = undefined;
-                }
-            }
-            catch (err) {
-                logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
-                logger.error(err);
-                overTimeValue = undefined;
-            }
-        }
+        const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
+            projectId: input.dataToProcess.projectId,
+            monitorId: input.dataToProcess.monitorId,
+            criteriaFilter: input.criteriaFilter,
+            monitoringInterval: input.monitoringInterval,
+        });
+        /*
+         * The window could not back this over-time filter (nothing recorded yet,
+         * or the monitor has not been running long enough to cover it). Return
+         * the decision the no-data policy already made instead of falling
+         * through to the value that arrived with this one check - that fallback
+         * is what let "all values over the last N minutes" fire off a single
+         * bad reading.
+         */
+        if (overTime.earlyReturn) {
+            return overTime.earlyReturn.result;
+        }
+        const overTimeValue = overTime.value;
         if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
-            const currentIsOnline = overTimeValue ||
-                input.dataToProcess.isOnline;
+            const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : input.dataToProcess.isOnline;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsOnline,
                 criteriaFilter: input.criteriaFilter,
@@ -48,8 +45,7 @@ export default class ServerMonitorCriteria {
         }
         // timeout.
         if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
-            const currentIsTimeout = overTimeValue ||
-                input.dataToProcess.isTimeout;
+            const currentIsTimeout = (_b = overTimeValue) !== null && _b !== void 0 ? _b : input.dataToProcess.isTimeout;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsTimeout,
                 criteriaFilter: input.criteriaFilter,

package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/Criteria/SecurityEventsMonitorCriteria.js

@@ -0,0 +1,35 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import CaptureSpan from "../../Telemetry/CaptureSpan";
+import CompareCriteria from "./CompareCriteria";
+import { CheckOn, } from "../../../../Types/Monitor/CriteriaFilter";
+export default class SecurityEventsMonitorCriteria {
+    static async isMonitorInstanceCriteriaFilterMet(input) {
+        let threshold = input.criteriaFilter.value;
+        if (input.criteriaFilter.checkOn === CheckOn.SecurityEventCount) {
+            threshold = CompareCriteria.convertToNumber(threshold);
+            const currentCount = input.dataToProcess
+                .securityEventCount || 0;
+            return CompareCriteria.compareCriteriaNumbers({
+                value: currentCount,
+                threshold: threshold,
+                criteriaFilter: input.criteriaFilter,
+            });
+        }
+        return null;
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], SecurityEventsMonitorCriteria, "isMonitorInstanceCriteriaFilterMet", null);
+//# sourceMappingURL=SecurityEventsMonitorCriteria.js.map

package/build/dist/Server/Utils/Monitor/Criteria/SecurityEventsMonitorCriteria.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SecurityEventsMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SecurityEventsMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,OAAO,GAER,MAAM,0CAA0C,CAAC;AAGlD,MAAM,CAAC,OAAO,OAAO,6BAA6B;IAE5B,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAGtD;QACC,IAAI,SAAS,GACX,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAE7B,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAChE,SAAS,GAAG,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEvD,MAAM,YAAY,GACf,KAAK,CAAC,aAA+C;iBACnD,kBAAkB,IAAI,CAAC,CAAC;YAE7B,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,YAAY;gBACnB,SAAS,EAAE,SAAmB;gBAC9B,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAvBqB;IADnB,WAAW,EAAE;;;;6EAuBb"}

package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js

@@ -16,29 +16,39 @@ import CaptureSpan from "../../Telemetry/CaptureSpan";
 export default class ServerMonitorCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
         // Server Monitoring Checks
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
         let threshold = input.criteriaFilter.value;
-        let overTimeValue = undefined;
-        if (input.criteriaFilter.evaluateOverTime &&
-            input.criteriaFilter.evaluateOverTimeOptions) {
-            try {
-                overTimeValue = await EvaluateOverTime.getValueOverTime({
-                    projectId: input.dataToProcess.projectId,
-                    monitorId: input.dataToProcess.monitorId,
-                    evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
-                    metricType: input.criteriaFilter.checkOn,
-                    miscData: input.criteriaFilter.serverMonitorOptions,
-                });
-                if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
-                    overTimeValue = undefined;
-                }
-            }
-            catch (err) {
-                logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
-                logger.error(err);
-                overTimeValue = undefined;
-            }
+        const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
+            projectId: input.dataToProcess.projectId,
+            monitorId: input.dataToProcess.monitorId,
+            criteriaFilter: input.criteriaFilter,
+            /*
+             * Only the disk-usage series carries a diskPath attribute, so
+             * scoping any other series by it would filter against an attribute
+             * no row has - and an empty window now means "cannot judge yet"
+             * rather than "compare the live value", which would silence the
+             * filter outright.
+             */
+            miscData: input.criteriaFilter.checkOn === CheckOn.DiskUsagePercent
+                ? input.criteriaFilter.serverMonitorOptions
+                : undefined,
+            monitoringInterval: input.monitoringInterval,
+        });
+        /*
+         * The window could not back this over-time filter, so the no-data policy
+         * has already decided it - do not fall through to the value that arrived
+         * with this one check.
+         *
+         * "Is Online" is exempt: for a server monitor the absence of data IS the
+         * signal, and the differenceInMinutes check below already implements the
+         * "wait this long before calling it offline" behaviour off the agent's
+         * last check-in time. Letting it fall through preserves that.
+         */
+        if (overTime.earlyReturn &&
+            input.criteriaFilter.checkOn !== CheckOn.IsOnline) {
+            return overTime.earlyReturn.result;
         }
+        const overTimeValue = overTime.value;
         const lastCheckTime = input.dataToProcess
             .requestReceivedAt;
         const timeNow = input.dataToProcess.timeNow ||
@@ -70,7 +80,7 @@ export default class ServerMonitorCriteria {
         };
         if (input.criteriaFilter.checkOn === CheckOn.IsOnline &&
             differenceInMinutes >= offlineIfNotCheckedInMinutes) {
-            const currentIsOnline = overTimeValue || false; // false because no request receieved in the last 2 minutes
+            const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : false; // false because no request receieved in the last 2 minutes
             logger.debug(`Current Is Online: ${currentIsOnline}`);
             const criteria = CompareCriteria.compareCriteriaBoolean({
                 value: currentIsOnline,
@@ -81,7 +91,7 @@ export default class ServerMonitorCriteria {
         }
         if (input.criteriaFilter.checkOn === CheckOn.IsOnline &&
             differenceInMinutes < offlineIfNotCheckedInMinutes) {
-            const currentIsOnline = overTimeValue || true; // true because request receieved in the last 2 minutes
+            const currentIsOnline = (_b = overTimeValue) !== null && _b !== void 0 ? _b : true; // true because request receieved in the last 2 minutes
             logger.debug(`Current Is Online: ${currentIsOnline}`);
             const criteria = CompareCriteria.compareCriteriaBoolean({
                 value: currentIsOnline,
@@ -93,10 +103,9 @@ export default class ServerMonitorCriteria {
         if (input.criteriaFilter.checkOn === CheckOn.CPUUsagePercent &&
             !input.dataToProcess.onlyCheckRequestReceivedAt) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const currentCpuPercent = overTimeValue ||
-                ((_a = input.dataToProcess
-                    .basicInfrastructureMetrics) === null || _a === void 0 ? void 0 : _a.cpuMetrics.percentUsed) ||
-                0;
+            const currentCpuPercent = (_c = overTimeValue) !== null && _c !== void 0 ? _c : (((_d = input.dataToProcess
+                .basicInfrastructureMetrics) === null || _d === void 0 ? void 0 : _d.cpuMetrics.percentUsed) ||
+                0);
             return CompareCriteria.compareCriteriaNumbers({
                 value: currentCpuPercent,
                 threshold: threshold,
@@ -106,10 +115,9 @@ export default class ServerMonitorCriteria {
         if (input.criteriaFilter.checkOn === CheckOn.MemoryUsagePercent &&
             !input.dataToProcess.onlyCheckRequestReceivedAt) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const memoryPercent = overTimeValue ||
-                ((_b = input.dataToProcess
-                    .basicInfrastructureMetrics) === null || _b === void 0 ? void 0 : _b.memoryMetrics.percentUsed) ||
-                0;
+            const memoryPercent = (_e = overTimeValue) !== null && _e !== void 0 ? _e : (((_f = input.dataToProcess
+                .basicInfrastructureMetrics) === null || _f === void 0 ? void 0 : _f.memoryMetrics.percentUsed) ||
+                0);
             return CompareCriteria.compareCriteriaNumbers({
                 value: memoryPercent,
                 threshold: threshold,
@@ -119,14 +127,20 @@ export default class ServerMonitorCriteria {
         if (input.criteriaFilter.checkOn === CheckOn.DiskUsagePercent &&
             !input.dataToProcess.onlyCheckRequestReceivedAt) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const diskPath = ((_c = input.criteriaFilter.serverMonitorOptions) === null || _c === void 0 ? void 0 : _c.diskPath) || "/";
+            const diskPath = ((_g = input.criteriaFilter.serverMonitorOptions) === null || _g === void 0 ? void 0 : _g.diskPath) || "/";
             const normalizedDiskPath = normalizeDiskPath(diskPath);
-            const diskMetric = (_e = (_d = input.dataToProcess.basicInfrastructureMetrics) === null || _d === void 0 ? void 0 : _d.diskMetrics) === null || _e === void 0 ? void 0 : _e.find((item) => {
+            const diskMetric = (_j = (_h = input.dataToProcess.basicInfrastructureMetrics) === null || _h === void 0 ? void 0 : _h.diskMetrics) === null || _j === void 0 ? void 0 : _j.find((item) => {
                 return normalizeDiskPath(item.diskPath) === normalizedDiskPath;
             });
-            const diskUsagePercent = (_g = (_f = diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentUsed) !== null && _f !== void 0 ? _f : diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentFree) !== null && _g !== void 0 ? _g : 0;
+            const diskUsagePercent = (_l = (_k = diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentUsed) !== null && _k !== void 0 ? _k : diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentFree) !== null && _l !== void 0 ? _l : 0;
+            /*
+             * Disk usage was the one server metric that computed its over-time
+             * window and then threw it away, comparing the reading from this check
+             * instead - so "evaluate over time" was a no-op here.
+             */
+            const value = (_m = overTimeValue) !== null && _m !== void 0 ? _m : diskUsagePercent;
             return CompareCriteria.compareCriteriaNumbers({
-                value: diskUsagePercent,
+                value: value,
                 threshold: threshold,
                 criteriaFilter: input.criteriaFilter,
             });
@@ -137,8 +151,8 @@ export default class ServerMonitorCriteria {
                 input.criteriaFilter.checkOn === CheckOn.LoadAverage5Min ||
                 input.criteriaFilter.checkOn === CheckOn.LoadAverage15Min)) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const loadMetrics = (_h = input.dataToProcess
-                .basicInfrastructureMetrics) === null || _h === void 0 ? void 0 : _h.loadMetrics;
+            const loadMetrics = (_o = input.dataToProcess
+                .basicInfrastructureMetrics) === null || _o === void 0 ? void 0 : _o.loadMetrics;
             let currentLoad = undefined;
             if (input.criteriaFilter.checkOn === CheckOn.LoadAverage1Min) {
                 currentLoad = loadMetrics === null || loadMetrics === void 0 ? void 0 : loadMetrics.load1;
@@ -149,7 +163,7 @@ export default class ServerMonitorCriteria {
             else if (input.criteriaFilter.checkOn === CheckOn.LoadAverage15Min) {
                 currentLoad = loadMetrics === null || loadMetrics === void 0 ? void 0 : loadMetrics.load15;
             }
-            const value = overTimeValue || currentLoad || 0;
+            const value = (_p = overTimeValue) !== null && _p !== void 0 ? _p : (currentLoad || 0);
             return CompareCriteria.compareCriteriaNumbers({
                 value: value,
                 threshold: threshold,
@@ -159,10 +173,9 @@ export default class ServerMonitorCriteria {
         if (input.criteriaFilter.checkOn === CheckOn.SwapUsagePercent &&
             !input.dataToProcess.onlyCheckRequestReceivedAt) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const swapPercent = overTimeValue ||
-                ((_k = (_j = input.dataToProcess
-                    .basicInfrastructureMetrics) === null || _j === void 0 ? void 0 : _j.memoryMetrics) === null || _k === void 0 ? void 0 : _k.swapPercentUsed) ||
-                0;
+            const swapPercent = (_q = overTimeValue) !== null && _q !== void 0 ? _q : (((_s = (_r = input.dataToProcess
+                .basicInfrastructureMetrics) === null || _r === void 0 ? void 0 : _r.memoryMetrics) === null || _s === void 0 ? void 0 : _s.swapPercentUsed) ||
+                0);
             return CompareCriteria.compareCriteriaNumbers({
                 value: swapPercent,
                 threshold: threshold,
@@ -172,10 +185,9 @@ export default class ServerMonitorCriteria {
         if (input.criteriaFilter.checkOn === CheckOn.CPUIoWaitPercent &&
             !input.dataToProcess.onlyCheckRequestReceivedAt) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const ioWaitPercent = overTimeValue ||
-                ((_m = (_l = input.dataToProcess
-                    .basicInfrastructureMetrics) === null || _l === void 0 ? void 0 : _l.cpuMetrics) === null || _m === void 0 ? void 0 : _m.timeIoWaitPercent) ||
-                0;
+            const ioWaitPercent = (_t = overTimeValue) !== null && _t !== void 0 ? _t : (((_v = (_u = input.dataToProcess
+                .basicInfrastructureMetrics) === null || _u === void 0 ? void 0 : _u.cpuMetrics) === null || _v === void 0 ? void 0 : _v.timeIoWaitPercent) ||
+                0);
             return CompareCriteria.compareCriteriaNumbers({
                 value: ioWaitPercent,
                 threshold: threshold,
@@ -190,7 +202,7 @@ export default class ServerMonitorCriteria {
                 .trim()
                 .toLowerCase();
             if (input.criteriaFilter.filterType === FilterType.IsExecuting) {
-                const processNames = ((_p = (_o = input.dataToProcess) === null || _o === void 0 ? void 0 : _o.processes) === null || _p === void 0 ? void 0 : _p.map((item) => {
+                const processNames = ((_x = (_w = input.dataToProcess) === null || _w === void 0 ? void 0 : _w.processes) === null || _x === void 0 ? void 0 : _x.map((item) => {
                     return item.name.trim().toLowerCase();
                 })) || [];
                 if (processNames.includes(thresholdProcessName)) {
@@ -199,7 +211,7 @@ export default class ServerMonitorCriteria {
                 return null;
             }
             if (input.criteriaFilter.filterType === FilterType.IsNotExecuting) {
-                const processNames = ((_r = (_q = input.dataToProcess) === null || _q === void 0 ? void 0 : _q.processes) === null || _r === void 0 ? void 0 : _r.map((item) => {
+                const processNames = ((_z = (_y = input.dataToProcess) === null || _y === void 0 ? void 0 : _y.processes) === null || _z === void 0 ? void 0 : _z.map((item) => {
                     return item.name.trim().toLowerCase();
                 })) || [];
                 if (!processNames.includes(thresholdProcessName)) {
@@ -216,7 +228,7 @@ export default class ServerMonitorCriteria {
                 .trim()
                 .toLowerCase();
             if (input.criteriaFilter.filterType === FilterType.IsExecuting) {
-                const processPIDs = ((_t = (_s = input.dataToProcess) === null || _s === void 0 ? void 0 : _s.processes) === null || _t === void 0 ? void 0 : _t.map((item) => {
+                const processPIDs = ((_1 = (_0 = input.dataToProcess) === null || _0 === void 0 ? void 0 : _0.processes) === null || _1 === void 0 ? void 0 : _1.map((item) => {
                     return item.pid.toString().trim().toLowerCase();
                 })) || [];
                 if (processPIDs.includes(thresholdProcessPID)) {
@@ -225,7 +237,7 @@ export default class ServerMonitorCriteria {
                 return null;
             }
             if (input.criteriaFilter.filterType === FilterType.IsNotExecuting) {
-                const processPIDs = ((_v = (_u = input.dataToProcess) === null || _u === void 0 ? void 0 : _u.processes) === null || _v === void 0 ? void 0 : _v.map((item) => {
+                const processPIDs = ((_3 = (_2 = input.dataToProcess) === null || _2 === void 0 ? void 0 : _2.processes) === null || _3 === void 0 ? void 0 : _3.map((item) => {
                     return item.pid.toString().trim().toLowerCase();
                 })) || [];
                 if (!processPIDs.includes(thresholdProcessPID)) {
@@ -243,7 +255,7 @@ export default class ServerMonitorCriteria {
                 .trim()
                 .toLowerCase();
             if (input.criteriaFilter.filterType === FilterType.IsExecuting) {
-                const processCommands = ((_x = (_w = input.dataToProcess) === null || _w === void 0 ? void 0 : _w.processes) === null || _x === void 0 ? void 0 : _x.map((item) => {
+                const processCommands = ((_5 = (_4 = input.dataToProcess) === null || _4 === void 0 ? void 0 : _4.processes) === null || _5 === void 0 ? void 0 : _5.map((item) => {
                     return item.command.trim().toLowerCase();
                 })) || [];
                 if (processCommands.includes(thresholdProcessCommand)) {
@@ -252,7 +264,7 @@ export default class ServerMonitorCriteria {
                 return null;
             }
             if (input.criteriaFilter.filterType === FilterType.IsNotExecuting) {
-                const processCommands = ((_z = (_y = input.dataToProcess) === null || _y === void 0 ? void 0 : _y.processes) === null || _z === void 0 ? void 0 : _z.map((item) => {
+                const processCommands = ((_7 = (_6 = input.dataToProcess) === null || _6 === void 0 ? void 0 : _6.processes) === null || _7 === void 0 ? void 0 : _7.map((item) => {
                     return item.command.trim().toLowerCase();
                 })) || [];
                 if (!processCommands.includes(thresholdProcessCommand)) {