@oneuptime/common 9.3.8 → 9.3.10

package/Models/DatabaseModels/AIAgentTask.ts

@@ -205,7 +205,12 @@ export default class AIAgentTask extends BaseModel {
   public description?: string = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectAIAgentTask,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -242,7 +247,12 @@ export default class AIAgentTask extends BaseModel {
   public aiAgent?: AIAgent = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectAIAgentTask,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -522,7 +532,12 @@ export default class AIAgentTask extends BaseModel {
   public createdByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectAIAgentTask,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,

package/Models/DatabaseModels/Index.ts

@@ -138,7 +138,6 @@ import Team from "./Team";
 import TeamMember from "./TeamMember";
 import TeamPermission from "./TeamPermission";
 import TeamComplianceSetting from "./TeamComplianceSetting";
-import TelemetryService from "./TelemetryService";
 import UsageBilling from "./TelemetryUsageBilling";
 import User from "./User";
 import UserSession from "./UserSession";
@@ -159,7 +158,6 @@ import WorkflowLog from "./WorkflowLog";
 import WorkflowVariables from "./WorkflowVariable";
 import ServiceDependency from "./ServiceDependency";
 import ServiceMonitor from "./ServiceMonitor";
-import ServiceTelemetryService from "./ServiceTelemetryService";
 
 import UserTotpAuth from "./UserTotpAuth";
 import UserWebAuthn from "./UserWebAuthn";
@@ -354,8 +352,6 @@ const AllModelTypes: Array<{
   MonitorGroupOwnerUser,
   MonitorGroupResource,
 
-  TelemetryService,
-
   OnCallDutyPolicySchedule,
   OnCallDutyPolicyScheduleLayer,
   OnCallDutyPolicyScheduleLayerUser,
@@ -377,7 +373,6 @@ const AllModelTypes: Array<{
   ServiceOwnerUser,
   ServiceDependency,
   ServiceMonitor,
-  ServiceTelemetryService,
   ServiceCodeRepository,
 
   // Code Repository

package/Models/DatabaseModels/MetricType.ts

@@ -27,7 +27,7 @@ import {
   ManyToOne,
 } from "typeorm";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
-import TelemetryService from "./TelemetryService";
+import Service from "./Service";
 
 @EnableDocumentation()
 @TenantColumn("projectId")
@@ -133,20 +133,20 @@ export default class MetricType extends BaseModel {
   @TableColumn({
     required: false,
     type: TableColumnType.EntityArray,
-    modelType: TelemetryService,
-    title: "Telemetry Services",
+    modelType: Service,
+    title: "Services",
     description: "List of services this metric is related to",
   })
   @ManyToMany(
     () => {
-      return TelemetryService;
+      return Service;
     },
     { eager: false },
   )
   @JoinTable({
-    name: "MetricTypeTelemetryService",
+    name: "MetricTypeService",
     inverseJoinColumn: {
-      name: "telemetryServiceId",
+      name: "serviceId",
       referencedColumnName: "_id",
     },
     joinColumn: {
@@ -154,7 +154,7 @@ export default class MetricType extends BaseModel {
       referencedColumnName: "_id",
     },
   })
-  public telemetryServices?: Array<TelemetryService> = undefined;
+  public services?: Array<Service> = undefined;
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/Service.ts

@@ -3,11 +3,9 @@ import Project from "./Project";
 import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
-import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import Color from "../../Types/Color";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
-import TableBillingAccessControl from "../../Types/Database/AccessControl/TableBillingAccessControl";
 import AccessControlColumn from "../../Types/Database/AccessControlColumn";
 import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
@@ -38,12 +36,6 @@ import {
 @AccessControlColumn("labels")
 @EnableDocumentation()
 @TenantColumn("projectId")
-@TableBillingAccessControl({
-  create: PlanType.Growth,
-  read: PlanType.Growth,
-  update: PlanType.Growth,
-  delete: PlanType.Growth,
-})
 @TableAccessControl({
   create: [
     Permission.ProjectOwner,
@@ -519,4 +511,38 @@ export default class Service extends BaseModel {
     type: ColumnType.JSON,
   })
   public techStack?: Array<TechStack> = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateService,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ProjectMember,
+      Permission.ReadService,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditService,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    title: "Retain Telemetry Data For Days",
+    description: "Number of days to retain telemetry data for this service.",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+    unique: false,
+    default: 15,
+  })
+  public retainTelemetryDataForDays?: number = undefined;
 }

package/Models/DatabaseModels/TelemetryException.ts

@@ -17,7 +17,7 @@ import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 import DatabaseBaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
-import TelemetryService from "./TelemetryService";
+import Service from "./Service";
 
 @EnableDocumentation()
 @TenantColumn("projectId")
@@ -142,17 +142,16 @@ export default class TelemetryException extends DatabaseBaseModel {
     ],
   })
   @TableColumn({
-    manyToOneRelationColumn: "telemetryServiceId",
+    manyToOneRelationColumn: "serviceId",
     type: TableColumnType.Entity,
-    modelType: TelemetryService,
-    title: "Telemetry Service",
-    description:
-      "Relation to Telemetry Service Resource in which this object belongs",
+    modelType: Service,
+    title: "Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @ManyToOne(
     () => {
-      return TelemetryService;
+      return Service;
     },
     {
       eager: false,
@@ -161,8 +160,8 @@ export default class TelemetryException extends DatabaseBaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "telemetryServiceId" })
-  public telemetryService?: TelemetryService = undefined;
+  @JoinColumn({ name: "serviceId" })
+  public service?: Service = undefined;
 
   @ColumnAccessControl({
     create: [
@@ -186,9 +185,8 @@ export default class TelemetryException extends DatabaseBaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     required: true,
-    title: "Telemetry Service ID",
-    description:
-      "ID of your Telemetry Service resource where this object belongs",
+    title: "Service ID",
+    description: "ID of your Service resource where this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @Column({
@@ -196,7 +194,7 @@ export default class TelemetryException extends DatabaseBaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public telemetryServiceId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/TelemetryUsageBilling.ts

@@ -1,5 +1,5 @@
 import Project from "./Project";
-import TelemetryService from "./TelemetryService";
+import Service from "./Service";
 import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
@@ -256,17 +256,16 @@ export default class TelemetryUsageBilling extends BaseModel {
     update: [],
   })
   @TableColumn({
-    manyToOneRelationColumn: "telemetryServiceId",
+    manyToOneRelationColumn: "serviceId",
     type: TableColumnType.Entity,
-    modelType: TelemetryService,
-    title: "Telemetry Service",
-    description:
-      "Relation to Telemetry Service Resource in which this object belongs",
+    modelType: Service,
+    title: "Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @ManyToOne(
     () => {
-      return TelemetryService;
+      return Service;
     },
     {
       eager: false,
@@ -275,8 +274,8 @@ export default class TelemetryUsageBilling extends BaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "telemetryServiceId" })
-  public telemetryService?: TelemetryService = undefined;
+  @JoinColumn({ name: "serviceId" })
+  public service?: Service = undefined;
 
   @ColumnAccessControl({
     create: [],
@@ -291,9 +290,8 @@ export default class TelemetryUsageBilling extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     required: true,
-    title: "Telemetry Service ID",
-    description:
-      "ID of your Telemetry Service resource where this object belongs",
+    title: "Service ID",
+    description: "ID of your Service resource where this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @Column({
@@ -301,7 +299,7 @@ export default class TelemetryUsageBilling extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public telemetryServiceId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [],

package/Server/API/AIAgentDataAPI.ts

@@ -1,7 +1,6 @@
 import AIAgentService from "../Services/AIAgentService";
 import LlmProviderService from "../Services/LlmProviderService";
 import TelemetryExceptionService from "../Services/TelemetryExceptionService";
-import ServiceTelemetryServiceService from "../Services/ServiceTelemetryServiceService";
 import ServiceCodeRepositoryService from "../Services/ServiceCodeRepositoryService";
 import CodeRepositoryService from "../Services/CodeRepositoryService";
 import AIAgentTaskPullRequestService from "../Services/AIAgentTaskPullRequestService";
@@ -16,7 +15,6 @@ import Response from "../Utils/Response";
 import AIAgent from "../../Models/DatabaseModels/AIAgent";
 import LlmProvider from "../../Models/DatabaseModels/LlmProvider";
 import TelemetryException from "../../Models/DatabaseModels/TelemetryException";
-import ServiceTelemetryService from "../../Models/DatabaseModels/ServiceTelemetryService";
 import ServiceCodeRepository from "../../Models/DatabaseModels/ServiceCodeRepository";
 import CodeRepository from "../../Models/DatabaseModels/CodeRepository";
 import AIAgentTaskPullRequest from "../../Models/DatabaseModels/AIAgentTaskPullRequest";
@@ -164,7 +162,7 @@ export default class AIAgentDataAPI {
             data["exceptionId"] as string,
           );
 
-          // Get exception with telemetry service
+          // Get exception with service
           const exception: TelemetryException | null =
             await TelemetryExceptionService.findOneById({
               id: exceptionId,
@@ -174,8 +172,8 @@ export default class AIAgentDataAPI {
                 stackTrace: true,
                 exceptionType: true,
                 fingerprint: true,
-                telemetryServiceId: true,
-                telemetryService: {
+                serviceId: true,
+                service: {
                   _id: true,
                   name: true,
                   description: true,
@@ -206,11 +204,11 @@ export default class AIAgentDataAPI {
               exceptionType: exception.exceptionType,
               fingerprint: exception.fingerprint,
             },
-            telemetryService: exception.telemetryServiceId
+            service: exception.serviceId
               ? {
-                  id: exception.telemetryServiceId.toString(),
-                  name: exception.telemetryService?.name,
-                  description: exception.telemetryService?.description,
+                  id: exception.serviceId.toString(),
+                  name: exception.service?.name,
+                  description: exception.service?.description,
                 }
               : null,
           });
@@ -220,7 +218,7 @@ export default class AIAgentDataAPI {
       },
     );
 
-    // Get code repositories linked to a telemetry service via Service
+    // Get code repositories linked to a service
     this.router.post(
       "/ai-agent-data/get-code-repositories",
       async (
@@ -242,54 +240,22 @@ export default class AIAgentDataAPI {
             );
           }
 
-          // Get telemetry service ID
-          if (!data["telemetryServiceId"]) {
+          // Get service ID (supports both serviceId and legacy telemetryServiceId)
+          const serviceIdParam: string | undefined =
+            (data["serviceId"] as string) ||
+            (data["telemetryServiceId"] as string);
+
+          if (!serviceIdParam) {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadDataException("telemetryServiceId is required"),
-            );
-          }
-
-          const telemetryServiceId: ObjectID = new ObjectID(
-            data["telemetryServiceId"] as string,
-          );
-
-          // Step 1: Find Services linked to this TelemetryService
-          const serviceTelemetryServices: Array<ServiceTelemetryService> =
-            await ServiceTelemetryServiceService.findBy({
-              query: {
-                telemetryServiceId: telemetryServiceId,
-              },
-              select: {
-                serviceId: true,
-              },
-              skip: 0,
-              limit: LIMIT_MAX,
-              props: {
-                isRoot: true,
-              },
-            });
-
-          if (serviceTelemetryServices.length === 0) {
-            logger.debug(
-              `No services found for telemetry service ${telemetryServiceId.toString()}`,
+              new BadDataException("serviceId is required"),
             );
-            return Response.sendJsonObjectResponse(req, res, {
-              repositories: [],
-            });
           }
 
-          // Extract service IDs
-          const serviceIds: Array<ObjectID> = serviceTelemetryServices
-            .filter((s: ServiceTelemetryService) => {
-              return s.serviceId;
-            })
-            .map((s: ServiceTelemetryService) => {
-              return s.serviceId as ObjectID;
-            });
+          const serviceId: ObjectID = new ObjectID(serviceIdParam);
 
-          // Step 2: Find CodeRepositories linked to these Services
+          // Find CodeRepositories linked to this Service
           const repositories: Array<{
             id: string;
             name: string;
@@ -301,70 +267,67 @@ export default class AIAgentDataAPI {
             gitHubAppInstallationId: string | null;
           }> = [];
 
-          for (const serviceId of serviceIds) {
-            const serviceCodeRepositories: Array<ServiceCodeRepository> =
-              await ServiceCodeRepositoryService.findBy({
-                query: {
-                  serviceId: serviceId,
-                },
-                select: {
-                  codeRepositoryId: true,
-                  servicePathInRepository: true,
-                  codeRepository: {
-                    _id: true,
-                    name: true,
-                    repositoryHostedAt: true,
-                    organizationName: true,
-                    repositoryName: true,
-                    mainBranchName: true,
-                    gitHubAppInstallationId: true,
-                  },
+          const serviceCodeRepositories: Array<ServiceCodeRepository> =
+            await ServiceCodeRepositoryService.findBy({
+              query: {
+                serviceId: serviceId,
+              },
+              select: {
+                codeRepositoryId: true,
+                servicePathInRepository: true,
+                codeRepository: {
+                  _id: true,
+                  name: true,
+                  repositoryHostedAt: true,
+                  organizationName: true,
+                  repositoryName: true,
+                  mainBranchName: true,
+                  gitHubAppInstallationId: true,
                 },
-                skip: 0,
-                limit: LIMIT_MAX,
-                props: {
-                  isRoot: true,
+              },
+              skip: 0,
+              limit: LIMIT_MAX,
+              props: {
+                isRoot: true,
+              },
+            });
+
+          for (const scr of serviceCodeRepositories) {
+            if (scr.codeRepository) {
+              // Check if we already have this repository
+              const existingRepo: boolean = repositories.some(
+                (r: {
+                  id: string;
+                  name: string;
+                  repositoryHostedAt: string;
+                  organizationName: string;
+                  repositoryName: string;
+                  mainBranchName: string;
+                  servicePathInRepository: string | null;
+                  gitHubAppInstallationId: string | null;
+                }) => {
+                  return r.id === scr.codeRepository?._id?.toString();
                 },
-              });
-
-            for (const scr of serviceCodeRepositories) {
-              if (scr.codeRepository) {
-                // Check if we already have this repository
-                const existingRepo: boolean = repositories.some(
-                  (r: {
-                    id: string;
-                    name: string;
-                    repositoryHostedAt: string;
-                    organizationName: string;
-                    repositoryName: string;
-                    mainBranchName: string;
-                    servicePathInRepository: string | null;
-                    gitHubAppInstallationId: string | null;
-                  }) => {
-                    return r.id === scr.codeRepository?._id?.toString();
-                  },
-                );
-                if (!existingRepo) {
-                  repositories.push({
-                    id: scr.codeRepository._id?.toString() || "",
-                    name: scr.codeRepository.name || "",
-                    repositoryHostedAt:
-                      scr.codeRepository.repositoryHostedAt || "",
-                    organizationName: scr.codeRepository.organizationName || "",
-                    repositoryName: scr.codeRepository.repositoryName || "",
-                    mainBranchName: scr.codeRepository.mainBranchName || "main",
-                    servicePathInRepository:
-                      scr.servicePathInRepository || null,
-                    gitHubAppInstallationId:
-                      scr.codeRepository.gitHubAppInstallationId || null,
-                  });
-                }
+              );
+              if (!existingRepo) {
+                repositories.push({
+                  id: scr.codeRepository._id?.toString() || "",
+                  name: scr.codeRepository.name || "",
+                  repositoryHostedAt:
+                    scr.codeRepository.repositoryHostedAt || "",
+                  organizationName: scr.codeRepository.organizationName || "",
+                  repositoryName: scr.codeRepository.repositoryName || "",
+                  mainBranchName: scr.codeRepository.mainBranchName || "main",
+                  servicePathInRepository: scr.servicePathInRepository || null,
+                  gitHubAppInstallationId:
+                    scr.codeRepository.gitHubAppInstallationId || null,
+                });
               }
             }
           }
 
           logger.debug(
-            `Found ${repositories.length} code repositories for telemetry service ${telemetryServiceId.toString()}`,
+            `Found ${repositories.length} code repositories for service ${serviceId.toString()}`,
           );
 
           return Response.sendJsonObjectResponse(req, res, {