@oneuptime/common 12.0.22 → 12.0.23

package/Server/Infrastructure/Postgres/SchemaMigrations/1789100000000-AddNetworkDeviceAutoImportRule.ts

@@ -0,0 +1,60 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Auto-import rules for network device discovery (issue #3378): a rule table
+ * whose conditions decide which discovered hosts become Network Devices with
+ * no manual review step, plus a processed-marker column on the scan so the
+ * worker that evaluates the rules knows which results it has already seen.
+ */
+export class AddNetworkDeviceAutoImportRule1789100000000
+  implements MigrationInterface
+{
+  public name: string = "AddNetworkDeviceAutoImportRule1789100000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "NetworkDeviceAutoImportRule" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "name" character varying(100) NOT NULL, "description" character varying(500), "isEnabled" boolean NOT NULL DEFAULT true, "ipMatchTarget" character varying(100), "sysNamePattern" character varying(500), "sysDescrPattern" character varying(500), "includePingOnlyHosts" boolean NOT NULL DEFAULT false, "isExclusion" boolean NOT NULL DEFAULT false, "createdByUserId" uuid, "deletedByUserId" uuid, CONSTRAINT "PK_network_device_auto_import_rule_id" PRIMARY KEY ("_id"))`,
+    );
+
+    for (const column of ["projectId", "name", "isEnabled", "isExclusion"]) {
+      await queryRunner.query(
+        `CREATE INDEX "IDX_network_device_auto_import_rule_${column}" ON "NetworkDeviceAutoImportRule" ("${column}")`,
+      );
+    }
+
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDeviceAutoImportRule" ADD CONSTRAINT "FK_nd_auto_import_rule_projectId" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDeviceAutoImportRule" ADD CONSTRAINT "FK_nd_auto_import_rule_createdByUserId" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDeviceAutoImportRule" ADD CONSTRAINT "FK_nd_auto_import_rule_deletedByUserId" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDeviceDiscoveryScan" ADD "autoImportProcessedAt" TIMESTAMP WITH TIME ZONE`,
+    );
+
+    /*
+     * Backfill EVERY existing scan as already-processed, making the feature
+     * forward-only. One-shot scans stay "Completed" forever, so without this
+     * every scan ever run would sit unprocessed and the first rule a project
+     * creates would mass-import months-old results — the opposite of what an
+     * operator writing a rule about FUTURE discoveries intends. Old results
+     * remain reachable on purpose through the rule's explicit "Run Now".
+     */
+    await queryRunner.query(
+      `UPDATE "NetworkDeviceDiscoveryScan" SET "autoImportProcessedAt" = now()`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDeviceDiscoveryScan" DROP COLUMN "autoImportProcessedAt"`,
+    );
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS "NetworkDeviceAutoImportRule"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1789200000000-AddSysObjectIdPatternToAutoImportRule.ts

@@ -0,0 +1,26 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Vendor-based auto-import conditions (issue #3378, phase 2): the probe now
+ * reports the full SNMP system group per discovered host (sysObjectId,
+ * sysLocation, sysContact, sysUpTimeSeconds ride inside the scan's existing
+ * discoveredDevices jsonb, so they need no column), and a rule can match on
+ * the sysObjectID — the vendor's registered enterprise OID.
+ */
+export class AddSysObjectIdPatternToAutoImportRule1789200000000
+  implements MigrationInterface
+{
+  public name: string = "AddSysObjectIdPatternToAutoImportRule1789200000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDeviceAutoImportRule" ADD "sysObjectIdPattern" character varying(500)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDeviceAutoImportRule" DROP COLUMN "sysObjectIdPattern"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1789300000000-AddAutoApplyVendorHealthTemplate.ts

@@ -0,0 +1,26 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/*
+ * Vendor health template auto-apply (issue #3378, phase 3): a per-device
+ * opt-in that lets the inventory poll merge the matching vendor OID template
+ * into an empty Health OIDs list once the device's sysObjectID is known.
+ * Defaults false everywhere — existing devices keep the manual banner flow;
+ * the auto-import engine turns it on for the devices it creates.
+ */
+export class AddAutoApplyVendorHealthTemplate1789300000000
+  implements MigrationInterface
+{
+  public name: string = "AddAutoApplyVendorHealthTemplate1789300000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDevice" ADD "autoApplyVendorHealthTemplate" boolean NOT NULL DEFAULT false`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "NetworkDevice" DROP COLUMN "autoApplyVendorHealthTemplate"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -543,6 +543,9 @@ import { AddDetectionRuleIncidentColumns1788600000000 } from "./1788600000000-Ad
 import { RemoveMarketingConversionUploadState1788700000000 } from "./1788700000000-RemoveMarketingConversionUploadState";
 import { DropMarketingConversionAddEnterpriseLicenseEmail1788800000000 } from "./1788800000000-DropMarketingConversionAddEnterpriseLicenseEmail";
 import { AddUserSlackAndMicrosoftTeams1789000000000 } from "./1789000000000-AddUserSlackAndMicrosoftTeams";
+import { AddNetworkDeviceAutoImportRule1789100000000 } from "./1789100000000-AddNetworkDeviceAutoImportRule";
+import { AddSysObjectIdPatternToAutoImportRule1789200000000 } from "./1789200000000-AddSysObjectIdPatternToAutoImportRule";
+import { AddAutoApplyVendorHealthTemplate1789300000000 } from "./1789300000000-AddAutoApplyVendorHealthTemplate";
 import { AddUserTwoFactorBackupCode1789100000000 } from "./1789100000000-AddUserTwoFactorBackupCode";
 import { MigrationName1787142779538 } from "./1787142779538-MigrationName";
 import { MigrationName1787156982416 } from "./1787156982416-MigrationName";
@@ -1095,5 +1098,8 @@ export default [
   RemoveMarketingConversionUploadState1788700000000,
   DropMarketingConversionAddEnterpriseLicenseEmail1788800000000,
   AddUserSlackAndMicrosoftTeams1789000000000,
+  AddNetworkDeviceAutoImportRule1789100000000,
+  AddSysObjectIdPatternToAutoImportRule1789200000000,
+  AddAutoApplyVendorHealthTemplate1789300000000,
   AddUserTwoFactorBackupCode1789100000000,
 ];

package/Server/Services/Index.ts

@@ -42,6 +42,7 @@ import NetworkDeviceOwnerTeamService from "./NetworkDeviceOwnerTeamService";
 import NetworkDeviceOwnerUserService from "./NetworkDeviceOwnerUserService";
 import NetworkDeviceOwnerRuleService from "./NetworkDeviceOwnerRuleService";
 import NetworkDeviceLabelRuleService from "./NetworkDeviceLabelRuleService";
+import NetworkDeviceAutoImportRuleService from "./NetworkDeviceAutoImportRuleService";
 import NetworkDeviceDiscoveryScanService from "./NetworkDeviceDiscoveryScanService";
 import NetworkInterfaceService from "./NetworkInterfaceService";
 import NetworkSiteService from "./NetworkSiteService";
@@ -364,6 +365,7 @@ const services: Array<BaseService> = [
   NetworkDeviceOwnerUserService,
   NetworkDeviceOwnerRuleService,
   NetworkDeviceLabelRuleService,
+  NetworkDeviceAutoImportRuleService,
   NetworkDeviceDiscoveryScanService,
   NetworkInterfaceService,
   NetworkSiteService,