@oneuptime/common 10.4.10 → 10.4.11

package/Models/AnalyticsModels/ExceptionInstance.ts

@@ -9,6 +9,7 @@ import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { SpanStatus } from "./Span";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 
 export default class ExceptionInstance extends AnalyticsBaseModel {
   public constructor() {
@@ -44,7 +45,8 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
     const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "serviceId",
       title: "Service ID",
-      description: "ID of the Service which created the log",
+      description:
+        "ID of the resource the exception belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by serviceType)",
       required: true,
       type: TableColumnType.ObjectID,
       accessControl: {
@@ -69,6 +71,41 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       },
     });
 
+    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceType",
+      title: "Service Type",
+      description:
+        "Discriminator for serviceId — tells the read side which resource table to dispatch to",
+      required: false,
+      type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_service_type",
+        type: SkipIndexType.Set,
+        params: [10],
+        granularity: 4,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.TelemetryViewer,
+          Permission.ReadTelemetryException,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.CreateTelemetryException,
+        ],
+        update: [],
+      },
+    });
+
     const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "time",
       title: "Time",
@@ -601,6 +638,7 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
       tableColumns: [
         projectIdColumn,
         serviceIdColumn,
+        serviceTypeColumn,
         timeColumn,
         timeUnixNanoColumn,
         exceptionTypeColumn,
@@ -648,6 +686,14 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
     this.setColumnValue("serviceId", v);
   }
 
+  public get serviceType(): ServiceType | undefined {
+    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  }
+
+  public set serviceType(v: ServiceType | undefined) {
+    this.setColumnValue("serviceType", v);
+  }
+
   public get time(): Date | undefined {
     return this.getColumnValue("time") as Date | undefined;
   }

package/Models/AnalyticsModels/Log.ts

@@ -13,6 +13,7 @@ import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import LogSeverity from "../../Types/Log/LogSeverity";
 import Service from "../DatabaseModels/Service";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 
 @OperationalResource()
 @OwnedThrough("serviceId", Service)
@@ -50,7 +51,8 @@ export default class Log extends AnalyticsBaseModel {
     const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "serviceId",
       title: "Service ID",
-      description: "ID of the Service which created the log",
+      description:
+        "ID of the resource the log belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by serviceType)",
       required: true,
       type: TableColumnType.ObjectID,
       accessControl: {
@@ -75,6 +77,41 @@ export default class Log extends AnalyticsBaseModel {
       },
     });
 
+    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceType",
+      title: "Service Type",
+      description:
+        "Discriminator for serviceId — tells the read side which resource table to dispatch to",
+      required: false,
+      type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_service_type",
+        type: SkipIndexType.Set,
+        params: [10],
+        granularity: 4,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.TelemetryViewer,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
     const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "time",
       title: "Time",
