@oneuptime/common 12.0.32 → 12.0.33

package/Models/AnalyticsModels/Span.ts

@@ -24,6 +24,20 @@ export enum SpanKind {
 
 export enum SpanEventType {
   Exception = "exception",
+  /*
+   * A failure that is deliberately NOT an Issue: invalid input we rejected, a
+   * credential we refused, a plan limit we enforced. Emitted by
+   * Telemetry.recordExceptionOnSpan for the user-error and expected-denial
+   * fault domains.
+   *
+   * The name is the whole mechanism. Trace ingest builds an ExceptionInstance
+   * row and a TelemetryException group for every event named "exception" and
+   * nothing else, so an event under this name is still stored in the span's
+   * `events` column and still rendered in the Traces UI — it simply never
+   * becomes an Issue. Its attributes are `error.*`, never `exception.*`, so
+   * the log-derived exception path cannot resurrect it either.
+   */
+  Fault = "fault",
   Event = "event",
 }
 

package/Models/DatabaseModels/EnterpriseLicense.ts

@@ -4,6 +4,7 @@ import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccess
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
+import EnterpriseLicenseUserCountSource from "../../Types/EnterpriseLicense/EnterpriseLicenseUserCountSource";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -199,4 +200,59 @@ export default class EnterpriseLicense extends BaseModel {
     type: ColumnType.Date,
   })
   public userCountUpdatedAt?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "User Count Source",
+    description:
+      "Whether the current user count came from per-instance usage or a legacy license-wide report.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public userCountSource?: EnterpriseLicenseUserCountSource = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Number,
+    title: "Legacy User Count",
+    description:
+      "Most recent license-wide user count from an older installation that cannot identify its instance.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.Number,
+  })
+  public legacyUserCount?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Date,
+    title: "Legacy User Count Updated At",
+    description:
+      "Timestamp of the most recent license-wide user count report from an older installation.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.Date,
+  })
+  public legacyUserCountUpdatedAt?: Date = undefined;
 }

package/Models/DatabaseModels/Index.ts

@@ -14,6 +14,8 @@ import NetworkDeviceLabelRule from "./NetworkDeviceLabelRule";
 import NetworkDeviceAutoImportRule from "./NetworkDeviceAutoImportRule";
 import NetworkDeviceOidTemplate from "./NetworkDeviceOidTemplate";
 import NetworkDeviceRole from "./NetworkDeviceRole";
+import NetworkAlertPolicy from "./NetworkAlertPolicy";
+import NetworkSnmpCredentialProfile from "./NetworkSnmpCredentialProfile";
 import NetworkDeviceDiscoveryScan from "./NetworkDeviceDiscoveryScan";
 import NetworkInterface from "./NetworkInterface";
 import NetworkSite from "./NetworkSite";
@@ -461,6 +463,9 @@ import ProjectSCIM from "./ProjectSCIM";
 import ProjectSCIMLog from "./ProjectSCIMLog";
 import StatusPageSCIMLog from "./StatusPageSCIMLog";
 import DeletedProject from "./DeletedProject";
+import UserNotificationEmailRollupItem from "./UserNotificationEmailRollupItem";
+import UserNotificationEmailRollupBatch from "./UserNotificationEmailRollupBatch";
+import UserNotificationEmailRollupSetting from "./UserNotificationEmailRollupSetting";
 
 const AllModelTypes: Array<{
   new (): BaseModel;
@@ -882,6 +887,8 @@ const AllModelTypes: Array<{
   NetworkDeviceAutoImportRule,
   NetworkDeviceOidTemplate,
   NetworkDeviceRole,
+  NetworkAlertPolicy,
+  NetworkSnmpCredentialProfile,
   NetworkDeviceDiscoveryScan,
   NetworkInterface,
   NetworkSite,
@@ -942,6 +949,9 @@ const AllModelTypes: Array<{
   RumSessionErasureRequest,
   RumSessionPin,
   DeletedProject,
+  UserNotificationEmailRollupItem,
+  UserNotificationEmailRollupBatch,
+  UserNotificationEmailRollupSetting,
 ];
 
 const modelTypeMap: { [key: string]: { new (): BaseModel } } = {};

package/Models/DatabaseModels/Monitor.ts

@@ -2,6 +2,7 @@ import Label from "./Label";
 import MonitorStatus from "./MonitorStatus";
 import MonitorTemplate from "./MonitorTemplate";
 import NetworkDevice from "./NetworkDevice";
+import NetworkAlertPolicy from "./NetworkAlertPolicy";
 import Project from "./Project";
 import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
@@ -764,6 +765,81 @@ export default class Monitor extends BaseModel {
   })
   public autoProvisionedNetworkDeviceId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.MonitorAdmin,
+      Permission.MonitorMember,
+      Permission.MonitorViewer,
+      Permission.ReadProjectMonitor,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "networkAlertPolicyId",
+    type: TableColumnType.Entity,
+    // Lazy: NetworkAlertPolicy reaches Monitor through MonitorTemplate.
+    modelTypeThunk: () => {
+      return NetworkAlertPolicy;
+    },
+    title: "Network Alert Policy",
+    description:
+      "The Network Alert Policy that provisioned this monitor, when one did. A policy owns the monitors it creates: it removes them when a device leaves the policy's scope or the policy is deleted, and it never touches monitors it did not create. System-managed.",
+  })
+  @ManyToOne(
+    () => {
+      return NetworkAlertPolicy;
+    },
+    {
+      eager: false,
+      nullable: true,
+      /*
+       * Deleting a policy deletes its monitors through the engine, with
+       * lifecycle hooks. SET NULL is only the backstop for a monitor the
+       * engine could not reach: it becomes an ordinary auto-provisioned
+       * monitor rather than a dangling reference.
+       */
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "networkAlertPolicyId" })
+  public networkAlertPolicy?: NetworkAlertPolicy = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.MonitorAdmin,
+      Permission.MonitorMember,
+      Permission.MonitorViewer,
+      Permission.ReadProjectMonitor,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Network Alert Policy ID",
+    description:
+      "ID of the Network Alert Policy that provisioned this monitor, when one did",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public networkAlertPolicyId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,