@oneuptime/common 10.5.8 → 10.5.17

package/Models/AnalyticsModels/ExceptionInstance.ts

@@ -15,7 +15,7 @@ import { SpanStatus } from "./Span";
 import ServiceType from "../../Types/Telemetry/ServiceType";
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service)
+@OwnedThrough("serviceId", Service, { includeProjectScope: true })
 export default class ExceptionInstance extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({

package/Models/AnalyticsModels/Log.ts

@@ -16,7 +16,7 @@ import Service from "../DatabaseModels/Service";
 import ServiceType from "../../Types/Telemetry/ServiceType";
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service)
+@OwnedThrough("serviceId", Service, { includeProjectScope: true })
 export default class Log extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({

package/Models/AnalyticsModels/Metric.ts

@@ -28,7 +28,7 @@ export enum MetricPointType {
 }
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service)
+@OwnedThrough("serviceId", Service, { includeProjectScope: true })
 export default class Metric extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({

package/Models/AnalyticsModels/Profile.ts

@@ -15,7 +15,7 @@ import Service from "../DatabaseModels/Service";
 import ServiceType from "../../Types/Telemetry/ServiceType";
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service)
+@OwnedThrough("serviceId", Service, { includeProjectScope: true })
 export default class Profile extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({

package/Models/AnalyticsModels/ProfileSample.ts

@@ -15,7 +15,7 @@ import Service from "../DatabaseModels/Service";
 import ServiceType from "../../Types/Telemetry/ServiceType";
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service)
+@OwnedThrough("serviceId", Service, { includeProjectScope: true })
 export default class ProfileSample extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({

package/Models/AnalyticsModels/Span.ts

@@ -47,7 +47,7 @@ export interface SpanLink {
 }
 
 @OperationalResource()
-@OwnedThrough("serviceId", Service)
+@OwnedThrough("serviceId", Service, { includeProjectScope: true })
 export default class Span extends AnalyticsBaseModel {
   public constructor() {
     const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({

package/Models/DatabaseModels/SmsLog.ts

@@ -9,6 +9,7 @@ import User from "./User";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
 import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
+import UserOnCallLogTimeline from "./UserOnCallLogTimeline";
 import Team from "./Team";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
@@ -258,6 +259,54 @@ export default class SmsLog extends BaseModel {
   })
   public status?: SmsStatus = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ReadSmsLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Provider Error Code",
+    description:
+      "Error code returned by the SMS provider (e.g. Twilio error code 30007 for carrier filtering) when the message could not be delivered.",
+    canReadOnRelationQuery: false,
+    example: "30007",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public errorCode?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Status Callback Token",
+    description:
+      "Secret token embedded in the provider delivery-status callback URL. Used to authenticate incoming delivery-status callbacks. Never exposed via the API.",
+    canReadOnRelationQuery: false,
+    hideColumnInDocumentation: true,
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public statusCallbackToken?: string = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [
@@ -895,6 +944,68 @@ export default class SmsLog extends BaseModel {
   })
   public onCallDutyPolicyScheduleId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ReadSmsLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "userOnCallLogTimelineId",
+    type: TableColumnType.Entity,
+    modelType: UserOnCallLogTimeline,
+    title: "User On-Call Log Timeline",
+    description:
+      "On-call notification timeline entry this SMS was sent for (if any). Lets the delivery outcome be reflected back onto the on-call log.",
+    example: "f1a2b3c4-d5e6-47f8-9a0b-1c2d3e4f5a6b",
+  })
+  @ManyToOne(
+    () => {
+      return UserOnCallLogTimeline;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "userOnCallLogTimelineId" })
+  public userOnCallLogTimeline?: UserOnCallLogTimeline = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ReadSmsLog,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "User On-Call Log Timeline ID",
+    description:
+      "ID of the on-call notification timeline entry this SMS was sent for (if any).",
+    example: "f1a2b3c4-d5e6-47f8-9a0b-1c2d3e4f5a6b",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public userOnCallLogTimelineId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/TelemetryException.ts

@@ -17,9 +17,13 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 import DatabaseBaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Service from "./Service";
+import Host from "./Host";
+import DockerHost from "./DockerHost";
+import KubernetesCluster from "./KubernetesCluster";
 
 @EnableDocumentation()
 @CanAccessIfCanReadOn("service")
@@ -60,7 +64,16 @@ import Service from "./Service";
   tableDescription:
     "List of all Telemetry Exceptions created for the telemetry service for this OneUptime project and it's status.",
 })
-@OwnedThrough("serviceId", Service)
+/*
+ * serviceId is polymorphic (see the column below) — it may reference a
+ * Service, Host, DockerHost or KubernetesCluster, or be the projectId for
+ * unattributed (Unknown) telemetry. Owned scope unions ownership across all
+ * of those resource types, and includeProjectScope lets in-project users
+ * see the unattributed bucket (which has no owner resource).
+ */
+@OwnedThrough("serviceId", [Service, Host, DockerHost, KubernetesCluster], {
+  includeProjectScope: true,
+})
 @Entity({
   name: "TelemetryException",
 })
@@ -150,6 +163,15 @@ export default class TelemetryException extends DatabaseBaseModel {
   })
   public projectId?: ObjectID = undefined;
 
+  /*
+   * serviceId is polymorphic (disambiguated by serviceType, mirroring the
+   * ClickHouse ExceptionInstance rows): it can be a real Service, a Host /
+   * DockerHost / KubernetesCluster id, or the projectId for unattributed
+   * (Unknown) telemetry. There is intentionally NO @ManyToOne(Service)
+   * relation — a Service join would only resolve OpenTelemetry rows and
+   * silently null out everything else. The read side resolves serviceId +
+   * serviceType to a resource per type (TelemetryServiceUtil) instead.
+   */
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -172,27 +194,21 @@ export default class TelemetryException extends DatabaseBaseModel {
       Permission.EditTelemetryException,
     ],
   })
+  @Index()
   @TableColumn({
-    manyToOneRelationColumn: "serviceId",
-    type: TableColumnType.Entity,
-    modelType: Service,
-    title: "Service",
-    description: "Relation to Service Resource in which this object belongs",
+    type: TableColumnType.ObjectID,
+    required: true,
+    title: "Service ID",
+    description:
+      "ID of the resource this exception belongs to (Service / Host / DockerHost / KubernetesCluster, or the projectId for unattributed telemetry — disambiguated by serviceType).",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
-  @ManyToOne(
-    () => {
-      return Service;
-    },
-    {
-      eager: false,
-      nullable: true,
-      onDelete: "CASCADE",
-      orphanedRowAction: "nullify",
-    },
-  )
-  @JoinColumn({ name: "serviceId" })
-  public service?: Service = undefined;
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
@@ -210,26 +226,22 @@ export default class TelemetryException extends DatabaseBaseModel {
       Permission.TelemetryViewer,
       Permission.ReadTelemetryException,
     ],
-    update: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.EditTelemetryException,
-    ],
+    update: [],
   })
-  @Index()
   @TableColumn({
-    type: TableColumnType.ObjectID,
-    required: true,
-    title: "Service ID",
-    description: "ID of your Service resource where this object belongs",
-    example: "d4e5f6a7-b8c9-0123-def1-234567890123",
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+    title: "Service Type",
+    description:
+      "Resource type that produced this exception (e.g. OpenTelemetry service, Host, DockerHost, KubernetesCluster, or Unknown for unattributed telemetry).",
+    example: "OpenTelemetry",
   })
   @Column({
-    type: ColumnType.ObjectID,
-    nullable: false,
-    transformer: ObjectID.getDatabaseTransformer(),
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
   })
-  public serviceId?: ObjectID = undefined;
+  public serviceType?: ServiceType = undefined;
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/TelemetryUsageBilling.ts

@@ -15,6 +15,7 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import Decimal from "../../Types/Decimal";
 import IconProp from "../../Types/Icon/IconProp";
 import ProductType from "../../Types/MeteredPlan/ProductType";
+import ServiceType from "../../Types/Telemetry/ServiceType";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@@ -270,8 +271,16 @@ export default class TelemetryUsageBilling extends BaseModel {
     {
       eager: false,
       nullable: true,
-      onDelete: "CASCADE",
-      orphanedRowAction: "nullify",
+      /*
+       * No DB-level foreign key. Telemetry that arrives without a
+       * service.name is metered against a synthetic "unattributed"
+       * bucket whose serviceId is the projectId (ServiceType.Unknown),
+       * which has no matching Service row — a FK would reject those
+       * billing rows. The relation is kept for read-side joins; it
+       * resolves to null for the unattributed bucket and the UI renders
+       * a synthetic "Unknown Service" in its place.
+       */
+      createForeignKeyConstraints: false,
     },
   )
   @JoinColumn({ name: "serviceId" })
@@ -301,6 +310,30 @@ export default class TelemetryUsageBilling extends BaseModel {
   })
   public serviceId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ManageProjectBilling,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+    title: "Service Type",