@@ -506,6 +543,7 @@ export default class Log extends AnalyticsBaseModel {
       tableColumns: [
         projectIdColumn,
         serviceIdColumn,
+        serviceTypeColumn,
         timeColumn,
         timeUnixNanoColumn,
         severityTextColumn,
@@ -550,6 +588,14 @@ export default class Log extends AnalyticsBaseModel {
     this.setColumnValue("serviceId", v);
   }
 
+  public get serviceType(): ServiceType | undefined {
+    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  }
+
+  public set serviceType(v: ServiceType | undefined) {
+    this.setColumnValue("serviceType", v);
+  }
+
   public set body(v: string | undefined) {
     this.setColumnValue("body", v);
   }

package/Models/AnalyticsModels/Metric.ts

@@ -12,6 +12,7 @@ import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import Service from "../DatabaseModels/Service";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 
 export enum AggregationTemporality {
   Delta = "Delta",
@@ -26,13 +27,6 @@ export enum MetricPointType {
   Summary = "Summary",
 }
 
-export enum ServiceType {
-  OpenTelemetry = "OpenTelemetry",
-  Monitor = "Monitor",
-  Alert = "Alert",
-  Incident = "Incident",
-}
-
 @OperationalResource()
 @OwnedThrough("serviceId", Service)
 export default class Metric extends AnalyticsBaseModel {

package/Models/AnalyticsModels/Profile.ts

@@ -9,6 +9,7 @@ import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 
 export default class Profile extends AnalyticsBaseModel {
   public constructor() {
@@ -44,7 +45,8 @@ export default class Profile extends AnalyticsBaseModel {
     const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "serviceId",
       title: "Service ID",
-      description: "ID of the Service which created the profile",
+      description:
+        "ID of the resource the profile belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by serviceType)",
       required: true,
       type: TableColumnType.ObjectID,
       accessControl: {
@@ -69,6 +71,41 @@ export default class Profile extends AnalyticsBaseModel {
       },
     });
 
+    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceType",
+      title: "Service Type",
+      description:
+        "Discriminator for serviceId — tells the read side which resource table to dispatch to",
+      required: false,
+      type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_service_type",
+        type: SkipIndexType.Set,
+        params: [10],
+        granularity: 4,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.TelemetryViewer,
+          Permission.ReadTelemetryServiceProfiles,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.CreateTelemetryServiceProfiles,
+        ],
+        update: [],
+      },
+    });
+
     const profileIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "profileId",
       title: "Profile ID",
@@ -613,6 +650,7 @@ export default class Profile extends AnalyticsBaseModel {
       tableColumns: [
         projectIdColumn,
         serviceIdColumn,
+        serviceTypeColumn,
         profileIdColumn,
         traceIdColumn,
         spanIdColumn,
@@ -654,6 +692,14 @@ export default class Profile extends AnalyticsBaseModel {
     this.setColumnValue("serviceId", v);
   }
 
+  public get serviceType(): ServiceType | undefined {
+    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  }
+
+  public set serviceType(v: ServiceType | undefined) {
+    this.setColumnValue("serviceType", v);
+  }
+
   public get profileId(): string | undefined {
     return this.getColumnValue("profileId") as string | undefined;
   }

package/Models/AnalyticsModels/ProfileSample.ts

@@ -9,6 +9,7 @@ import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 
 export default class ProfileSample extends AnalyticsBaseModel {
   public constructor() {
@@ -44,7 +45,8 @@ export default class ProfileSample extends AnalyticsBaseModel {
     const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "serviceId",
       title: "Service ID",
-      description: "ID of the Service which created the profile",
+      description:
+        "ID of the resource the profile sample belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by serviceType)",
       required: true,
       type: TableColumnType.ObjectID,
       accessControl: {
@@ -69,6 +71,41 @@ export default class ProfileSample extends AnalyticsBaseModel {
       },
     });
 
+    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceType",
+      title: "Service Type",
+      description:
+        "Discriminator for serviceId — tells the read side which resource table to dispatch to",
+      required: false,
+      type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_service_type",
+        type: SkipIndexType.Set,
+        params: [10],
+        granularity: 4,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.TelemetryViewer,
+          Permission.ReadTelemetryServiceProfiles,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.CreateTelemetryServiceProfiles,
+        ],
+        update: [],
+      },
+    });
+
     const profileIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "profileId",
       title: "Profile ID",
@@ -475,6 +512,7 @@ export default class ProfileSample extends AnalyticsBaseModel {
       tableColumns: [
         projectIdColumn,
         serviceIdColumn,
+        serviceTypeColumn,
         profileIdColumn,
         traceIdColumn,
         spanIdColumn,
@@ -523,6 +561,14 @@ export default class ProfileSample extends AnalyticsBaseModel {
     this.setColumnValue("serviceId", v);
   }
 
+  public get serviceType(): ServiceType | undefined {
+    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  }
+
+  public set serviceType(v: ServiceType | undefined) {
+    this.setColumnValue("serviceType", v);
+  }
+
   public get profileId(): string | undefined {
     return this.getColumnValue("profileId") as string | undefined;
   }

package/Models/AnalyticsModels/Span.ts

@@ -12,6 +12,7 @@ import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import Service from "../DatabaseModels/Service";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 
 export enum SpanKind {
   Server = "SPAN_KIND_SERVER",
@@ -81,7 +82,8 @@ export default class Span extends AnalyticsBaseModel {
     const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "serviceId",
       title: "Service ID",
-      description: "ID of the Service which created the log",
+      description:
+        "ID of the resource the span belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by serviceType)",
       required: true,
       type: TableColumnType.ObjectID,
       accessControl: {
@@ -106,6 +108,41 @@ export default class Span extends AnalyticsBaseModel {
       },
     });
 
+    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "serviceType",
+      title: "Service Type",
+      description:
+        "Discriminator for serviceId — tells the read side which resource table to dispatch to",
+      required: false,
+      type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_service_type",
+        type: SkipIndexType.Set,
+        params: [10],
+        granularity: 4,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.TelemetryViewer,
+          Permission.ReadTelemetryServiceTraces,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.TelemetryAdmin,
+          Permission.TelemetryMember,
+          Permission.CreateTelemetryServiceTraces,
+        ],
+        update: [],
+      },
+    });
+
     const startTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "startTime",
       title: "Start Time",
@@ -766,6 +803,7 @@ export default class Span extends AnalyticsBaseModel {
       tableColumns: [
         projectIdColumn,
         serviceIdColumn,
+        serviceTypeColumn,
         startTimeColumn,
         endTimeColumn,
         startTimeUnixNanoColumn,
@@ -867,6 +905,14 @@ export default class Span extends AnalyticsBaseModel {
     this.setColumnValue("serviceId", v);
   }
 
+  public get serviceType(): ServiceType | undefined {
+    return this.getColumnValue("serviceType") as ServiceType | undefined;
+  }
+
+  public set serviceType(v: ServiceType | undefined) {
+    this.setColumnValue("serviceType", v);
+  }
+
   public get startTime(): Date | undefined {
     return this.getColumnValue("startTime") as Date | undefined;
   }

package/Models/DatabaseModels/DockerHost.ts

@@ -19,6 +19,7 @@ import UniqueColumnBy from "../../Types/Database/UniqueColumnBy";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import TelemetryRetentionConfig from "../../Types/Telemetry/TelemetryRetentionConfig";
 import {
   Column,
   Entity,
@@ -739,4 +740,86 @@ export default class DockerHost extends BaseModel {
     },
   })
   public labels?: Array<Label> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateDockerHost,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadDockerHost,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditDockerHost,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    title: "Retain Telemetry Data For Days",
+    description:
+      "Number of days to retain telemetry data for this Docker host. Leave blank to use the project-wide default.",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+    unique: false,
+  })
+  public retainTelemetryDataForDays?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateDockerHost,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadDockerHost,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditDockerHost,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.JSON,
+    required: false,
+    title: "Telemetry Data Retention Overrides",
+    description:
+      "Per-pillar retention overrides for this Docker host (logs by severity, traces by status, metrics, profiles). Unset fields fall back to the Docker host default, then the project's retention settings.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public telemetryRetentionConfig?: TelemetryRetentionConfig = undefined;
 }

