@oneuptime/common 12.0.13 → 12.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "12.0.13",
+  "version": "12.0.15",
   "description": "",
   "repository": {
     "type": "git",
@@ -86,7 +86,6 @@
     "@types/dompurify": "^3.0.5",
     "@types/multer": "^2.0.0",
     "@types/qrcode": "^1.5.5",
-    "@types/react-highlight": "^0.12.8",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/web-push": "^3.6.4",
     "acme-client": "^5.3.0",
@@ -106,6 +105,7 @@
     "expo-server-sdk": "^3.15.0",
     "express": "^4.21.1",
     "formik": "^2.4.6",
+    "highlight.js": "^10.7.3",
     "history": "^5.3.0",
     "i18next": "^23.16.8",
     "ioredis": "^5.3.2",
@@ -140,7 +140,6 @@
     "react-dom": "^18.3.1",
     "react-dropzone": "^14.2.2",
     "react-error-boundary": "^4.0.13",
-    "react-highlight": "^0.15.0",
     "react-i18next": "^15.7.4",
     "react-markdown": "^9.1.0",
     "react-router-dom": "^6.30.1",

package/Server/Utils/Monitor/MonitorClusterContext.ts

@@ -1,182 +0,0 @@
-import CephCluster from "../../../Models/DatabaseModels/CephCluster";
-import DockerSwarmCluster from "../../../Models/DatabaseModels/DockerSwarmCluster";
-import IoTFleet from "../../../Models/DatabaseModels/IoTFleet";
-import Monitor from "../../../Models/DatabaseModels/Monitor";
-import ProxmoxCluster from "../../../Models/DatabaseModels/ProxmoxCluster";
-import MonitorStep from "../../../Types/Monitor/MonitorStep";
-import MonitorType from "../../../Types/Monitor/MonitorType";
-import CephClusterService from "../../Services/CephClusterService";
-import DockerSwarmClusterService from "../../Services/DockerSwarmClusterService";
-import IoTFleetService from "../../Services/IoTFleetService";
-import ProxmoxClusterService from "../../Services/ProxmoxClusterService";
-import QueryHelper from "../../Types/Database/QueryHelper";
-import logger from "../Logger";
-
-/*
- * WI-11 contract: incidents/alerts created by Proxmox/Ceph monitors must
- * be attached to the cluster they monitor — the per-cluster Activity
- * pages and SideMenu badge counts query `proxmoxClusters` /
- * `cephClusters` on Incident/Alert. Series labels cannot supply this
- * identity: the shipped templates group by datapoint labels (`id`,
- * `ceph_daemon`, `pool_id`), and ungrouped templates (e.g.
- * ceph-health-error) have no series at all. The deterministic source is
- * the monitor step config, which always carries `clusterIdentifier`
- * (validated as required by MonitorStep), so the incident/alert creation
- * paths resolve the cluster row from it once per evaluation.
- */
-export interface MonitorClusterContext {
-  proxmoxClusterIds: Array<string>;
-  cephClusterIds: Array<string>;
-  dockerSwarmClusterIds: Array<string>;
-  iotFleetIds: Array<string>;
-}
-
-export default class MonitorClusterContextUtil {
-  /*
-   * Resolve the Proxmox/Ceph cluster rows referenced by the monitor's
-   * step configs. Lookup-only — row creation belongs to ingest
-   * discovery (findOrCreateByName); a monitor pointing at a cluster
-   * that never sent data simply links nothing. The lookup is
-   * case-insensitive and project-scoped, matching the ingest contract
-   * (the agent-stamped name and the user-typed step identifier may
-   * differ only by case). Returns empty arrays for every other monitor
-   * type without touching the database.
-   */
-  public static async resolveClusterContextForMonitor(input: {
-    monitor: Monitor;
-  }): Promise<MonitorClusterContext> {
-    const context: MonitorClusterContext = {
-      proxmoxClusterIds: [],
-      cephClusterIds: [],
-      dockerSwarmClusterIds: [],
-      iotFleetIds: [],
-    };
-
-    const monitorType: MonitorType | undefined = input.monitor.monitorType;
-
-    if (
-      monitorType !== MonitorType.Proxmox &&
-      monitorType !== MonitorType.Ceph &&
-      monitorType !== MonitorType.DockerSwarm &&
-      monitorType !== MonitorType.IoTDevice
-    ) {
-      return context;
-    }
-
-    if (!input.monitor.projectId) {
-      return context;
-    }
-
-    const monitorSteps: Array<MonitorStep> =
-      input.monitor.monitorSteps?.data?.monitorStepsInstanceArray || [];
-
-    const clusterIdentifiers: Set<string> = new Set<string>();
-
-    for (const monitorStep of monitorSteps) {
-      let clusterIdentifier: string | undefined = undefined;
-
-      if (monitorType === MonitorType.Proxmox) {
-        clusterIdentifier = monitorStep.data?.proxmoxMonitor?.clusterIdentifier;
-      } else if (monitorType === MonitorType.Ceph) {
-        clusterIdentifier = monitorStep.data?.cephMonitor?.clusterIdentifier;
-      } else if (monitorType === MonitorType.DockerSwarm) {
-        clusterIdentifier =
-          monitorStep.data?.dockerSwarmMonitor?.clusterIdentifier;
-      } else if (monitorType === MonitorType.IoTDevice) {
-        clusterIdentifier = monitorStep.data?.iotMonitor?.fleetIdentifier;
-      }
-
-      if (clusterIdentifier && clusterIdentifier.trim().length > 0) {
-        clusterIdentifiers.add(clusterIdentifier.trim());
-      }
-    }
-
-    /*
-     * Cluster linking is best-effort context — a lookup failure must
-     * never block incident/alert creation, so errors are logged and
-     * swallowed per identifier.
-     */
-    for (const clusterIdentifier of clusterIdentifiers) {
-      try {
-        if (monitorType === MonitorType.Proxmox) {
-          const proxmoxCluster: ProxmoxCluster | null =
-            await ProxmoxClusterService.findOneBy({
-              query: {
-                projectId: input.monitor.projectId,
-                name: QueryHelper.findWithSameText(clusterIdentifier),
-              },
-              select: {
-                _id: true,
-              },
-              props: {
-                isRoot: true,
-              },
-            });
-
-          if (proxmoxCluster?._id) {
-            context.proxmoxClusterIds.push(String(proxmoxCluster._id));
-          }
-        } else if (monitorType === MonitorType.Ceph) {
-          const cephCluster: CephCluster | null =
-            await CephClusterService.findOneBy({
-              query: {
-                projectId: input.monitor.projectId,
-                name: QueryHelper.findWithSameText(clusterIdentifier),
-              },
-              select: {
-                _id: true,
-              },
-              props: {
-                isRoot: true,
-              },
-            });
-
-          if (cephCluster?._id) {
-            context.cephClusterIds.push(String(cephCluster._id));
-          }
-        } else if (monitorType === MonitorType.DockerSwarm) {
-          const dockerSwarmCluster: DockerSwarmCluster | null =
-            await DockerSwarmClusterService.findOneBy({
-              query: {
-                projectId: input.monitor.projectId,
-                name: QueryHelper.findWithSameText(clusterIdentifier),
-              },
-              select: {
-                _id: true,
-              },
-              props: {
-                isRoot: true,
-              },
-            });
-
-          if (dockerSwarmCluster?._id) {
-            context.dockerSwarmClusterIds.push(String(dockerSwarmCluster._id));
-          }
-        } else {
-          const iotFleet: IoTFleet | null = await IoTFleetService.findOneBy({
-            query: {
-              projectId: input.monitor.projectId,
-              name: QueryHelper.findWithSameText(clusterIdentifier),
-            },
-            select: {
-              _id: true,
-            },
-            props: {
-              isRoot: true,
-            },
-          });
-
-          if (iotFleet?._id) {
-            context.iotFleetIds.push(String(iotFleet._id));
-          }
-        }
-      } catch (err) {
-        logger.error(
-          `Failed to resolve ${monitorType} cluster "${clusterIdentifier}" for monitor ${input.monitor.id?.toString()}: ${err}`,
-        );
-      }
-    }
-
-    return context;
-  }
-}

package/Tests/__mocks__/otpauth.js

@@ -1,30 +0,0 @@
-// Mock for otpauth package
-module.exports = {
-  HOTP: class HOTP {
-    generate() {
-      return "123456";
-    }
-    validate() {
-      return true;
-    }
-  },
-  TOTP: class TOTP {
-    generate() {
-      return "123456";
-    }
-    validate() {
-      return true;
-    }
-  },
-  Secret: class Secret {
-    static fromBase32() {
-      return new Secret();
-    }
-    base32 = "JBSWY3DPEHPK3PXP";
-  },
-  URI: {
-    parse: jest.fn(),
-    stringify: jest.fn(),
-  },
-  version: "9.0.0",
-};

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

@@ -1,141 +0,0 @@
-import MonitorType from "../../../Types/Monitor/MonitorType";
-import CephClusterService from "../../Services/CephClusterService";
-import DockerSwarmClusterService from "../../Services/DockerSwarmClusterService";
-import IoTFleetService from "../../Services/IoTFleetService";
-import ProxmoxClusterService from "../../Services/ProxmoxClusterService";
-import QueryHelper from "../../Types/Database/QueryHelper";
-import logger from "../Logger";
-export default class MonitorClusterContextUtil {
-    /*
-     * Resolve the Proxmox/Ceph cluster rows referenced by the monitor's
-     * step configs. Lookup-only — row creation belongs to ingest
-     * discovery (findOrCreateByName); a monitor pointing at a cluster
-     * that never sent data simply links nothing. The lookup is
-     * case-insensitive and project-scoped, matching the ingest contract
-     * (the agent-stamped name and the user-typed step identifier may
-     * differ only by case). Returns empty arrays for every other monitor
-     * type without touching the database.
-     */
-    static async resolveClusterContextForMonitor(input) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        const context = {
-            proxmoxClusterIds: [],
-            cephClusterIds: [],
-            dockerSwarmClusterIds: [],
-            iotFleetIds: [],
-        };
-        const monitorType = input.monitor.monitorType;
-        if (monitorType !== MonitorType.Proxmox &&
-            monitorType !== MonitorType.Ceph &&
-            monitorType !== MonitorType.DockerSwarm &&
-            monitorType !== MonitorType.IoTDevice) {
-            return context;
-        }
-        if (!input.monitor.projectId) {
-            return context;
-        }
-        const monitorSteps = ((_b = (_a = input.monitor.monitorSteps) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.monitorStepsInstanceArray) || [];
-        const clusterIdentifiers = new Set();
-        for (const monitorStep of monitorSteps) {
-            let clusterIdentifier = undefined;
-            if (monitorType === MonitorType.Proxmox) {
-                clusterIdentifier = (_d = (_c = monitorStep.data) === null || _c === void 0 ? void 0 : _c.proxmoxMonitor) === null || _d === void 0 ? void 0 : _d.clusterIdentifier;
-            }
-            else if (monitorType === MonitorType.Ceph) {
-                clusterIdentifier = (_f = (_e = monitorStep.data) === null || _e === void 0 ? void 0 : _e.cephMonitor) === null || _f === void 0 ? void 0 : _f.clusterIdentifier;
-            }
-            else if (monitorType === MonitorType.DockerSwarm) {
-                clusterIdentifier =
-                    (_h = (_g = monitorStep.data) === null || _g === void 0 ? void 0 : _g.dockerSwarmMonitor) === null || _h === void 0 ? void 0 : _h.clusterIdentifier;
-            }
-            else if (monitorType === MonitorType.IoTDevice) {
-                clusterIdentifier = (_k = (_j = monitorStep.data) === null || _j === void 0 ? void 0 : _j.iotMonitor) === null || _k === void 0 ? void 0 : _k.fleetIdentifier;
-            }
-            if (clusterIdentifier && clusterIdentifier.trim().length > 0) {
-                clusterIdentifiers.add(clusterIdentifier.trim());
-            }
-        }
-        /*
-         * Cluster linking is best-effort context — a lookup failure must
-         * never block incident/alert creation, so errors are logged and
-         * swallowed per identifier.
-         */
-        for (const clusterIdentifier of clusterIdentifiers) {
-            try {
-                if (monitorType === MonitorType.Proxmox) {
-                    const proxmoxCluster = await ProxmoxClusterService.findOneBy({
-                        query: {
-                            projectId: input.monitor.projectId,
-                            name: QueryHelper.findWithSameText(clusterIdentifier),
-                        },
-                        select: {
-                            _id: true,
-                        },
-                        props: {
-                            isRoot: true,
-                        },
-                    });
-                    if (proxmoxCluster === null || proxmoxCluster === void 0 ? void 0 : proxmoxCluster._id) {
-                        context.proxmoxClusterIds.push(String(proxmoxCluster._id));
-                    }
-                }
-                else if (monitorType === MonitorType.Ceph) {
-                    const cephCluster = await CephClusterService.findOneBy({
-                        query: {
-                            projectId: input.monitor.projectId,
-                            name: QueryHelper.findWithSameText(clusterIdentifier),
-                        },
-                        select: {
-                            _id: true,
-                        },
-                        props: {
-                            isRoot: true,
-                        },
-                    });
-                    if (cephCluster === null || cephCluster === void 0 ? void 0 : cephCluster._id) {
-                        context.cephClusterIds.push(String(cephCluster._id));
-                    }
-                }
-                else if (monitorType === MonitorType.DockerSwarm) {
-                    const dockerSwarmCluster = await DockerSwarmClusterService.findOneBy({
-                        query: {
-                            projectId: input.monitor.projectId,
-                            name: QueryHelper.findWithSameText(clusterIdentifier),
-                        },
-                        select: {
-                            _id: true,
-                        },
-                        props: {
-                            isRoot: true,
-                        },
-                    });
-                    if (dockerSwarmCluster === null || dockerSwarmCluster === void 0 ? void 0 : dockerSwarmCluster._id) {
-                        context.dockerSwarmClusterIds.push(String(dockerSwarmCluster._id));
-                    }
-                }
-                else {
-                    const iotFleet = await IoTFleetService.findOneBy({
-                        query: {
-                            projectId: input.monitor.projectId,
-                            name: QueryHelper.findWithSameText(clusterIdentifier),
-                        },
-                        select: {
-                            _id: true,
-                        },
-                        props: {
-                            isRoot: true,
-                        },
-                    });
-                    if (iotFleet === null || iotFleet === void 0 ? void 0 : iotFleet._id) {
-                        context.iotFleetIds.push(String(iotFleet._id));
-                    }
-                }
-            }
-            catch (err) {
-                logger.error(`Failed to resolve ${monitorType} cluster "${clusterIdentifier}" for monitor ${(_l = input.monitor.id) === null || _l === void 0 ? void 0 : _l.toString()}: ${err}`);
-            }
-        }
-        return context;
-    }
-}
-//# sourceMappingURL=MonitorClusterContext.js.map

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

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