+    description:
+      "Resource type that produced this telemetry (e.g. OpenTelemetry service, Host, DockerHost, KubernetesCluster, or Unknown for unattributed telemetry).",
+    example: "OpenTelemetry",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public serviceType?: ServiceType = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [],

package/Server/API/AIAgentDataAPI.ts

@@ -1,6 +1,7 @@
 import AIAgentService from "../Services/AIAgentService";
 import LlmProviderService from "../Services/LlmProviderService";
 import TelemetryExceptionService from "../Services/TelemetryExceptionService";
+import ServiceService from "../Services/ServiceService";
 import ServiceCodeRepositoryService from "../Services/ServiceCodeRepositoryService";
 import CodeRepositoryService from "../Services/CodeRepositoryService";
 import AIAgentTaskPullRequestService from "../Services/AIAgentTaskPullRequestService";
@@ -15,6 +16,7 @@ import Response from "../Utils/Response";
 import AIAgent from "../../Models/DatabaseModels/AIAgent";
 import LlmProvider from "../../Models/DatabaseModels/LlmProvider";
 import TelemetryException from "../../Models/DatabaseModels/TelemetryException";
+import Service from "../../Models/DatabaseModels/Service";
 import ServiceCodeRepository from "../../Models/DatabaseModels/ServiceCodeRepository";
 import CodeRepository from "../../Models/DatabaseModels/CodeRepository";
 import AIAgentTaskPullRequest from "../../Models/DatabaseModels/AIAgentTaskPullRequest";
