npm - @oneuptime/common - Versions diffs - 12.0.31 → 12.0.33 - Mend

@oneuptime/common 12.0.31 → 12.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (747) hide show

package/build/dist/Server/Utils/Logger.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../Server/Utils/Logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,kBAAuC,MAAM,aAAa,CAAC;AAClE,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,SAAS,MAAM,iCAAiC,CAAC;AAExD,OAAO,cAAc,MAAM,yBAAyB,CAAC;AACrD,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,eAAe,EACf,cAAc,GACf,MAAM,gBAAgB,CAAC;~~AAuBxB~~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~~YAE~~/C,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEpB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAE3B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,~~EAAE~~,UAAU,CAAC,CAAC;~~QAC5D~~,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,OAAgB,EAAE,UAA0B;QAC7D,MAAM,QAAQ,GAAmB,IAAI,CAAC,WAAW,EAAE,CAAC;QAEpD,IACE,QAAQ,KAAK,cAAc,CAAC,KAAK;YACjC,QAAQ,KAAK,cAAc,CAAC,IAAI;YAChC,QAAQ,KAAK,cAAc,CAAC,IAAI,EAChC,CAAC;YACD,MAAM,IAAI,GAAY,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAE/C,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEnB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAE1B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAgB,EAAE,UAA0B;QAC9D,MAAM,QAAQ,GAAmB,IAAI,CAAC,WAAW,EAAE,CAAC;QAEpD,IAAI,QAAQ,KAAK,cAAc,CAAC,KAAK,EAAE,CAAC;YACtC,MAAM,IAAI,GAAY,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAE/C,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEpB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAE3B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,IAIlB;QACC,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAC1B,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,UAAU,CAChB,CAAC;IACJ,CAAC;IAED,oDAAoD;IAC5C,MAAM,CAAC,YAAY,CACzB,IAAa,EACb,cAA8B,EAC9B,UAAsC;QAEtC,IAAI,CAAC;YACH,MAAM,MAAM,GAA2B,kBAAkB,CAAC,SAAS,EAAE,CAAC;YAEtE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,OAAO;YACT,CAAC;YAED;;;;eAIG;YACH,MAAM,gBAAgB,mCACjB,gBAAgB,CAAC,aAAa,EAAE,GAChC,CAAC,UAAU,IAAI,EAAE,CAAC,CACtB,CAAC;YAEF,MAAM,mBAAmB,GAET,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YAE1D,MAAM,CAAC,IAAI,iBACT,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EACtC,cAAc,EAAE,cAAc,IAC3B,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACnE,CAAC;QACL,CAAC;QAAC,WAAM,CAAC;YACP,qCAAqC;QACvC,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAgB,EAAE,UAA0B;QAC9D,MAAM,QAAQ,GAAmB,IAAI,CAAC,WAAW,EAAE,CAAC;QAEpD,IAAI,QAAQ,KAAK,cAAc,CAAC,KAAK,EAAE,CAAC;YACtC,MAAM,IAAI,GAAY,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAE/C,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEpB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAE3B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;;~~AAlSD~~;;;;;;GAMG;AACY,iBAAU,GAA0B,EAAE,CAAC;AAC9B,oBAAa,GAAW,IAAI,CAAC;AAC7B,yBAAkB,GAAW,GAAG,CAAC;AACjC,gCAAyB,GAAW,IAAI,CAAC;eAX9C,MAAM"}
1	+ {"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../Server/Utils/Logger.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/Criteria/DatabaseMonitorCriteria.js ADDED Viewed

@@ -0,0 +1,141 @@
+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 CompareCriteria from "./CompareCriteria";
+import EvaluateOverTime from "./EvaluateOverTime";
+import { CheckOn, } from "../../../../Types/Monitor/CriteriaFilter";
+import { getDatabaseMetricByMetricType, } from "../../../../Types/Monitor/DatabaseMetricCatalog";
+import CaptureSpan from "../../Telemetry/CaptureSpan";
+export default class DatabaseMonitorCriteria {
+    static async isMonitorInstanceCriteriaFilterMet(input) {
+        var _a, _b, _c;
+        const dataToProcess = input.dataToProcess;
+        const databaseResponse = dataToProcess.databaseMonitorResponse;
+        /*
+         * Resolved once for every CheckOn. Database Metric filters name their
+         * series in databaseMonitorOptions.metricType rather than in the CheckOn,
+         * which is why EvaluateOverTime resolves the series from the whole filter.
+         */
+        const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
+            projectId: dataToProcess.projectId,
+            monitorId: input.dataToProcess.monitorId,
+            criteriaFilter: input.criteriaFilter,
+            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. That fallback is what let "all values over the
+         * last N minutes" fire off a single bad reading.
+         *
+         * "Database Is Online" is exempt, mirroring the server monitor. An
+         * unreachable database is the one signal that must always reach its
+         * criteria: a monitor whose window is still filling, or whose metric
+         * write has not caught up, would otherwise be unable to go offline at
+         * all while the dashboard shows the connection failing.
+         */
+        if (overTime.earlyReturn &&
+            input.criteriaFilter.checkOn !== CheckOn.DatabaseIsOnline) {
+            return overTime.earlyReturn.result;
+        }
+        const overTimeValue = overTime.value;
+        // Could the probe connect and run the baseline probe query?
+        if (input.criteriaFilter.checkOn === CheckOn.DatabaseIsOnline) {
+            const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : dataToProcess.isOnline;
+            return CompareCriteria.compareCriteriaBoolean({
+                value: currentIsOnline,
+                criteriaFilter: input.criteriaFilter,
+            });
+        }
+        /*
+         * One branch for all of the catalog's series: the filter names the one it
+         * reads in databaseMonitorOptions.metricType, exactly as disk usage names
+         * a mount and an SNMP value names an OID.
+         *
+         * Thresholds are whole numbers - CompareCriteria.convertToNumber parses
+         * with parseInt, so "99.5" is compared as 99. Every catalog unit is
+         * chosen so an integral threshold is the natural one to type.
+         */
+        if (input.criteriaFilter.checkOn === CheckOn.DatabaseMetric) {
+            const metricType = (_b = input.criteriaFilter.databaseMonitorOptions) === null || _b === void 0 ? void 0 : _b.metricType;
+            if (!metricType) {
+                return null;
+            }
+            const definition = getDatabaseMetricByMetricType(metricType);
+            if (!definition) {
+                return null;
+            }
+            const value = databaseResponse === null || databaseResponse === void 0 ? void 0 : databaseResponse.metrics[metricType];
+            /*
+             * The metric was not collected on this check - the engine cannot report
+             * it, the monitoring login is missing the grant its group needs, or the
+             * group timed out. Absent is not zero, and a criteria that cannot see a
+             * value must never claim one breached: a revoked grant would otherwise
+             * raise an incident about a database that is perfectly healthy.
+             * CheckOn.DatabaseCollectionError is how an operator alerts on lost
+             * visibility.
+             */
+            if (value === undefined || value === null) {
+                return null;
+            }
+            const threshold = CompareCriteria.convertToNumber(input.criteriaFilter.value);
+            if (threshold === null) {
+                return null;
+            }
+            const result = CompareCriteria.compareCriteriaNumbers({
+                value: (_c = overTimeValue) !== null && _c !== void 0 ? _c : value,
+                threshold: threshold,
+                criteriaFilter: input.criteriaFilter,
+                unit: definition.unit || undefined,
+            });
+            if (result) {
+                return `${definition.friendlyName} - ${result}`;
+            }
+            return null;
+        }
+        // Groups that could not be collected, as one operator-facing line each.
+        if (input.criteriaFilter.checkOn === CheckOn.DatabaseCollectionError) {
+            const collectionIssues = ((databaseResponse === null || databaseResponse === void 0 ? void 0 : databaseResponse.unavailableGroups) || [])
+                .map((status) => {
+                return `${status.group}: ${status.message}`;
+            })
+                .join("; ");
+            /*
+             * compareEmptyAndNotEmpty tests for null/undefined, and an empty string
+             * would read as "not empty" - so a check with nothing to report has to
+             * arrive as undefined for "Is Empty" to mean "collection was clean".
+             */
+            const emptyNotEmptyResult = CompareCriteria.compareEmptyAndNotEmpty({
+                value: collectionIssues || undefined,
+                criteriaFilter: input.criteriaFilter,
+            });
+            if (emptyNotEmptyResult) {
+                return emptyNotEmptyResult;
+            }
+            if (input.criteriaFilter.value !== null &&
+                input.criteriaFilter.value !== undefined &&
+                collectionIssues) {
+                return CompareCriteria.compareCriteriaStrings({
+                    value: collectionIssues,
+                    threshold: input.criteriaFilter.value.toString(),
+                    criteriaFilter: input.criteriaFilter,
+                });
+            }
+            return null;
+        }
+        return null;
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], DatabaseMonitorCriteria, "isMonitorInstanceCriteriaFilterMet", null);
+//# sourceMappingURL=DatabaseMonitorCriteria.js.map

package/build/dist/Server/Utils/Monitor/Criteria/DatabaseMonitorCriteria.js.map ADDED Viewed

@@ -0,0 +1 @@

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

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

@@ -115,6 +115,7 @@ class EvaluateOverTime {
                 data.criteriaFilter.checkOn === CheckOn.IsRequestTimeout ||
                 data.criteriaFilter.checkOn === CheckOn.DnsIsOnline ||
                 data.criteriaFilter.checkOn === CheckOn.SnmpIsOnline ||
+                data.criteriaFilter.checkOn === CheckOn.DatabaseIsOnline ||
                 data.criteriaFilter.checkOn === CheckOn.ExternalStatusPageIsOnline;
             return {
                 earlyReturn: null,
@@ -142,7 +143,13 @@ class EvaluateOverTime {
                 isReadError: false,
             };
         }
-        const metricName = MonitorMetricTypeUtil.getMonitorMetricTypeByCheckOnOrNull(data.criteriaFilter.checkOn);
+        /*
+         * Resolved from the whole filter, not from the CheckOn alone: a Database
+         * Metric filter names its series in databaseMonitorOptions.metricType, so
+         * the CheckOn-only lookup would return null for every one of them and
+         * silently downgrade the filter to an instantaneous comparison.
+         */
+        const metricName = MonitorMetricTypeUtil.getMonitorMetricTypeByCriteriaFilterOrNull(data.criteriaFilter);
         if (!metricName) {
             /*
              * Nothing writes a series for this CheckOn, so there is no history to

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

	@@ -1 +1 @@
1	- {"version":3,"file":"EvaluateOverTime.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/EvaluateOverTime.ts"],"names":[],"mappings":"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~~mCAAmC~~,~~CACvD~~,IAAI,CAAC,cAAc,~~CAAC~~,~~OAAO,CAC5B,~~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~~AAheD~~;;;;;;;;;;GAUG;AACqB,iDAAgC,GAAW,GAAG,CAAC;eAZpD,gBAAgB;~~AAgIf~~;IADnB,WAAW,EAAE;;;;~~8CAqMb~~"}
1	+ {"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/SnmpMonitorCriteria.js CHANGED Viewed

@@ -18,6 +18,19 @@ import MetricBaselineService, { MetricBaselineService as MetricBaselineServiceCl
 import CaptureSpan from "../../Telemetry/CaptureSpan";
 import logger from "../../Logger";
 export default class SnmpMonitorCriteria {
+    /*
+     * Every CheckOn whose value comes out of the SNMP walk. Reachability
+     * (SnmpIsOnline) and traps are the two that do not.
+     */
+    static isWalkDependentCheckOn(checkOn) {
+        return (checkOn === CheckOn.SnmpWalkIsSucceeding ||
+            checkOn === CheckOn.SnmpResponseTime ||
+            checkOn === CheckOn.SnmpOidExists ||
+            checkOn === CheckOn.SnmpOidValue ||
+            checkOn === CheckOn.SnmpInterfaceIsDown ||
+            checkOn === CheckOn.SnmpInterfaceUtilizationPercent ||
+            checkOn === CheckOn.SnmpInterfaceErrorsPerSecond);
+    }
     /*
      * Interface scope for the interface CheckOns: when the criteria carries
      * snmpMonitorOptions.interfaceName, only interfaces whose name or alias
@@ -184,6 +197,24 @@ export default class SnmpMonitorCriteria {
             // Trap events never evaluate check-based criteria.
             return null;
         }
+        /*
+         * No walk, no verdict. A device without usable SNMP credentials is only
+         * pinged, and the walk pipeline hands its monitors a response with
+         * `snmpResponse` undefined - never a synthesized failure. Every criterion
+         * that reads the walk is therefore NOT EVALUATED on such a poll (null),
+         * rather than breaching: "OID Exists is False" must not raise an
+         * incident on a device nobody ever asked an OID of, and "Walk Is
+         * Succeeding is False" must mean "attempted and failed". Reachability
+         * (SnmpIsOnline) is read from the top-level isOnline further down and
+         * is unaffected.
+         *
+         * This runs before the over-time lookup on purpose: a window of stored
+         * walk-time samples says nothing about a poll that walked nothing.
+         */
+        if (SnmpMonitorCriteria.isWalkDependentCheckOn(input.criteriaFilter.checkOn) &&
+            !snmpResponse) {
+            return null;
+        }
         const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
             projectId: input.dataToProcess.projectId,
             monitorId: input.dataToProcess.monitorId,
@@ -202,7 +233,12 @@ export default class SnmpMonitorCriteria {
             return overTime.earlyReturn.result;
         }
         const overTimeValue = overTime.value;
-        // Check if SNMP device is online
+        /*
+         * Device reachability: the top-level isOnline is "answered ping OR the
+         * walk succeeded", stamped by the walk pipeline - the same verdict the
+         * device list's status pill shows. Deliberately not the walk's own
+         * isOnline, which the next CheckOn covers.
+         */
         if (input.criteriaFilter.checkOn === CheckOn.SnmpIsOnline) {
             const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : input.dataToProcess.isOnline;
             return CompareCriteria.compareCriteriaBoolean({
@@ -210,6 +246,20 @@ export default class SnmpMonitorCriteria {
                 criteriaFilter: input.criteriaFilter,
             });
         }
+        /*
+         * The walk itself. Gated above: a poll with no walk returns null before
+         * reaching here, so `snmpResponse` is present and "False" genuinely
+         * means the walk was attempted and failed.
+         */
+        if (input.criteriaFilter.checkOn === CheckOn.SnmpWalkIsSucceeding) {
+            if (!snmpResponse) {
+                return null;
+            }
+            return CompareCriteria.compareCriteriaBoolean({
+                value: snmpResponse.isOnline === true,
+                criteriaFilter: input.criteriaFilter,
+            });
+        }
         // Check SNMP response time
         if (input.criteriaFilter.checkOn === CheckOn.SnmpResponseTime) {
             threshold = CompareCriteria.convertToNumber(threshold);

package/build/dist/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.js.map CHANGED Viewed

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

package/build/dist/Server/Utils/Monitor/MonitorCriteriaDataExtractor.js CHANGED Viewed

@@ -68,6 +68,13 @@ export default class MonitorCriteriaDataExtractor {
         }
         return null;
     }
+    static getDatabaseMonitorResponse(dataToProcess) {
+        const probeResponse = MonitorCriteriaDataExtractor.getProbeMonitorResponse(dataToProcess);
+        if (probeResponse === null || probeResponse === void 0 ? void 0 : probeResponse.databaseMonitorResponse) {
+            return probeResponse.databaseMonitorResponse;
+        }
+        return null;
+    }
     static extractMetricValues(input) {
         var _a, _b, _c, _d, _e;
         const metricResponse = MonitorCriteriaDataExtractor.getMetricMonitorResponse(input.dataToProcess);

package/build/dist/Server/Utils/Monitor/MonitorCriteriaDataExtractor.js.map CHANGED Viewed

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

package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js CHANGED Viewed

@@ -21,6 +21,7 @@ import DnsMonitorCriteria from "./Criteria/DnsMonitorCriteria";
 import DomainMonitorCriteria from "./Criteria/DomainMonitorCriteria";
 import DnssecMonitorCriteria from "./Criteria/DnssecMonitorCriteria";
 import SqlMonitorCriteria from "./Criteria/SqlMonitorCriteria";
+import DatabaseMonitorCriteria from "./Criteria/DatabaseMonitorCriteria";
 import ExternalStatusPageMonitorCriteria from "./Criteria/ExternalStatusPageMonitorCriteria";
 import MonitorCriteriaMessageBuilder from "./MonitorCriteriaMessageBuilder";
 import MonitorCriteriaDataExtractor from "./MonitorCriteriaDataExtractor";
@@ -628,6 +629,32 @@ ${contextBlock}
                     isOnline: input.dataToProcess.isOnline,
                 };
             }
+            if (input.monitor.monitorType === MonitorType.Database) {
+                const databaseResponse = input.dataToProcess.databaseMonitorResponse;
+                /*
+                 * metrics is exposed raw, keyed by series name, so an expression can
+                 * read any of the catalog's series without a variable per metric:
+                 * {{metrics['oneuptime.monitor.database.connections.used.percent']}} > 90
+                 *
+                 * Connection details are deliberately absent - host, username and
+                 * password never travel into an expression sandbox.
+                 */
+                storageMap = {
+                    isOnline: input.dataToProcess.isOnline,
+                    engineVersion: databaseResponse === null || databaseResponse === void 0 ? void 0 : databaseResponse.engineVersion,
+                    connectionError: databaseResponse === null || databaseResponse === void 0 ? void 0 : databaseResponse.connectionError,
+                    collectedGroups: databaseResponse === null || databaseResponse === void 0 ? void 0 : databaseResponse.collectedGroups,
+                    unavailableGroups: ((databaseResponse === null || databaseResponse === void 0 ? void 0 : databaseResponse.unavailableGroups) || []).map((status) => {
+                        return {
+                            group: status.group,
+                            reason: status.reason,
+                            message: status.message,
+                            remediation: status.remediation,
+                        };
+                    }),
+                    metrics: databaseResponse === null || databaseResponse === void 0 ? void 0 : databaseResponse.metrics,
+                };
+            }
             let expression = input.criteriaFilter.value;
             expression = VMUtil.replaceValueInPlace(storageMap, expression, false);
             const code = `return Boolean(${expression});`;
@@ -850,6 +877,16 @@ ${contextBlock}
                 return sqlMonitorResult;
             }
         }
+        if (input.monitor.monitorType === MonitorType.Database) {
+            const databaseMonitorResult = await DatabaseMonitorCriteria.isMonitorInstanceCriteriaFilterMet({
+                dataToProcess: input.dataToProcess,
+                criteriaFilter: input.criteriaFilter,
+                monitoringInterval: input.monitor.monitoringInterval,
+            });
+            if (databaseMonitorResult) {
+                return databaseMonitorResult;
+            }
+        }
         if (input.monitor.monitorType === MonitorType.ExternalStatusPage) {
             const externalStatusPageResult = await ExternalStatusPageMonitorCriteria.isMonitorInstanceCriteriaFilterMet({
                 dataToProcess: input.dataToProcess,