@oneuptime/common 12.0.14 → 12.0.15

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

@@ -9,59 +9,374 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { LIMIT_PER_PROJECT } from "../../../../Types/Database/LimitMax";
 import OneUptimeDate from "../../../../Types/Date";
-import { CheckOn, EvaluateOverTimeType, } from "../../../../Types/Monitor/CriteriaFilter";
+import { CheckOn, EvaluateOverTimeType, NoDataPolicy, } from "../../../../Types/Monitor/CriteriaFilter";
 import MonitorMetricTypeUtil from "../../../../Utils/Monitor/MonitorMetricType";
 import MetricService from "../../../Services/MetricService";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
 import InBetween from "../../../../Types/BaseDatabase/InBetween";
-export default class EvaluateOverTime {
-    static async getValueOverTime(data) {
-        // get values over time
-        const lastMinutesDate = OneUptimeDate.getSomeMinutesAgo(data.evaluateOverTimeOptions.timeValueInMinutes);
-        // TODO: Query over miscData
-        const now = OneUptimeDate.getCurrentDate();
-        const query = {
+import CronTab from "../../CronTab";
+import logger from "../../Logger";
+/**
+ * Outcome of trying to turn an "evaluate over time" filter into a value the
+ * comparators can act on.
+ */
+export var OverTimeEvaluationStatus;
+(function (OverTimeEvaluationStatus) {
+    /** The filter is not configured to evaluate over time at all. */
+    OverTimeEvaluationStatus["NotConfigured"] = "NotConfigured";
+    /**
+     * No metric series backs this CheckOn, so there is nothing to look back
+     * over. Callers keep their historical behaviour (compare the value that
+     * arrived with this check) rather than silently never firing.
+     */
+    OverTimeEvaluationStatus["Unsupported"] = "Unsupported";
+    /**
+     * The window is usable and `value` holds every sample in it (for
+     * All Values / Any Value) or the aggregate (for Average / Sum / Min / Max).
+     */
+    OverTimeEvaluationStatus["Evaluated"] = "Evaluated";
+    /**
+     * The window is empty, still filling up, or could not be read. The filter
+     * cannot be judged yet — what happens next is up to the no-data policy.
+     */
+    OverTimeEvaluationStatus["InsufficientData"] = "InsufficientData";
+})(OverTimeEvaluationStatus || (OverTimeEvaluationStatus = {}));
+class EvaluateOverTime {
+    /**
+     * Resolve an "evaluate over time" criteria filter into the value its
+     * comparator should use, applying the filter's no-data policy.
+     *
+     * This is the single entry point every monitor-type criteria evaluator
+     * uses. It exists so the "window has no usable data" decision is made in
+     * exactly one place: previously each evaluator did
+     * `overTimeValue || <value from this check>`, which quietly turned every
+     * over-time filter into an instantaneous one whenever the window came back
+     * empty.
+     *
+     * Deliberately not span-decorated: this runs for every criteria filter on
+     * every check and the vast majority return at the guard below without
+     * doing any work. evaluateOverTime, which issues the metric read, carries
+     * the span instead.
+     */
+    static async getOverTimeValueForCriteriaFilter(data) {
+        var _a, _b;
+        /*
+         * Every criteria evaluator calls this for every filter, so the common
+         * case - a filter that does not evaluate over time - returns before any
+         * of the machinery below runs.
+         */
+        if (!data.criteriaFilter.evaluateOverTime ||
+            !data.criteriaFilter.evaluateOverTimeOptions) {
+            return {
+                earlyReturn: null,
+                value: undefined,
+            };
+        }
+        const evaluation = await this.evaluateOverTime({
             projectId: data.projectId,
-            time: new InBetween(lastMinutesDate, now),
-            primaryEntityId: data.monitorId,
-            name: MonitorMetricTypeUtil.getMonitorMeticTypeByCheckOn(data.metricType),
-        };
-        if (data.miscData) {
-            query.attributes = data.miscData;
-        }
-        const monitorMetricsItems = await MetricService.findBy({
-            query: query,
-            limit: LIMIT_PER_PROJECT,
-            skip: 0,
-            props: {
-                isRoot: true,
-            },
-            select: {
-                value: true,
-            },
+            monitorId: data.monitorId,
+            criteriaFilter: data.criteriaFilter,
+            miscData: data.miscData,
+            monitoringInterval: data.monitoringInterval,
         });
-        const values = monitorMetricsItems
-            .map((item) => {
-            if (data.metricType === CheckOn.IsOnline ||
-                data.metricType === CheckOn.IsRequestTimeout) {
-                return item.value === 1;
+        if (evaluation.status === OverTimeEvaluationStatus.NotConfigured ||
+            evaluation.status === OverTimeEvaluationStatus.Unsupported) {
+            // Historical behaviour: the caller compares this check's own value.
+            return {
+                earlyReturn: null,
+                value: undefined,
+            };
+        }
+        if (evaluation.status === OverTimeEvaluationStatus.Evaluated) {
+            return {
+                earlyReturn: null,
+                value: evaluation.value,
+            };
+        }
+        // InsufficientData - the no-data policy decides.
+        const policy = evaluation.isReadError
+            ? NoDataPolicy.Ignore
+            : ((_a = data.criteriaFilter.evaluateOverTimeOptions) === null || _a === void 0 ? void 0 : _a.onNoDataPolicy) ||
+                NoDataPolicy.Ignore;
+        if (policy === NoDataPolicy.Trigger) {
+            return {
+                earlyReturn: {
+                    result: `${data.criteriaFilter.checkOn} has no data over the last ${(_b = data.criteriaFilter.evaluateOverTimeOptions) === null || _b === void 0 ? void 0 : _b.timeValueInMinutes} minutes. ${evaluation.noDataReason || ""}`.trim(),
+                },
+                value: undefined,
+            };
+        }
+        if (policy === NoDataPolicy.TreatAsZero) {
+            /*
+             * Zero for numeric series, and its boolean equivalent (false) for the
+             * online/timeout series, which EvaluateOverTime already maps 1 -> true.
+             */
+            const isBooleanSeries = data.criteriaFilter.checkOn === CheckOn.IsOnline ||
+                data.criteriaFilter.checkOn === CheckOn.IsRequestTimeout ||
+                data.criteriaFilter.checkOn === CheckOn.DnsIsOnline ||
+                data.criteriaFilter.checkOn === CheckOn.SnmpIsOnline ||
+                data.criteriaFilter.checkOn === CheckOn.ExternalStatusPageIsOnline;
+            return {
+                earlyReturn: null,
+                value: isBooleanSeries ? [false] : [0],
+            };
+        }
+        // NoDataPolicy.Ignore - the filter simply does not fire yet.
+        logger.debug(`Over time filter for ${data.criteriaFilter.checkOn} not evaluated: ${evaluation.noDataReason}`);
+        return {
+            earlyReturn: { result: null },
+            value: undefined,
+        };
+    }
+    /**
+     * Read the evaluation window and decide whether it can back the filter.
+     */
+    static async evaluateOverTime(data) {
+        const evaluateOverTimeOptions = data.criteriaFilter.evaluateOverTimeOptions;
+        if (!data.criteriaFilter.evaluateOverTime || !evaluateOverTimeOptions) {
+            return {
+                status: OverTimeEvaluationStatus.NotConfigured,
+                value: undefined,
+                sampleCount: 0,
+                noDataReason: null,
+                isReadError: false,
+            };
+        }
+        const metricName = MonitorMetricTypeUtil.getMonitorMetricTypeByCheckOnOrNull(data.criteriaFilter.checkOn);
+        if (!metricName) {
+            /*
+             * Nothing writes a series for this CheckOn, so there is no history to
+             * look back over. Say so instead of throwing - the callers used to
+             * swallow that throw and silently compare the instantaneous value.
+             */
+            return {
+                status: OverTimeEvaluationStatus.Unsupported,
+                value: undefined,
+                sampleCount: 0,
+                noDataReason: `${data.criteriaFilter.checkOn} is not recorded as a metric, so it cannot be evaluated over time.`,
+                isReadError: false,
+            };
+        }
+        /*
+         * The dashboard persists the dropdown's string value while Terraform and
+         * the API send a number, so coerce before doing arithmetic with it.
+         */
+        const windowInMinutes = Number(evaluateOverTimeOptions.timeValueInMinutes) || 0;
+        if (windowInMinutes <= 0) {
+            return {
+                status: OverTimeEvaluationStatus.InsufficientData,
+                value: undefined,
+                sampleCount: 0,
+                noDataReason: "No evaluation window configured.",
+                isReadError: false,
+            };
+        }
+        const now = OneUptimeDate.getCurrentDate();
+        const windowStart = OneUptimeDate.getSomeMinutesAgo(windowInMinutes);
+        let metricItems = [];
+        try {
+            const query = {
+                projectId: data.projectId,
+                time: new InBetween(windowStart, now),
+                primaryEntityId: data.monitorId,
+                name: metricName,
+            };
+            if (data.miscData) {
+                query.attributes = data.miscData;
             }
-            return item.value;
-        })
-            .filter((value) => {
-            return value !== undefined;
-        });
-        if (data.evaluateOverTimeOptions.evaluateOverTimeType ===
+            metricItems = await MetricService.findBy({
+                query: query,
+                limit: LIMIT_PER_PROJECT,
+                skip: 0,
+                props: {
+                    isRoot: true,
+                },
+                select: {
+                    value: true,
+                    time: true,
+                },
+            });
+        }
+        catch (err) {
+            logger.error(`Error in getting over time value for ${data.criteriaFilter.checkOn}`);
+            logger.error(err);
+            return {
+                status: OverTimeEvaluationStatus.InsufficientData,
+                value: undefined,
+                sampleCount: 0,
+                noDataReason: "The metric store could not be read.",
+                isReadError: true,
+            };
+        }
+        const sampleTimes = [];
+        const values = [];
+        for (const item of metricItems) {
+            if (item.value === undefined || item.value === null) {
+                continue;
+            }
+            if (data.criteriaFilter.checkOn === CheckOn.IsOnline ||
+                data.criteriaFilter.checkOn === CheckOn.IsRequestTimeout ||
+                data.criteriaFilter.checkOn === CheckOn.DnsIsOnline ||
+                data.criteriaFilter.checkOn === CheckOn.SnmpIsOnline ||
+                data.criteriaFilter.checkOn === CheckOn.ExternalStatusPageIsOnline) {
+                values.push(item.value === 1);
+            }
+            else {
+                values.push(item.value);
+            }
+            if (item.time) {
+                sampleTimes.push(OneUptimeDate.fromString(item.time));
+            }
+        }
+        if (values.length === 0) {
+            return {
+                status: OverTimeEvaluationStatus.InsufficientData,
+                value: undefined,
+                sampleCount: 0,
+                noDataReason: `No data was recorded for ${data.criteriaFilter.checkOn} in the last ${windowInMinutes} minutes.`,
+                isReadError: false,
+            };
+        }
+        /*
+         * "All Values" is the only evaluation type that claims something about
+         * the WHOLE window, so it is the only one that needs the whole window to
+         * be there. Array.every() is trivially true on a single sample, which is
+         * exactly how one bad probe used to satisfy
+         * "all values over the last 5 minutes".
+         *
+         * "Any Value" fires on a single breaching sample by design, and the
+         * aggregates (Average / Sum / Min / Max) are meaningful over a partial
+         * window, so they are left alone.
+         */
+        if (evaluateOverTimeOptions.evaluateOverTimeType ===
+            EvaluateOverTimeType.AllValues) {
+            const isCovered = this.isWindowCovered({
+                windowStart: windowStart,
+                windowEnd: now,
+                sampleTimes: sampleTimes,
+                monitoringInterval: data.monitoringInterval,
+            });
+            if (!isCovered) {
+                return {
+                    status: OverTimeEvaluationStatus.InsufficientData,
+                    value: undefined,
+                    sampleCount: values.length,
+                    noDataReason: `Only ${values.length} data point(s) recorded so far - not enough to cover the last ${windowInMinutes} minutes.`,
+                    isReadError: false,
+                };
+            }
+        }
+        if (evaluateOverTimeOptions.evaluateOverTimeType ===
             EvaluateOverTimeType.AnyValue ||
-            data.evaluateOverTimeOptions.evaluateOverTimeType ===
+            evaluateOverTimeOptions.evaluateOverTimeType ===
                 EvaluateOverTimeType.AllValues) {
             // if its any or all then return the values. Otherwise compute the value based on the type
-            return values;
+            return {
+                status: OverTimeEvaluationStatus.Evaluated,
+                value: values,
+                sampleCount: values.length,
+                noDataReason: null,
+                isReadError: false,
+            };
         }
-        return this.getValueByEvaluationType({
-            values: values,
-            evaluateOverTimeType: data.evaluateOverTimeOptions.evaluateOverTimeType,
+        return {
+            status: OverTimeEvaluationStatus.Evaluated,
+            value: this.getValueByEvaluationType({
+                values: values,
+                evaluateOverTimeType: evaluateOverTimeOptions.evaluateOverTimeType,
+            }),
+            sampleCount: values.length,
+            noDataReason: null,
+            isReadError: false,
+        };
+    }
+    /**
+     * Whether the samples actually reach back to the start of the window.
+     *
+     * A monitor that has only been running for a minute has one sample in a
+     * five minute window. That sample says nothing about the other four
+     * minutes, so "all values over the last 5 minutes" must not be considered
+     * satisfied by it.
+     *
+     * The check is expressed in time rather than in sample count so it is
+     * immune to a probe skipping a beat, to several probes writing into the
+     * same series, and to a sample landing a fraction of a second outside the
+     * window.
+     */
+    static isWindowCovered(data) {
+        if (data.sampleTimes.length === 0) {
+            return false;
+        }
+        const sortedTimes = data.sampleTimes
+            .map((time) => {
+            return time.getTime();
+        })
+            .filter((time) => {
+            return !isNaN(time);
+        })
+            .sort((a, b) => {
+            return a - b;
         });
+        if (sortedTimes.length === 0) {
+            /*
+             * Timestamps were unreadable. Fall back to requiring more than one
+             * sample so a brand new monitor still cannot satisfy the window off a
+             * single reading.
+             */
+            return data.sampleTimes.length > 1;
+        }
+        const intervalInSeconds = this.getSamplingIntervalInSeconds({
+            monitoringInterval: data.monitoringInterval,
+            sortedSampleTimes: sortedTimes,
+        });
+        if (intervalInSeconds === null) {
+            /*
+             * A single sample and no configured interval - there is no way to tell
+             * whether the monitor is polled once an hour or once a second, so the
+             * window cannot be called covered.
+             */
+            return false;
+        }
+        const oldestSampleMs = sortedTimes[0];
+        const newestSampleMs = sortedTimes[sortedTimes.length - 1];
+        const allowedGapMs = intervalInSeconds * 1000 * this.WINDOW_COVERAGE_TOLERANCE_FACTOR;
+        const leadingGapMs = oldestSampleMs - data.windowStart.getTime();
+        /*
+         * The trailing edge matters as much as the leading one: samples that
+         * stop part way through the window say nothing about the minutes since,
+         * so "all values over the last N minutes" must not be satisfied by
+         * stale data either.
+         */
+        const trailingGapMs = data.windowEnd.getTime() - newestSampleMs;
+        return leadingGapMs <= allowedGapMs && trailingGapMs <= allowedGapMs;
+    }
+    /**
+     * How far apart consecutive samples are expected to be, in seconds.
+     *
+     * The monitor's own schedule is authoritative when we have it. Otherwise
+     * infer it from the data: the widest gap actually observed between
+     * consecutive samples is the longest wait the window has demonstrated, so
+     * it is the safest estimate of the cadence.
+     */
+    static getSamplingIntervalInSeconds(data) {
+        const configuredIntervalInSeconds = CronTab.getIntervalInSeconds(data.monitoringInterval);
+        if (configuredIntervalInSeconds !== null) {
+            return configuredIntervalInSeconds;
+        }
+        if (data.sortedSampleTimes.length < 2) {
+            return null;
+        }
+        let widestGapInSeconds = 0;
+        for (let i = 1; i < data.sortedSampleTimes.length; i++) {
+            const gapInSeconds = (data.sortedSampleTimes[i] - data.sortedSampleTimes[i - 1]) / 1000;
+            if (gapInSeconds > widestGapInSeconds) {
+                widestGapInSeconds = gapInSeconds;
+            }
+        }
+        if (widestGapInSeconds <= 0) {
+            return null;
+        }
+        return widestGapInSeconds;
     }
     static getValueByEvaluationType(data) {
         switch (data.evaluateOverTimeType) {
@@ -96,10 +411,23 @@ export default class EvaluateOverTime {
         return this.getSum(values) / values.length;
     }
 }
+/**
+ * Multiple of the monitor's polling interval that either end of the window
+ * is allowed to sit away from the nearest sample before the window counts
+ * as "not covered yet".
+ *
+ * One whole interval is the theoretical minimum (a window that starts
+ * mid-cycle legitimately has its first sample up to one interval in). The
+ * extra half absorbs scheduling jitter - and the lag between a sample
+ * being written and being readable - so a monitor does not flip between
+ * "covered" and "not covered" on adjacent checks.
+ */
+EvaluateOverTime.WINDOW_COVERAGE_TOLERANCE_FACTOR = 1.5;
+export default EvaluateOverTime;
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
-], EvaluateOverTime, "getValueOverTime", null);
+], EvaluateOverTime, "evaluateOverTime", null);
 //# sourceMappingURL=EvaluateOverTime.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"EvaluateOverTime.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/EvaluateOverTime.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,aAAa,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EACL,OAAO,EAEP,oBAAoB,GACrB,MAAM,0CAA0C,CAAC;AAGlD,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAChF,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,SAAS,MAAM,0CAA0C,CAAC;AAEjE,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEf,AAAb,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAMpC;QACC,uBAAuB;QAEvB,MAAM,eAAe,GAAS,aAAa,CAAC,iBAAiB,CAC3D,IAAI,CAAC,uBAAuB,CAAC,kBAAmB,CACjD,CAAC;QAEF,4BAA4B;QAE5B,MAAM,GAAG,GAAS,aAAa,CAAC,cAAc,EAAE,CAAC;QAEjD,MAAM,KAAK,GAAkB;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;YACzC,eAAe,EAAE,IAAI,CAAC,SAAS;YAC/B,IAAI,EAAE,qBAAqB,CAAC,4BAA4B,CAAC,IAAI,CAAC,UAAU,CAAC;SAC1E,CAAC;QAEF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,CAAC;QAED,MAAM,mBAAmB,GAAkB,MAAM,aAAa,CAAC,MAAM,CAAC;YACpE,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,iBAAiB;YACxB,IAAI,EAAE,CAAC;YACP,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACN,KAAK,EAAE,IAAI;aACZ;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAA4B,mBAAmB;aACxD,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;YACpB,IACE,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,QAAQ;gBACpC,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,gBAAgB,EAC5C,CAAC;gBACD,OAAO,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC;YAC1B,CAAC;YAED,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,KAAmC,EAAE,EAAE;YAC9C,OAAO,KAAK,KAAK,SAAS,CAAC;QAC7B,CAAC,CAA4B,CAAC;QAEhC,IACE,IAAI,CAAC,uBAAuB,CAAC,oBAAoB;YAC/C,oBAAoB,CAAC,QAAQ;YAC/B,IAAI,CAAC,uBAAuB,CAAC,oBAAoB;gBAC/C,oBAAoB,CAAC,SAAS,EAChC,CAAC;YACD,0FAA0F;YAC1F,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC;YACnC,MAAM,EAAE,MAAuB;YAC/B,oBAAoB,EAAE,IAAI,CAAC,uBAAuB,CAAC,oBAAqB;SACzE,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,wBAAwB,CAAC,IAGvC;QACC,QAAQ,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClC,KAAK,oBAAoB,CAAC,OAAO;gBAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtC,KAAK,oBAAoB,CAAC,YAAY;gBACpC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC,KAAK,oBAAoB,CAAC,YAAY;gBACpC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC,KAAK,oBAAoB,CAAC,GAAG;gBAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC;gBACE,OAAO,CAAC,CAAC;QACb,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,MAAM,CAAC,MAAgB;QACpC,wBAAwB;QACxB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;YAC5C,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC;IAEO,MAAM,CAAC,MAAM,CAAC,MAAgB;QACpC,gBAAgB;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC7B,CAAC;IAEO,MAAM,CAAC,MAAM,CAAC,MAAgB;QACpC,gBAAgB;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC7B,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,MAAgB;QACxC,oBAAoB;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7C,CAAC;CACF;AA9GqB;IADnB,WAAW,EAAE;;;;8CAsEb"}
+{"version":3,"file":"EvaluateOverTime.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/EvaluateOverTime.ts"],"names":[],"mappings":"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"}

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

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

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) {