@oneuptime/common 12.0.14 → 12.0.16

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionValidator.js

@@ -0,0 +1,109 @@
+import BadDataException from "../../../Types/Exception/BadDataException";
+import MeasurementOccurrence from "../../../Types/Measurement/MeasurementOccurrence";
+/*
+ * Validation shared by the incident, alert and scheduled maintenance
+ * measurement services.
+ *
+ * Every rule here exists to stop a definition that would silently produce a
+ * confidently wrong number -- a constant zero, or a duration that can never
+ * complete with nothing anywhere saying so.
+ */
+class MeasurementDefinitionValidator {
+    static validateKey(key) {
+        if (!key) {
+            throw new BadDataException("A measurement needs a key. Use lowercase letters, numbers and hyphens, for example: time-to-detect");
+        }
+        if (!MeasurementDefinitionValidator.KEY_PATTERN.test(key)) {
+            throw new BadDataException(`"${key}" is not a valid measurement key. Keys start with a lowercase letter or number, contain only lowercase letters, numbers and hyphens, and are at most 50 characters. For example: time-to-detect`);
+        }
+    }
+    static validateAnchorPair(data) {
+        if (!data.startAnchorType) {
+            throw new BadDataException("A measurement needs a starting point.");
+        }
+        if (!data.endAnchorType) {
+            throw new BadDataException("A measurement needs an ending point.");
+        }
+        if (data.startAnchorType === data.stateEnteredAnchor &&
+            !data.startStateId) {
+            throw new BadDataException("Pick the state this measurement starts from.");
+        }
+        if (data.endAnchorType === data.stateEnteredAnchor && !data.endStateId) {
+            throw new BadDataException("Pick the state this measurement ends at.");
+        }
+        if (data.startAnchorType === data.stateRoleEnteredAnchor &&
+            !data.startStateRole) {
+            throw new BadDataException("Pick the kind of state this measurement starts from.");
+        }
+        if (data.endAnchorType === data.stateRoleEnteredAnchor &&
+            !data.endStateRole) {
+            throw new BadDataException("Pick the kind of state this measurement ends at.");
+        }
+        MeasurementDefinitionValidator.rejectIdenticalAnchors(data);
+    }
+    /*
+     * Two identical endpoints always measure zero. Shipping that produces a
+     * chart that reads "we do this instantly" on every incident -- which is
+     * strictly worse than having no chart, because it looks like an answer.
+     */
+    static rejectIdenticalAnchors(data) {
+        const startSource = MeasurementDefinitionValidator.resolveAnchorSource(data.startAnchorType, data.timestampAnchorSources);
+        const endSource = MeasurementDefinitionValidator.resolveAnchorSource(data.endAnchorType, data.timestampAnchorSources);
+        if (startSource !== endSource) {
+            return;
+        }
+        const startOccurrence = data.startOccurrence || MeasurementOccurrence.First;
+        const endOccurrence = data.endOccurrence || MeasurementOccurrence.First;
+        if (data.startAnchorType === data.stateEnteredAnchor) {
+            if (data.startStateId === data.endStateId &&
+                startOccurrence === endOccurrence) {
+                throw new BadDataException("This measurement starts and ends at the same point, so it would always be zero. Pick two different points.");
+            }
+            return;
+        }
+        if (data.startAnchorType === data.stateRoleEnteredAnchor) {
+            if (data.startStateRole === data.endStateRole &&
+                startOccurrence === endOccurrence) {
+                throw new BadDataException("This measurement starts and ends at the same point, so it would always be zero. Pick two different points.");
+            }
+            return;
+        }
+        // Two identical timestamp anchors. Always zero, no exceptions.
+        throw new BadDataException("This measurement starts and ends at the same point, so it would always be zero. Pick two different points.");
+    }
+    /*
+     * The column an anchor reads, so two differently-named anchors that read
+     * the same column are recognised as the same point in time.
+     */
+    static resolveAnchorSource(anchorType, sources) {
+        if (!anchorType) {
+            return "";
+        }
+        return (sources === null || sources === void 0 ? void 0 : sources[anchorType]) || anchorType;
+    }
+    /*
+     * States are entered in strictly increasing order, so an end state ordered
+     * at or before the start state describes a duration that can never
+     * complete. Without this the definition looks fine and every incident
+     * reports "not applicable" forever.
+     */
+    static validateStateOrder(data) {
+        if (data.startStateOrder === undefined ||
+            data.endStateOrder === undefined) {
+            return;
+        }
+        if (data.endStateOrder > data.startStateOrder) {
+            return;
+        }
+        throw new BadDataException(`"${data.endStateName}" comes before "${data.startStateName}" in this project's state order, so this measurement could never complete. Swap the two, or pick a later ending state.`);
+    }
+}
+/*
+ * The key becomes part of the metric name, which lands in ClickHouse, in
+ * the dashboard chart picker and in the API. It is immutable after
+ * creation, so it is worth rejecting a bad one loudly at the only moment
+ * it can still be changed.
+ */
+MeasurementDefinitionValidator.KEY_PATTERN = /^[a-z0-9][a-z0-9-]{0,49}$/;
+export default MeasurementDefinitionValidator;
+//# sourceMappingURL=MeasurementDefinitionValidator.js.map

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionValidator.js.map

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

