@oneuptime/common 13.0.1 → 13.0.3

package/Models/AnalyticsModels/RumSession.ts

@@ -746,6 +746,39 @@ export default class RumSession extends AnalyticsBaseModel {
         accessControl: identityAccessControl,
       });
 
+    /*
+     * The recorder's per-browser anonymous visitor id: 32 lowercase hex
+     * characters (SESSION_REPLAY_VISITOR_ID_PATTERN) minted client-side
+     * once per browser profile and repeated on every meta-bearing chunk. A
+     * session id lives for one visit, so this is the only thing two visits
+     * from the same browser share - it is what lets the list group an
+     * application's sessions by visitor when its pages never call
+     * identify(). It is random and carries no identity: nothing the host
+     * page supplied, nothing that resolves to a person, so it sits under
+     * the ORDINARY session ACL beside sessionId rather than the narrow
+     * identity ACL the label and traits use. "" for a session from a
+     * recorder that predates it. Bloom-indexed because "other sessions
+     * from this visitor" is an equality lookup across the whole
+     * application, exactly like the identified-user key.
+     */
+    const visitorIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "visitorId",
+      title: "Visitor ID",
+      description:
+        "Recorder-minted per-browser anonymous visitor id (32 lowercase hex). Random, not an identity; empty for sessions from a recorder that predates it.",
+      required: true,
+      defaultValue: "",
+      type: TableColumnType.Text,
+      codec: { codec: "ZSTD", level: 1 },
+      skipIndex: {
+        name: "idx_visitor_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
+      accessControl: sessionAccessControl,
+    });
+
     /*
      * Per-session tags from setTags()/addTag(): build id, experiment arm,
      * customer tier. They describe the SESSION, not the person, so they
@@ -1015,6 +1048,7 @@ export default class RumSession extends AnalyticsBaseModel {
         identifiedUserKeyColumn,
         identifiedUserLabelColumn,
         identifiedUserTraitsColumn,
+        visitorIdColumn,
         tagsColumn,
         ...correlationArrayColumns,
         fidelityNoticesColumn,

package/Models/DatabaseModels/AlertEpisodeLabelRule.ts

@@ -2,7 +2,7 @@ import AlertSeverity from "./AlertSeverity";
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -75,7 +75,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to alert episodes when matching episodes are created",
 })
-export default class AlertEpisodeLabelRule extends BaseModel {
+export default class AlertEpisodeLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertEpisodeOnCallRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically executing on-call duty policies when matching alert episodes are created",
 })
-export default class AlertEpisodeOnCallRule extends BaseModel {
+export default class AlertEpisodeOnCallRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertEpisodeOwnerRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching alert episodes are created",
 })
-export default class AlertEpisodeOwnerRule extends BaseModel {
+export default class AlertEpisodeOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertEpisodePrivacyRule.ts

@@ -2,7 +2,7 @@ import AlertSeverity from "./AlertSeverity";
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -75,7 +75,7 @@ import {
   tableDescription:
     "Configure rules for automatically marking matching alert episodes as private",
 })
-export default class AlertEpisodePrivacyRule extends BaseModel {
+export default class AlertEpisodePrivacyRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertGroupingRule.ts

@@ -5,7 +5,7 @@ import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -96,7 +96,7 @@ export interface AlertGroupingRuleGroupByFields {
   tableDescription:
     "Configure rules for automatically grouping related alerts into episodes",
 })
-export default class AlertGroupingRule extends BaseModel {
+export default class AlertGroupingRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertLabelRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import Monitor from "./Monitor";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to alerts — including labels inherited from the alert's monitor — when matching alerts are created",
 })
-export default class AlertLabelRule extends BaseModel {
+export default class AlertLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertOnCallRule.ts

@@ -4,7 +4,7 @@ import Monitor from "./Monitor";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -77,7 +77,7 @@ import {
   tableDescription:
     "Configure rules for automatically executing on-call duty policies when matching alerts are created",
 })
-export default class AlertOnCallRule extends BaseModel {
+export default class AlertOnCallRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertOwnerRule.ts

@@ -4,7 +4,7 @@ import Monitor from "./Monitor";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -77,7 +77,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching alerts are created",
 })
-export default class AlertOwnerRule extends BaseModel {
+export default class AlertOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertPrivacyRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import Monitor from "./Monitor";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically marking matching alerts as private",
 })
-export default class AlertPrivacyRule extends BaseModel {
+export default class AlertPrivacyRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/AlertReminderRule.ts

@@ -2,7 +2,7 @@ import AlertSeverity from "./AlertSeverity";
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RelationOnlyRuleBaseModel from "./DatabaseBaseModel/RelationOnlyRuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -21,6 +21,7 @@ import Permission from "../../Types/Permission";
 import ReminderStopState from "../../Types/Reminder/ReminderStopState";
 import {
   Column,
+  Check,
   Entity,
   Index,
   JoinColumn,
@@ -59,6 +60,7 @@ import {
   ],
 })
 @CrudApiEndpoint(new Route("/alert-reminder-rule"))
+@Check(`"criteria" IS NULL OR "isEnabled" IS DISTINCT FROM true`)
 @Entity({
   name: "AlertReminderRule",
 })
@@ -76,7 +78,7 @@ import {
   tableDescription:
     "Configure reminder rules to periodically notify alert owners while an alert is still open",
 })
-export default class AlertReminderRule extends BaseModel {
+export default class AlertReminderRule extends RelationOnlyRuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -294,10 +296,10 @@ export default class AlertReminderRule extends BaseModel {
   })
   @Column({
     type: ColumnType.Boolean,
-    nullable: false,
+    nullable: true,
     default: true,
   })
-  public isEnabled?: boolean = undefined;
+  public isEnabled?: boolean | null = undefined;
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/AutoRemediationRule.ts

@@ -6,7 +6,7 @@ import Project from "./Project";
 import Runbook from "./Runbook";
 import Runner from "./Runner";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import AutoRemediationExecutionMode from "../../Types/AutoRemediation/AutoRemediationExecutionMode";
 import AutoRemediationTriggerEntity from "../../Types/AutoRemediation/AutoRemediationTriggerEntity";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Automatically propose or start remediation runbooks when matching incidents or alerts are created.",
 })
-export default class AutoRemediationRule extends BaseModel {
+export default class AutoRemediationRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/CephClusterLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to Ceph clusters when matching Ceph clusters are created",
 })
-export default class CephClusterLabelRule extends BaseModel {
+export default class CephClusterLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/CephClusterOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching Ceph clusters are created",
 })
-export default class CephClusterOwnerRule extends BaseModel {
+export default class CephClusterOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/CloudResourceLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Rules for automatically attaching labels to cloud resources when matching resources are created.",
 })
-export default class CloudResourceLabelRule extends BaseModel {
+export default class CloudResourceLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/CloudResourceOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Rules for automatically assigning owners to cloud resources when matching resources are created.",
 })
-export default class CloudResourceOwnerRule extends BaseModel {
+export default class CloudResourceOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/DashboardLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to dashboards when matching dashboards are created",
 })
-export default class DashboardLabelRule extends BaseModel {
+export default class DashboardLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/DashboardOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching dashboards are created",
 })
-export default class DashboardOwnerRule extends BaseModel {
+export default class DashboardOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/DatabaseBaseModel/RelationOnlyRuleBaseModel.ts

@@ -0,0 +1,11 @@
+import RuleBaseModel from "./RuleBaseModel";
+
+/**
+ * Marker base for rules whose legacy match fields are relations only.
+ *
+ * Criteria-backed rows encode logical enabled as a nullable legacy isEnabled
+ * value: null means enabled and false means disabled. Older workers query for
+ * true and therefore ignore both states while criteria-aware versions translate
+ * the value through DatabaseService.
+ */
+export default class RelationOnlyRuleBaseModel extends RuleBaseModel {}

