@oneuptime/common 12.0.25 → 12.0.27

package/build/dist/Server/Utils/Monitor/NetworkInventoryUtil.js

@@ -1,8 +1,6 @@
-import NetworkInterface from "../../../Models/DatabaseModels/NetworkInterface";
 import NetworkDeviceService from "../../Services/NetworkDeviceService";
 import NetworkEndpointService from "../../Services/NetworkEndpointService";
 import NetworkInterfaceService from "../../Services/NetworkInterfaceService";
-import LIMIT_MAX from "../../../Types/Database/LimitMax";
 import EndpointAttachmentUtil from "../../../Utils/Monitor/EndpointAttachmentUtil";
 import SnmpVendorTemplateUtil from "../../../Types/Monitor/SnmpMonitor/SnmpVendorTemplate";
 import OneUptimeDate from "../../../Types/Date";
@@ -20,7 +18,7 @@ import logger from "../Logger";
  */
 export default class NetworkInventoryUtil {
     static async updateFromWalk(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g;
         const deviceId = data.deviceId;
         /*
          * Confirm the device belongs to the given project before writing
@@ -183,95 +181,24 @@ export default class NetworkInventoryUtil {
                 });
             }
             if (walkedInterfaces.length > 0) {
-                // --- Interface upsert ---
-                const existingInterfaces = await NetworkInterfaceService.findBy({
-                    query: {
-                        networkDeviceId: deviceId,
-                    },
-                    select: {
-                        _id: true,
-                        interfaceIndex: true,
-                        isMonitored: true,
-                    },
-                    limit: LIMIT_MAX,
-                    skip: 0,
-                    props: {
-                        isRoot: true,
-                    },
+                /*
+                 * --- Interface upsert ---
+                 * One SELECT plus one batched INSERT/UPDATE per 500 rows, inside the
+                 * service. This was a per-interface create()/updateOneById() loop —
+                 * 101 statements for a 50-port switch, because _updateBy SELECTs
+                 * before every UPDATE — which is a hard wall once an operator raises
+                 * DEVICE_POLL_FETCH_LIMIT and the fleet actually polls on its
+                 * configured interval. Interfaces that exist in inventory but were
+                 * NOT in this walk are still left exactly as they were: nothing here
+                 * deletes or ages them out.
+                 */
+                const upsertResult = await NetworkInterfaceService.upsertWalkedInterfaces({
+                    projectId: data.projectId,
+                    deviceId: deviceId,
+                    walkedInterfaces: walkedInterfaces,
+                    now: now,
                 });
-                const existingByIndex = new Map();
-                for (const existing of existingInterfaces) {
-                    if (existing.interfaceIndex !== undefined) {
-                        existingByIndex.set(existing.interfaceIndex, existing);
-                    }
-                }
-                const unmonitoredIndexes = new Set();
-                for (const walked of walkedInterfaces) {
-                    const existing = existingByIndex.get(walked.interfaceIndex);
-                    if (existing && existing.isMonitored === false) {
-                        unmonitoredIndexes.add(walked.interfaceIndex);
-                    }
-                    const interfaceData = {
-                        name: (walked.name || "").substring(0, 100),
-                        alias: walked.alias ? walked.alias.substring(0, 100) : null,
-                        macAddress: walked.macAddress
-                            ? walked.macAddress.substring(0, 100)
-                            : null,
-                        interfaceType: (_h = walked.interfaceType) !== null && _h !== void 0 ? _h : null,
-                        isOperationallyUp: walked.isOperationallyUp,
-                        isAdministrativelyUp: walked.isAdministrativelyUp,
-                        speedInMbps: walked.speedInBitsPerSecond !== undefined
-                            ? walked.speedInBitsPerSecond / 1000000
-                            : null,
-                        inRateMbps: walked.inBitsPerSecond !== undefined
-                            ? Math.round((walked.inBitsPerSecond / 1000000) * 1000) / 1000
-                            : null,
-                        outRateMbps: walked.outBitsPerSecond !== undefined
-                            ? Math.round((walked.outBitsPerSecond / 1000000) * 1000) / 1000
-                            : null,
-                        utilizationPercent: (_j = walked.utilizationPercent) !== null && _j !== void 0 ? _j : null,
-                        errorsPerSecond: (_k = walked.errorsPerSecond) !== null && _k !== void 0 ? _k : null,
-                        lastSeenAt: now,
-                    };
-                    if (existing && existing.id) {
-                        await NetworkInterfaceService.updateOneById({
-                            id: existing.id,
-                            data: interfaceData,
-                            props: {
-                                isRoot: true,
-                            },
-                        });
-                    }
-                    else {
-                        const newInterface = new NetworkInterface();
-                        newInterface.projectId = data.projectId;
-                        newInterface.networkDeviceId = deviceId;
-                        newInterface.interfaceIndex = walked.interfaceIndex;
-                        newInterface.name = (walked.name || "").substring(0, 100);
-                        if (walked.alias) {
-                            newInterface.alias = walked.alias.substring(0, 100);
-                        }
-                        if (walked.macAddress) {
-                            newInterface.macAddress = walked.macAddress.substring(0, 100);
-                        }
-                        if (walked.interfaceType !== undefined) {
-                            newInterface.interfaceType = walked.interfaceType;
-                        }
-                        newInterface.isMonitored = true;
-                        newInterface.isOperationallyUp = walked.isOperationallyUp;
-                        newInterface.isAdministrativelyUp = walked.isAdministrativelyUp;
-                        if (walked.speedInBitsPerSecond !== undefined) {
-                            newInterface.speedInMbps = walked.speedInBitsPerSecond / 1000000;
-                        }
-                        newInterface.lastSeenAt = now;
-                        await NetworkInterfaceService.create({
-                            data: newInterface,
-                            props: {
-                                isRoot: true,
-                            },
-                        });
-                    }
-                }
+                const unmonitoredIndexes = new Set(upsertResult.unmonitoredInterfaceIndexes);
                 /*
                  * Prune the in-flight response to monitored interfaces only, so
                  * criteria (interface down / utilization / errors) and per-interface

package/build/dist/Server/Utils/Monitor/NetworkInventoryUtil.js.map

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

package/build/dist/Server/Utils/Monitor/PerEntityCriteriaFanOut.js

@@ -0,0 +1,194 @@
+import { CheckOn } from "../../../Types/Monitor/CriteriaFilter";
+import MonitorCriteriaInstance from "../../../Types/Monitor/MonitorCriteriaInstance";
+import MetricSeriesFingerprint from "../../../Utils/Metrics/MetricSeriesFingerprint";
+import logger from "../Logger";
+/**
+ * The value a user types into "Disk Path" or "Interface Name" to mean
+ * "every one of them, and raise a separate alert for each".
+ *
+ * Metric-backed monitors express the same idea with a Group By
+ * attribute. The non-metric monitor types have no group-by concept —
+ * their criteria name ONE entity — so this is how they opt in. Leaving
+ * the field at its existing value keeps today's behaviour exactly: one
+ * alert for the whole monitor, naming whichever entity the criteria was
+ * pinned to.
+ */
+export const AllEntitiesWildcard = "*";
+/**
+ * A hard ceiling on how many entities one criteria may fan out to.
+ *
+ * Each entity is a full criteria re-evaluation, and an
+ * "evaluate over time" filter makes each of those a query. A switch
+ * with hundreds of ports would otherwise turn one monitor tick into
+ * hundreds of round trips and hundreds of alerts. Truncation is logged
+ * rather than silent — a monitor that quietly covers only part of its
+ * fleet reads exactly like one that covers all of it.
+ */
+export const MaxEntitiesPerCriteria = 100;
+export default class PerEntityCriteriaFanOut {
+    static isWildcard(value) {
+        return (value || "").trim() === AllEntitiesWildcard;
+    }
+    /**
+     * Re-evaluate one criteria once per entity and return a match for
+     * every entity that satisfies it on its own.
+     *
+     * Deliberately reuses the caller's full criteria evaluation rather
+     * than reimplementing threshold comparison per entity: filter
+     * conditions (All/Any), evaluate-over-time windows, no-data policies
+     * and every filter type keep meaning exactly what they mean on the
+     * whole-monitor path.
+     */
+    static async collectMatches(input) {
+        var _a, _b;
+        const criteriaId = (_a = input.criteriaInstance.data) === null || _a === void 0 ? void 0 : _a.id;
+        if (!criteriaId || input.entities.length === 0) {
+            return [];
+        }
+        let entities = input.entities;
+        if (entities.length > MaxEntitiesPerCriteria) {
+            logger.warn(`${input.monitorId} - Criteria "${(_b = input.criteriaInstance.data) === null || _b === void 0 ? void 0 : _b.name}" matched ${entities.length} entities, which is above the ${MaxEntitiesPerCriteria} per-criteria cap. Only the first ${MaxEntitiesPerCriteria} are evaluated; narrow the criteria to cover the rest.`);
+            entities = entities.slice(0, MaxEntitiesPerCriteria);
+        }
+        const matches = [];
+        for (const entity of entities) {
+            const narrowed = PerEntityCriteriaFanOut.narrowCriteriaInstance({
+                criteriaInstance: input.criteriaInstance,
+                entity,
+            });
+            const rootCause = await input.evaluateNarrowedCriteria(narrowed);
+            if (!rootCause) {
+                continue;
+            }
+            matches.push({
+                criteriaMetId: criteriaId,
+                fingerprint: MetricSeriesFingerprint.computeFingerprint(entity.labels),
+                labels: entity.labels,
+                rootCause: rootCause,
+            });
+        }
+        return matches;
+    }
+    /**
+     * A copy of the criteria whose filters address exactly one entity.
+     *
+     * The copy is deliberately shallow-per-filter: the evaluator writes
+     * transient state onto the filter objects it evaluates (metric
+     * context, resolved thresholds), and that must not leak back onto the
+     * monitor's stored criteria or bleed between entities.
+     */
+    static narrowCriteriaInstance(input) {
+        var _a;
+        const narrowed = new MonitorCriteriaInstance();
+        narrowed.data = Object.assign(Object.assign({}, input.criteriaInstance.data), { filters: (((_a = input.criteriaInstance.data) === null || _a === void 0 ? void 0 : _a.filters) || []).map((filter) => {
+                return input.entity.narrowFilter(filter);
+            }) });
+        return narrowed;
+    }
+    /**
+     * The disks a Server monitor's criteria should fan out over: every
+     * disk the agent reported, but only when the criteria actually asks
+     * for all of them.
+     *
+     * Returns an empty array — meaning "not a per-disk criteria, take the
+     * whole-monitor path" — when no filter uses the wildcard.
+     */
+    static getServerDiskEntities(input) {
+        var _a;
+        if (!PerEntityCriteriaFanOut.isServerDiskFanOutConfigured(input.criteriaInstance)) {
+            return [];
+        }
+        const serverResponse = input.dataToProcess;
+        const diskMetrics = ((_a = serverResponse.basicInfrastructureMetrics) === null || _a === void 0 ? void 0 : _a.diskMetrics) || [];
+        const seenDiskPaths = new Set();
+        const entities = [];
+        for (const diskMetric of diskMetrics) {
+            const diskPath = (diskMetric.diskPath || "").trim();
+            if (!diskPath || seenDiskPaths.has(diskPath)) {
+                continue;
+            }
+            seenDiskPaths.add(diskPath);
+            entities.push({
+                labels: { diskPath: diskPath },
+                narrowFilter: (filter) => {
+                    var _a;
+                    if (filter.checkOn !== CheckOn.DiskUsagePercent ||
+                        !PerEntityCriteriaFanOut.isWildcard((_a = filter.serverMonitorOptions) === null || _a === void 0 ? void 0 : _a.diskPath)) {
+                        return filter;
+                    }
+                    return Object.assign(Object.assign({}, filter), { serverMonitorOptions: Object.assign(Object.assign({}, filter.serverMonitorOptions), { diskPath: diskPath }) });
+                },
+            });
+        }
+        return entities;
+    }
+    static isServerDiskFanOutConfigured(criteriaInstance) {
+        var _a;
+        return (((_a = criteriaInstance.data) === null || _a === void 0 ? void 0 : _a.filters) || []).some((filter) => {
+            var _a;
+            return (filter.checkOn === CheckOn.DiskUsagePercent &&
+                PerEntityCriteriaFanOut.isWildcard((_a = filter.serverMonitorOptions) === null || _a === void 0 ? void 0 : _a.diskPath));
+        });
+    }
+    /**
+     * The interfaces an SNMP monitor's criteria should fan out over.
+     *
+     * Note the asymmetry with the disk case: an EMPTY interface name
+     * already means "all interfaces" to the existing scoping code, and
+     * has done since before per-entity alerting existed. Treating empty
+     * as opt-in would turn one "3 interfaces down" alert into three
+     * alerts on every existing SNMP monitor at upgrade time, so the
+     * wildcard has to be explicit here too.
+     */
+    static getSnmpInterfaceEntities(input) {
+        if (!PerEntityCriteriaFanOut.isSnmpInterfaceFanOutConfigured(input.criteriaInstance)) {
+            return [];
+        }
+        const snmpResponse = input.dataToProcess;
+        const interfaces = (snmpResponse === null || snmpResponse === void 0 ? void 0 : snmpResponse.interfaces) || [];
+        const seenInterfaceNames = new Set();
+        const entities = [];
+        for (const snmpInterface of interfaces) {
+            /*
+             * Scoping matches on name OR alias, so the name is what a
+             * narrowed filter has to carry. An interface with neither cannot
+             * be addressed individually and stays on the whole-monitor path.
+             */
+            const interfaceName = (snmpInterface.name || "").trim();
+            if (!interfaceName || seenInterfaceNames.has(interfaceName)) {
+                continue;
+            }
+            seenInterfaceNames.add(interfaceName);
+            const labels = { interfaceName: interfaceName };
+            if (snmpInterface.alias) {
+                labels["interfaceAlias"] = snmpInterface.alias;
+            }
+            entities.push({
+                labels,
+                narrowFilter: (filter) => {
+                    var _a;
+                    if (!PerEntityCriteriaFanOut.isInterfaceScopedCheckOn(filter.checkOn) ||
+                        !PerEntityCriteriaFanOut.isWildcard((_a = filter.snmpMonitorOptions) === null || _a === void 0 ? void 0 : _a.interfaceName)) {
+                        return filter;
+                    }
+                    return Object.assign(Object.assign({}, filter), { snmpMonitorOptions: Object.assign(Object.assign({}, filter.snmpMonitorOptions), { interfaceName: interfaceName }) });
+                },
+            });
+        }
+        return entities;
+    }
+    static isSnmpInterfaceFanOutConfigured(criteriaInstance) {
+        var _a;
+        return (((_a = criteriaInstance.data) === null || _a === void 0 ? void 0 : _a.filters) || []).some((filter) => {
+            var _a;
+            return (PerEntityCriteriaFanOut.isInterfaceScopedCheckOn(filter.checkOn) &&
+                PerEntityCriteriaFanOut.isWildcard((_a = filter.snmpMonitorOptions) === null || _a === void 0 ? void 0 : _a.interfaceName));
+        });
+    }
+    static isInterfaceScopedCheckOn(checkOn) {
+        return (checkOn === CheckOn.SnmpInterfaceIsDown ||
+            checkOn === CheckOn.SnmpInterfaceUtilizationPercent ||
+            checkOn === CheckOn.SnmpInterfaceErrorsPerSecond);
+    }
+}
+//# sourceMappingURL=PerEntityCriteriaFanOut.js.map

package/build/dist/Server/Utils/Monitor/PerEntityCriteriaFanOut.js.map

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