package/build/dist/Server/Utils/Measurement/MeasurementMetricWriter.js

@@ -0,0 +1,131 @@
+import MetricType from "../../../Models/DatabaseModels/MetricType";
+import MutableMetric from "../../../Models/AnalyticsModels/MutableMetric";
+import { MetricPointType } from "../../../Models/AnalyticsModels/Metric";
+import GlobalConfigService from "../../Services/GlobalConfigService";
+import MutableMetricService from "../../Services/MutableMetricService";
+import ObjectID from "../../../Types/ObjectID";
+import OneUptimeDate from "../../../Types/Date";
+import TelemetryUtil from "../Telemetry/Telemetry";
+import logger from "../Logger";
+const DEFAULT_METRIC_RETENTION_IN_DAYS = 180;
+/*
+ * Writes measurement values into the existing mutable-metric pipeline.
+ *
+ * The one thing this must get right is the tombstone scope.
+ * MutableMetricService.replaceEntityMetrics tombstones every live metric
+ * point whose name is in `metricNames` and which is not in the desired set it
+ * was handed. So the measurement writer owns its OWN name list -- the
+ * project's measurement metric names, and nothing else -- and never appends
+ * those names to the built-in refresh's replace list. Doing the latter would
+ * make every state change tombstone every measurement point, silently, since
+ * the built-in refresh has no measurement points in its desired set.
+ */
+export default class MeasurementMetricWriter {
+    static async write(data) {
+        if (data.allMeasurementMetricNames.length === 0) {
+            return;
+        }
+        const retentionDate = OneUptimeDate.addRemoveDays(OneUptimeDate.getCurrentDate(), await MeasurementMetricWriter.getMetricRetentionInDays());
+        const metrics = [];
+        const metricTypesMap = {};
+        for (const point of data.points) {
+            const metric = new MutableMetric();
+            metric.projectId = data.projectId;
+            metric.primaryEntityId = data.primaryEntityId;
+            metric.primaryEntityType = data.primaryEntityType;
+            metric.name = point.metricName;
+            /*
+             * Per-definition point identity, mirroring the built-in
+             * `time-in-state:<timelineRowId>` shape. Sharing one identity across
+             * definitions would make each refresh overwrite the others.
+             */
+            metric.metricPointId = `measurement:${point.measurementId}`;
+            metric.value = point.valueInSeconds;
+            metric.time = point.time;
+            metric.timeUnixNano = OneUptimeDate.toUnixNano(point.time);
+            metric.metricPointType = MetricPointType.Sum;
+            metric.retentionDate = retentionDate;
+            metric.attributes = Object.assign(Object.assign({}, data.baseAttributes), { 
+                /*
+                 * Namespaced, following the oneuptime.label.* / oneuptime.customField.*
+                 * convention, so they cannot collide with the unprefixed camelCase
+                 * dimensions the built-in metrics carry.
+                 */
+                "oneuptime.measurement.id": point.measurementId, "oneuptime.measurement.key": point.measurementKey, "oneuptime.measurement.name": point.measurementName });
+            metric.attributeKeys = TelemetryUtil.getAttributeKeys(metric.attributes);
+            metrics.push(metric);
+            const metricType = new MetricType();
+            metricType.name = point.metricName;
+            metricType.description =
+                point.description ||
+                    `${point.measurementName}, a measurement defined for this project`;
+            metricType.unit = point.unit || "seconds";
+            metricTypesMap[point.metricName] = metricType;
+        }
+        await MutableMetricService.replaceEntityMetrics({
+            projectId: data.projectId,
+            primaryEntityId: data.primaryEntityId,
+            primaryEntityType: data.primaryEntityType,
+            metricNames: data.allMeasurementMetricNames,
+            metrics: metrics,
+            retentionDate: retentionDate,
+        });
+        if (Object.keys(metricTypesMap).length === 0) {
+            return;
+        }
+        /*
+         * Registering the name is what makes a measurement appear in the
+         * dashboard chart picker -- the picker reads MetricType rows, not any
+         * enum, so no dashboard code is needed for a new measurement.
+         */
+        TelemetryUtil.indexMetricNameServiceNameMap({
+            metricNameServiceNameMap: metricTypesMap,
+            projectId: data.projectId,
+        }).catch((err) => {
+            logger.error(err);
+        });
+    }
+    /*
+     * Tombstones every measurement point for one entity. Used when the entity
+     * is deleted, so its points leave the charts rather than lingering until
+     * the retention date.
+     */
+    static async tombstoneAll(data) {
+        if (data.allMeasurementMetricNames.length === 0) {
+            return;
+        }
+        const retentionDate = OneUptimeDate.addRemoveDays(OneUptimeDate.getCurrentDate(), await MeasurementMetricWriter.getMetricRetentionInDays());
+        await MutableMetricService.tombstoneEntityMetrics({
+            projectId: data.projectId,
+            primaryEntityId: data.primaryEntityId,
+            primaryEntityType: data.primaryEntityType,
+            metricNames: data.allMeasurementMetricNames,
+            retentionDate: retentionDate,
+        });
+    }
+    static async getMetricRetentionInDays() {
+        try {
+            const globalConfig = await GlobalConfigService.findOneBy({
+                query: {
+                    _id: ObjectID.getZeroObjectID().toString(),
+                },
+                props: {
+                    isRoot: true,
+                },
+                select: {
+                    monitorMetricRetentionInDays: true,
+                },
+            });
+            if (globalConfig &&
+                globalConfig.monitorMetricRetentionInDays !== undefined &&
+                globalConfig.monitorMetricRetentionInDays !== null) {
+                return globalConfig.monitorMetricRetentionInDays;
+            }
+        }
+        catch (err) {
+            logger.error(err);
+        }
+        return DEFAULT_METRIC_RETENTION_IN_DAYS;
+    }
+}
+//# sourceMappingURL=MeasurementMetricWriter.js.map

