@oneuptime/common 12.0.31 → 12.0.32

package/Models/DatabaseModels/AlertState.ts

@@ -14,7 +14,6 @@ import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import ColorField from "../../Types/Database/ColorField";
-import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -71,7 +70,6 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   read: true,
 })
 @CrudApiEndpoint(new Route("/alert-state"))
-@SlugifyColumn("name", "slug")
 @TableMetadata({
   tableName: "AlertState",
   singularName: "Alert State",

package/Models/DatabaseModels/Domain.ts

@@ -50,7 +50,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   ],
 })
 @CrudApiEndpoint(new Route("/domain"))
-@SlugifyColumn("name", "slug")
+@SlugifyColumn("domain", "slug")
 @TableMetadata({
   tableName: "Domain",
   singularName: "Domain",

package/Models/DatabaseModels/Incident.ts

@@ -101,7 +101,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
   ],
 })
 @CrudApiEndpoint(new Route("/incident"))
-@SlugifyColumn("name", "slug")
+@SlugifyColumn("title", "slug")
 @Entity({
   name: "Incident",
 })

package/Models/DatabaseModels/IncidentTemplate.ts

@@ -88,7 +88,7 @@ import { PlanType } from "../../Types/Billing/SubscriptionPlan";
   ],
 })
 @CrudApiEndpoint(new Route("/incident-templates"))
-@SlugifyColumn("name", "slug")
+@SlugifyColumn("templateName", "slug")
 @Entity({
   name: "IncidentTemplate",
 })

package/Models/DatabaseModels/Index.ts

@@ -13,6 +13,7 @@ import NetworkDeviceOwnerRule from "./NetworkDeviceOwnerRule";
 import NetworkDeviceLabelRule from "./NetworkDeviceLabelRule";
 import NetworkDeviceAutoImportRule from "./NetworkDeviceAutoImportRule";
 import NetworkDeviceOidTemplate from "./NetworkDeviceOidTemplate";
+import NetworkDeviceRole from "./NetworkDeviceRole";
 import NetworkDeviceDiscoveryScan from "./NetworkDeviceDiscoveryScan";
 import NetworkInterface from "./NetworkInterface";
 import NetworkSite from "./NetworkSite";
@@ -880,6 +881,7 @@ const AllModelTypes: Array<{
   NetworkDeviceLabelRule,
   NetworkDeviceAutoImportRule,
   NetworkDeviceOidTemplate,
+  NetworkDeviceRole,
   NetworkDeviceDiscoveryScan,
   NetworkInterface,
   NetworkSite,

package/Models/DatabaseModels/MetricType.ts

@@ -8,7 +8,6 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
-import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -72,7 +71,6 @@ import { AggregationTemporality } from "../AnalyticsModels/Metric";
   read: false,
 })
 @CrudApiEndpoint(new Route("/metric-type"))
-@SlugifyColumn("name", "slug")
 @TableMetadata({
   tableName: "MetricType",
   singularName: "Metric Type",

package/Models/DatabaseModels/MonitorStatusTimeline.ts

@@ -13,7 +13,6 @@ import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
-import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -73,7 +72,6 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   read: true,
 })
 @CrudApiEndpoint(new Route("/monitor-status-timeline"))
-@SlugifyColumn("name", "slug")
 @OwnedThrough("monitorId", Monitor)
 @Entity({
   name: "MonitorStatusTimeline",

package/Models/DatabaseModels/MonitorTest.ts

@@ -10,7 +10,6 @@ import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
-import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -70,7 +69,6 @@ import Monitor from "./Monitor";
   read: true,
 })
 @CrudApiEndpoint(new Route("/monitor-test"))