package/Models/DatabaseModels/DatabaseBaseModel/RuleBaseModel.ts

@@ -0,0 +1,44 @@
+import { ColumnAccessControl } from "../../../Types/BaseDatabase/AccessControl";
+import ColumnType from "../../../Types/Database/ColumnType";
+import TableColumn from "../../../Types/Database/TableColumn";
+import TableColumnType from "../../../Types/Database/TableColumnType";
+import Dictionary from "../../../Types/Dictionary";
+import RuleCriteria from "../../../Types/Rules/RuleCriteria";
+import { Column } from "typeorm";
+import DatabaseBaseModel from "./DatabaseBaseModel";
+
+/**
+ * Shared persistence contract for resources configured through a rule form.
+ *
+ * The criteria column dynamically inherits the concrete model's table ACL.
+ * This avoids either widening access to a rule or accidentally requiring a
+ * permission that the table itself does not accept.
+ */
+export default class RuleBaseModel extends DatabaseBaseModel {
+  @TableColumn({
+    required: false,
+    type: TableColumnType.JSON,
+    title: "Match Criteria",
+    description:
+      "Versioned conditions that determine whether this rule matches a resource.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.JSON,
+  })
+  public criteria?: RuleCriteria | null = undefined;
+
+  public override getColumnAccessControlForAllColumns(): Dictionary<ColumnAccessControl> {
+    const dictionary: Dictionary<ColumnAccessControl> = {
+      ...super.getColumnAccessControlForAllColumns(),
+    };
+
+    dictionary["criteria"] = {
+      create: this.createRecordPermissions,
+      read: this.readRecordPermissions,
+      update: this.updateRecordPermissions,
+    };
+
+    return dictionary;
+  }
+}

package/Models/DatabaseModels/DockerHostLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to Docker hosts when matching Docker hosts are created",
 })
-export default class DockerHostLabelRule extends BaseModel {
+export default class DockerHostLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/DockerHostOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching Docker hosts are created",
 })
-export default class DockerHostOwnerRule extends BaseModel {
+export default class DockerHostOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/DockerSwarmClusterLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to DockerSwarm clusters when matching DockerSwarm clusters are created",
 })
-export default class DockerSwarmClusterLabelRule extends BaseModel {
+export default class DockerSwarmClusterLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/DockerSwarmClusterOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching DockerSwarm clusters are created",
 })
-export default class DockerSwarmClusterOwnerRule extends BaseModel {
+export default class DockerSwarmClusterOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/HostLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to hosts when matching hosts are created",
 })
-export default class HostLabelRule extends BaseModel {
+export default class HostLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/HostOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching hosts are created",
 })
-export default class HostOwnerRule extends BaseModel {
+export default class HostOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentEpisodeLabelRule.ts

@@ -2,7 +2,7 @@ import IncidentSeverity from "./IncidentSeverity";
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -75,7 +75,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to incident episodes when matching episodes are created",
 })
-export default class IncidentEpisodeLabelRule extends BaseModel {
+export default class IncidentEpisodeLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentEpisodeOnCallRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically executing on-call duty policies when matching incident episodes are created",
 })
-export default class IncidentEpisodeOnCallRule extends BaseModel {
+export default class IncidentEpisodeOnCallRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentEpisodeOwnerRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching incident episodes are created",
 })
-export default class IncidentEpisodeOwnerRule extends BaseModel {
+export default class IncidentEpisodeOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,