package/build/dist/Server/Utils/Measurement/MeasurementMetricWriter.js.map

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

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

@@ -12,44 +12,48 @@ import EvaluateOverTime from "./EvaluateOverTime";
 import { CheckOn, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
 import Typeof from "../../../../Types/Typeof";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
-import logger from "../../Logger";
 export default class APIRequestCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
         // Server Monitoring Checks
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         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 (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,
             });
         }
         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,
@@ -58,8 +62,7 @@ export default class APIRequestCriteria {
         // check response time filter
         if (input.criteriaFilter.checkOn === CheckOn.ResponseTime) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const value = overTimeValue ||
-                input.dataToProcess.responseTimeInMs;
+            const value = (_c = overTimeValue) !== null && _c !== void 0 ? _c : input.dataToProcess.responseTimeInMs;
             return CompareCriteria.compareCriteriaNumbers({
                 value: value,
                 threshold: threshold,
@@ -72,7 +75,7 @@ export default class APIRequestCriteria {
             const currentValue = input.criteriaFilter.checkOn === CheckOn.PortDnsLookupTime
                 ? portTimings === null || portTimings === void 0 ? void 0 : portTimings.dnsLookupInMs
                 : portTimings === null || portTimings === void 0 ? void 0 : portTimings.tcpConnectInMs;
-            const value = (_a = overTimeValue) !== null && _a !== void 0 ? _a : currentValue;
+            const value = (_d = overTimeValue) !== null && _d !== void 0 ? _d : currentValue;
             if (value === undefined) {
                 return null;
             }
@@ -85,8 +88,8 @@ export default class APIRequestCriteria {
         }
         // check packet loss (Ping/IP monitors with multi-packet checks)
         if (input.criteriaFilter.checkOn === CheckOn.PacketLossPercent) {
-            const packetLossPercent = (_b = input.dataToProcess.pingResponse) === null || _b === void 0 ? void 0 : _b.packetLossPercent;
-            const value = overTimeValue || packetLossPercent;
+            const packetLossPercent = (_e = input.dataToProcess.pingResponse) === null || _e === void 0 ? void 0 : _e.packetLossPercent;
+            const value = (_f = overTimeValue) !== null && _f !== void 0 ? _f : packetLossPercent;
             if (value === undefined) {
                 return null;
             }
@@ -99,8 +102,8 @@ export default class APIRequestCriteria {
         }
         // check jitter (Ping/IP monitors with multi-packet checks)
         if (input.criteriaFilter.checkOn === CheckOn.Jitter) {
-            const jitterInMs = (_c = input.dataToProcess.pingResponse) === null || _c === void 0 ? void 0 : _c.jitterInMs;
-            const value = overTimeValue || jitterInMs;
+            const jitterInMs = (_g = input.dataToProcess.pingResponse) === null || _g === void 0 ? void 0 : _g.jitterInMs;
+            const value = (_h = overTimeValue) !== null && _h !== void 0 ? _h : jitterInMs;
             if (value === undefined) {
                 return null;
             }
@@ -115,8 +118,7 @@ export default class APIRequestCriteria {
         if (input.criteriaFilter.checkOn === CheckOn.ResponseStatusCode &&
             input.dataToProcess.responseCode) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const value = overTimeValue ||
-                input.dataToProcess.responseCode;
+            const value = (_j = overTimeValue) !== null && _j !== void 0 ? _j : input.dataToProcess.responseCode;
             return CompareCriteria.compareCriteriaNumbers({
                 value: value,
                 threshold: threshold,

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

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

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

@@ -0,0 +1,111 @@
+import { AnomalyDetectionMethod, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
+/**
+ * Consistency constant that maps a Median Absolute Deviation to the
+ * standard deviation of a Gaussian (σ ≈ 1.4826 × MAD), so the same
+ * sigmaCount sensitivity levels apply to both anomaly methods.
+ */
+export const MAD_TO_SIGMA = 1.4826;
+/**
+ * Pure math for count-based anomaly criteria (CheckOn.SpanCount /
+ * CheckOn.LogCount with FilterType.AnomalouslyHigh/Low/Anomalous).
+ * The services compute stats through here so the write-side MV cells
+ * and the eval-time comparison agree on what a "sample" is.
+ */
+export default class CountAnomaly {
+    /**
+     * Compute baseline stats over a cell's per-minute counts. Returns
+     * null for an empty input — the caller treats that as "no baseline"
+     * (Learning), same as a missing row.
+     */
+    static computeStats(counts) {
+        if (counts.length === 0) {
+            return null;
+        }
+        let sum = 0;
+        let min = counts[0];
+        let max = counts[0];
+        for (const value of counts) {
+            sum += value;
+            if (value < min) {
+                min = value;
+            }
+            if (value > max) {
+                max = value;
+            }
+        }
+        const mean = sum / counts.length;
+        let sumSquaredDeviation = 0;
+        for (const value of counts) {
+            sumSquaredDeviation += (value - mean) * (value - mean);
+        }
+        const stddev = Math.sqrt(sumSquaredDeviation / counts.length);
+        const median = CountAnomaly.medianOf(counts);
+        const absoluteDeviations = counts.map((value) => {
+            return Math.abs(value - median);
+        });
+        const madSigma = CountAnomaly.medianOf(absoluteDeviations) * MAD_TO_SIGMA;
+        return {
+            sampleCount: counts.length,
+            mean,
+            stddev,
+            median,
+            madSigma,
+            minObserved: min,
+            maxObserved: max,
+        };
+    }
+    /**
+     * Compare an observed per-minute rate to a baseline cell. Returns
+     * null when the baseline has zero spread — any deviation at all would
+     * fire, so the caller must skip rather than alert (mirrors the metric
+     * evaluator's zero-variance guard).
+     */
+    static evaluate(input) {
+        const isMedianMad = input.method === AnomalyDetectionMethod.MedianMad;
+        const center = isMedianMad ? input.stats.median : input.stats.mean;
+        const spread = isMedianMad
+            ? input.stats.madSigma
+            : input.stats.stddev;
+        if (!Number.isFinite(spread) || spread <= 0) {
+            return null;
+        }
+        const expectedHigh = center + input.sigmaCount * spread;
+        const expectedLow = center - input.sigmaCount * spread;
+        const observedSigma = (input.observedPerMinute - center) / spread;
+        const isHighBreach = input.observedPerMinute > expectedHigh;
+        const isLowBreach = input.observedPerMinute < expectedLow;
+        let breaches = false;
+        switch (input.filterType) {
+            case FilterType.AnomalouslyHigh:
+                breaches = isHighBreach;
+                break;
+            case FilterType.AnomalouslyLow:
+                breaches = isLowBreach;
+                break;
+            case FilterType.Anomalous:
+                breaches = isHighBreach || isLowBreach;
+                break;
+            default:
+                breaches = false;
+        }
+        return {
+            breaches,
+            observedSigma,
+            expectedHigh,
+            expectedLow,
+            center,
+            spread,
+        };
+    }
+    static medianOf(values) {
+        const sorted = [...values].sort((a, b) => {
+            return a - b;
+        });
+        const mid = Math.floor(sorted.length / 2);
+        if (sorted.length % 2 === 0) {
+            return (sorted[mid - 1] + sorted[mid]) / 2;
+        }
+        return sorted[mid];
+    }
+}
+//# sourceMappingURL=CountAnomaly.js.map

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

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

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

@@ -11,36 +11,33 @@ import CompareCriteria from "./CompareCriteria";
 import { CheckOn, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
 import EvaluateOverTime from "./EvaluateOverTime";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
-import logger from "../../Logger";
 export default class DnsMonitorCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
+        var _a, _b;
         let threshold = input.criteriaFilter.value;
         const dataToProcess = input.dataToProcess;
         const dnsResponse = dataToProcess.dnsResponse;
-        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;
         // Check if DNS is online
         if (input.criteriaFilter.checkOn === CheckOn.DnsIsOnline) {
-            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,
@@ -52,9 +49,8 @@ export default class DnsMonitorCriteria {
             if (threshold === null || threshold === undefined) {
                 return null;
             }
-            const currentResponseTime = overTimeValue ||
-                (dnsResponse === null || dnsResponse === void 0 ? void 0 : dnsResponse.responseTimeInMs) ||
-                input.dataToProcess.responseTimeInMs;
+            const currentResponseTime = (_b = overTimeValue) !== null && _b !== void 0 ? _b : ((dnsResponse === null || dnsResponse === void 0 ? void 0 : dnsResponse.responseTimeInMs) ||
+                input.dataToProcess.responseTimeInMs);
             if (currentResponseTime === null || currentResponseTime === undefined) {
                 return null;
             }

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

@@ -1 +1 @@
-{"version":3,"file":"DnsMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/DnsMonitorCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DnsMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/DnsMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,0CAA0C,CAAC;AAGlD,OAAO,gBAA2C,MAAM,oBAAoB,CAAC;AAC7E,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEjB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAUtD;;QACC,IAAI,SAAS,GACX,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAE7B,MAAM,aAAa,GACjB,KAAK,CAAC,aAAqC,CAAC;QAE9C,MAAM,WAAW,GACf,aAAa,CAAC,WAAW,CAAC;QAE5B,MAAM,QAAQ,GACZ,MAAM,gBAAgB,CAAC,iCAAiC,CAAC;YACvD,SAAS,EAAG,KAAK,CAAC,aAAsC,CAAC,SAAS;YAClE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,SAAU;YACzC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;SAC7C,CAAC,CAAC;QAEL;;;;;;;WAOG;QACH,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC;QACrC,CAAC;QAED,MAAM,aAAa,GAIH,QAAQ,CAAC,KAAK,CAAC;QAE/B,yBAAyB;QACzB,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC;YACzD,MAAM,eAAe,GACnB,MAAC,aAAgC,mCAChC,KAAK,CAAC,aAAsC,CAAC,QAAQ,CAAC;YAEzD,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,eAAe;gBACtB,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,0BAA0B;QAC1B,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7D,SAAS,GAAG,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEvD,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,mBAAmB,GACvB,MAAC,aAA+B,mCAChC,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,gBAAgB;gBAC3B,KAAK,CAAC,aAAsC,CAAC,gBAAgB,CAAC,CAAC;YAEpE,IAAI,mBAAmB,KAAK,IAAI,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;gBACtE,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,mBAAmB;gBAC1B,SAAS,EAAE,SAAmB;gBAC9B,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,6BAA6B;QAC7B,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7D,MAAM,MAAM,GAAY,OAAO,CAC7B,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,KAAI,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CACvD,CAAC;YAEF,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YACtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;gBACrB,OAAO,kCAAkC,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,MAAM,IAAI,OAAO,EAAE,CAAC;gBACvB,OAAO,qCAAqC,CAAC;YAC/C,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wBAAwB;QACxB,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3D,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YACtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa,MAAK,SAAS,EAAE,CAAC;gBAC7C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,WAAW,CAAC,aAAa,IAAI,MAAM,EAAE,CAAC;gBACxC,OAAO,kBAAkB,CAAC;YAC5B,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,OAAO,EAAE,CAAC;gBAC1C,OAAO,sBAAsB,CAAC;YAChC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,yBAAyB;QACzB,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5D,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAA,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9D,OAAO,IAAI,CAAC;YACd,CAAC;YAED,iDAAiD;YACjD,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACzC,MAAM,WAAW,GAAW,MAAM,CAAC,KAAK,CAAC;gBAEzC,+BAA+B;gBAC/B,IACE,OAAO,SAAS,KAAK,QAAQ;oBAC7B,CAAC,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAC5D,CAAC;oBACD,MAAM,gBAAgB,GACpB,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;oBAE7C,IAAI,gBAAgB,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;wBAC7D,MAAM,MAAM,GACV,eAAe,CAAC,sBAAsB,CAAC;4BACrC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC;4BAC1B,SAAS,EAAE,gBAAgB;4BAC3B,cAAc,EAAE,KAAK,CAAC,cAAc;yBACrC,CAAC,CAAC;wBAEL,IAAI,MAAM,EAAE,CAAC;4BACX,OAAO,eAAe,MAAM,CAAC,IAAI,MAAM,MAAM,EAAE,CAAC;wBAClD,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,oBAAoB;gBACpB,MAAM,MAAM,GAAkB,eAAe,CAAC,sBAAsB,CAAC;oBACnE,KAAK,EAAE,WAAW;oBAClB,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;oBAC5B,cAAc,EAAE,KAAK,CAAC,cAAc;iBACrC,CAAC,CAAC;gBAEH,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,eAAe,MAAM,CAAC,IAAI,MAAM,MAAM,EAAE,CAAC;gBAClD,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7KqB;IADnB,WAAW,EAAE;;;;kEA6Kb"}