@@ -174,11 +176,7 @@ export default class AIAgentDataAPI {
                 exceptionType: true,
                 fingerprint: true,
                 serviceId: true,
-                service: {
-                  _id: true,
-                  name: true,
-                  description: true,
-                },
+                serviceType: true,
               },
               props: {
                 isRoot: true,
@@ -198,6 +196,26 @@ export default class AIAgentDataAPI {
             getLogAttributesFromRequest(req as any),
           );
 
+          /*
+           * serviceId is polymorphic — resolve the Service only when it is
+           * a real Service. findOneById returns null for Host / DockerHost /
+           * KubernetesCluster / unattributed serviceIds (they aren't
+           * Services), preserving the previous "name only for real
+           * services" behaviour without the dropped ORM relation.
+           */
+          const exceptionService: Service | null = exception.serviceId
+            ? await ServiceService.findOneById({
+                id: exception.serviceId,
+                select: {
+                  name: true,
+                  description: true,
+                },
+                props: {
+                  isRoot: true,
+                },
+              })
+            : null;
+
           return Response.sendJsonObjectResponse(req, res, {
             exception: {
               id: exception._id?.toString(),
@@ -209,8 +227,8 @@ export default class AIAgentDataAPI {
             service: exception.serviceId
               ? {
                   id: exception.serviceId.toString(),
-                  name: exception.service?.name,
-                  description: exception.service?.description,
+                  name: exceptionService?.name,
+                  description: exceptionService?.description,
                 }
               : null,
           });