-@SlugifyColumn("name", "slug")
 @OwnedThrough("monitorId", Monitor)
 @Entity({
   name: "MonitorTest",

package/Models/DatabaseModels/NetworkDevice.ts

@@ -2,6 +2,7 @@ import Label from "./Label";
 import Monitor from "./Monitor";
 import MonitorStatus from "./MonitorStatus";
 import NetworkDeviceOidTemplate from "./NetworkDeviceOidTemplate";
+import NetworkDeviceRole from "./NetworkDeviceRole";
 import NetworkSite from "./NetworkSite";
 import Probe from "./Probe";
 import Project from "./Project";
@@ -845,13 +846,22 @@ export default class NetworkDevice extends BaseModel {
       Permission.EditNetworkDevice,
     ],
   })
+  /*
+   * DEPRECATED. Device roles used to be a fixed union stored inline as a
+   * string; they are now the per-project NetworkDeviceRole lookup table
+   * below, so a project can rename them, change what each is drawn as, or add
+   * roles of its own. This column is retained ONLY so the
+   * BackfillNetworkDeviceRoles data migration can read the old value and
+   * point networkDeviceRoleId at the matching role row. It is dropped in a
+   * follow-up PR - do not read or write it from new code.
+   */
   @TableColumn({
     required: false,
     type: TableColumnType.ShortText,
     canReadOnRelationQuery: true,
-    title: "Device Role",
+    title: "Device Role (Deprecated)",
     description:
-      "What this device does on the network — router, switch, access point and so on. Left empty, the role is worked out from the device's own SNMP identity. Set it when there is no SNMP to read: a ping-only device has no identity to classify, and the role decides both the shape it is drawn with and where it sits in the topology hierarchy.",
+      "Deprecated legacy device role key. Use the Network Device Role relation instead; this column exists only for the backfill migration and will be removed.",
     example: "switch",
   })
   @Column({
@@ -861,6 +871,115 @@ export default class NetworkDevice extends BaseModel {
   })
   public deviceRole?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkDevice,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkDevice,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkDevice,
+    ],
+  })
+  /*
+   * The operator's own answer to what this device is, when they gave one.
+   *
+   * Empty is not "unknown": it means "no answer given", and the SNMP
+   * classifier is left to work the role out from the device's own identity.
+   * That is the better source when there IS an identity to read, which is
+   * why this is left empty on SNMP devices by default. On a device nothing
+   * walks - a ping-only device, a monitor-backed one - the classifier has
+   * only a hostname to go on, so this is the only statement about the role
+   * available at all, and it decides both the shape the device is drawn with
+   * and where it sits in the topology hierarchy.
+   *
+   * SET NULL on delete, deliberately: removing a role from the project's
+   * settings must not remove the devices that were using it. They simply go
+   * back to being classified from their SNMP identity.
+   */
+  @TableColumn({
+    manyToOneRelationColumn: "networkDeviceRoleId",
+    type: TableColumnType.Entity,
+    modelType: NetworkDeviceRole,
+    title: "Device Role",
+    description:
+      "What this device does on the network - Router, Switch, Wireless AP and so on. Configured per project in Network > Settings > Device Roles.",
+  })
+  @ManyToOne(
+    () => {
+      return NetworkDeviceRole;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "networkDeviceRoleId" })
+  public networkDeviceRole?: NetworkDeviceRole = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateNetworkDevice,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadNetworkDevice,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditNetworkDevice,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ObjectID,
+    canReadOnRelationQuery: true,
+    title: "Device Role ID",
+    description: "ID of the Network Device Role this device is assigned.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public networkDeviceRoleId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/NetworkDeviceOidTemplate.ts

@@ -37,7 +37,9 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
  *
  * The template's NAME is the device type. There is no NetworkDeviceType
  * model and every candidate matching key was defective: labels double as the
- * row-level ACL column, deviceRole is unconstrained free text, and
+ * row-level ACL column, deviceRole was unconstrained free text (it is
+ * the NetworkDeviceRole lookup now, but a role says what a device DOES, not
+ * which OIDs it answers), and
  * vendor/sysObjectId are probe-managed and NULL until the first successful
  * walk. Devices link by an explicit FK the operator sets, in bulk from the
  * device list.