package/Models/DatabaseModels/Host.ts

@@ -21,6 +21,7 @@ import UniqueColumnBy from "../../Types/Database/UniqueColumnBy";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import TelemetryRetentionConfig from "../../Types/Telemetry/TelemetryRetentionConfig";
 import {
   Column,
   Entity,
@@ -1055,4 +1056,86 @@ export default class Host extends BaseModel {
     },
   })
   public labels?: Array<Label> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateHost,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadHost,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditHost,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    title: "Retain Telemetry Data For Days",
+    description:
+      "Number of days to retain telemetry data for this host. Leave blank to use the project-wide default.",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+    unique: false,
+  })
+  public retainTelemetryDataForDays?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.CreateHost,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadHost,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.EditHost,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.JSON,
+    required: false,
+    title: "Telemetry Data Retention Overrides",
+    description:
+      "Per-pillar retention overrides for this host (logs by severity, traces by status, metrics, profiles). Unset fields fall back to the host default, then the project's retention settings.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public telemetryRetentionConfig?: TelemetryRetentionConfig = undefined;
 }

package/Models/DatabaseModels/Index.ts

@@ -226,7 +226,6 @@ import RunbookExecution from "./RunbookExecution";
 import RunbookOwnerTeam from "./RunbookOwnerTeam";
 import RunbookOwnerUser from "./RunbookOwnerUser";
 import RunbookRule from "./RunbookRule";
-import ServiceDependency from "./ServiceDependency";
 import ServiceMonitor from "./ServiceMonitor";
 
 import UserTotpAuth from "./UserTotpAuth";
@@ -618,7 +617,6 @@ const AllModelTypes: Array<{
   Service,
   ServiceOwnerTeam,
   ServiceOwnerUser,
-  ServiceDependency,
   ServiceMonitor,
   ServiceCodeRepository,