@oneuptime/common 12.0.31 → 12.0.33

package/Models/DatabaseModels/NetworkSite.ts

@@ -1,6 +1,8 @@
 import AlertSeverity from "./AlertSeverity";
 import MonitorStatus from "./MonitorStatus";
 import NetworkSiteType from "./NetworkSiteType";
+import NetworkSnmpCredentialProfile from "./NetworkSnmpCredentialProfile";
+import Probe from "./Probe";
 import SiteHealthRollupPolicy, {
   DefaultSiteOfflineThresholdPercent,
 } from "../../Types/NetworkSite/SiteHealthRollupPolicy";
@@ -414,7 +416,13 @@ export default class NetworkSite extends BaseModel {
     {
       eager: false,
       nullable: true,
-      onDelete: "SET NULL",
+      /*
+       * NO ACTION still protects a type while any referencing site survives,
+       * but performs the check at the end of the statement. That distinction
+       * lets deleting a Project cascade through its Network Sites and Network
+       * Site Types together without the sibling cascades blocking each other.
+       */
+      onDelete: "NO ACTION",
       orphanedRowAction: "nullify",
     },
   )
@@ -464,6 +472,193 @@ export default class NetworkSite extends BaseModel {
   })
   public networkSiteTypeId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkSite,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkSite,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkSite,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "probeId",
+    type: TableColumnType.Entity,
+    modelType: Probe,
+    title: "Default Probe",
+    description:
+      "The probe that polls devices in this site unless a device names its own. A device created into this site with no probe inherits it, and so does a device moved into the site while it has none — which is what lets an operator register a device by name and address alone. It has to be able to reach the site's network, so it is usually a custom probe deployed there.",
+  })
+  @ManyToOne(
+    () => {
+      return Probe;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "probeId" })
+  public probe?: Probe = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkSite,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkSite,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkSite,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Default Probe ID",
+    description: "ID of the probe that polls devices in this site by default",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public probeId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkSite,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkSite,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkSite,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "snmpCredentialProfileId",
+    type: TableColumnType.Entity,
+    modelType: NetworkSnmpCredentialProfile,
+    title: "Default SNMP Credential Profile",
+    description:
+      "The SNMP credential set devices in this site are walked with when neither the device nor its own profile carries credentials. Set it once per site and every device registered there is walked over SNMP from its first poll; with no profile anywhere the device is pinged only.",
+  })
+  @ManyToOne(
+    () => {
+      return NetworkSnmpCredentialProfile;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "snmpCredentialProfileId" })
+  public snmpCredentialProfile?: NetworkSnmpCredentialProfile = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkSite,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkSite,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkSite,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Default SNMP Credential Profile ID",
+    description:
+      "ID of the SNMP Credential Profile devices in this site inherit",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public snmpCredentialProfileId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -507,7 +702,11 @@ export default class NetworkSite extends BaseModel {
     {
       eager: false,
       nullable: true,
-      onDelete: "SET NULL",
+      /*
+       * Checked at statement end so a single bulk delete may remove a whole
+       * subtree; surviving children are rejected by NetworkSiteService.
+       */
+      onDelete: "NO ACTION",
       orphanedRowAction: "nullify",
     },
   )

package/Models/DatabaseModels/NetworkSiteType.ts

@@ -65,11 +65,12 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   pluralName: "Network Site Types",
   icon: IconProp.Layers,
   tableDescription:
-    "Configure the levels of your network site hierarchy (Region, Market, Unit and so on). Rename them, reorder them, or add your own.",
+    "Configure the levels of your network site hierarchy (Region, Market, Unit and so on). Choose each type's parent, rename it, or add your own.",
 })
 @Entity({
   name: "NetworkSiteType",
 })
+@Index(["projectId", "parentNetworkSiteTypeId"])
 export default class NetworkSiteType extends BaseModel {
   @ColumnAccessControl({
     create: [
@@ -264,6 +265,105 @@ export default class NetworkSiteType extends BaseModel {
   })
   public description?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkSiteType,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkSiteType,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkSiteType,
+    ],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "parentNetworkSiteTypeId",
+    type: TableColumnType.Entity,
+    modelType: NetworkSiteType,
+    title: "Parent Site Type",
+    description:
+      "The Network Site Type directly above this type. Empty for top-level types.",
+  })
+  @ManyToOne(
+    () => {
+      return NetworkSiteType;
+    },
+    {
+      eager: false,
+      nullable: true,
+      /*
+       * NO ACTION is checked at the end of the delete statement, so deleting
+       * a complete parent/child set together is allowed while any surviving
+       * child still blocks the operation. RESTRICT can reject the former
+       * before the statement has removed its child rows.
+       */
+      onDelete: "NO ACTION",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "parentNetworkSiteTypeId" })
+  public parentNetworkSiteType?: NetworkSiteType = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkSiteType,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkSiteType,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkSiteType,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Parent Site Type ID",
+    description:
+      "ID of the Network Site Type directly above this type. Empty for top-level types.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public parentNetworkSiteTypeId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -298,8 +398,7 @@ export default class NetworkSiteType extends BaseModel {
     type: TableColumnType.Number,
     canReadOnRelationQuery: true,
     title: "Order",
-    description:
-      "Where this type sits in the site hierarchy. Lower numbers are higher up: Region is 2 and Unit is 5, for example.",
+    description: "Display order among site types that have the same parent.",
     example: "5",
   })
   @Column({