@oneuptime/common 9.3.7 → 9.3.9

package/build/dist/Server/Services/Index.js

@@ -83,12 +83,11 @@ import ScheduledMaintenancePublicNoteService from "./ScheduledMaintenancePublicN
 import ScheduledMaintenanceService from "./ScheduledMaintenanceService";
 import ScheduledMaintenanceStateService from "./ScheduledMaintenanceStateService";
 import ScheduledMaintenanceStateTimelineService from "./ScheduledMaintenanceStateTimelineService";
-import ServiceCatalogOwnerTeamService from "./ServiceCatalogOwnerTeamService";
-import ServiceCatalogOwnerUserService from "./ServiceCatalogOwnerUserService";
-import ServiceCatalogService from "./ServiceCatalogService";
-import ServiceCatalogMonitorService from "./ServiceCatalogMonitorService";
-import ServiceCatalogTelemetryServiceService from "./ServiceCatalogTelemetryServiceService";
-import ServiceCatalogCodeRepositoryService from "./ServiceCatalogCodeRepositoryService";
+import ServiceOwnerTeamService from "./ServiceOwnerTeamService";
+import ServiceOwnerUserService from "./ServiceOwnerUserService";
+import ServiceService from "./ServiceService";
+import ServiceMonitorService from "./ServiceMonitorService";
+import ServiceCodeRepositoryService from "./ServiceCodeRepositoryService";
 import ShortLinkService from "./ShortLinkService";
 // SMS Log Service
 import SmsLogService from "./SmsLogService";
@@ -119,7 +118,6 @@ import TeamPermissionService from "./TeamPermissionService";
 import TeamComplianceSettingService from "./TeamComplianceSettingService";
 // Team
 import TeamService from "./TeamService";
-import TelemetryServiceService from "./TelemetryServiceService";
 import UsageBillingService from "./TelemetryUsageBillingService";
 import UserCallService from "./UserCallService";
 import UserEmailService from "./UserEmailService";
@@ -137,7 +135,7 @@ import WorkflowLogService from "./WorkflowLogService";
 // Workflows.
 import WorkflowService from "./WorkflowService";
 import WorkflowVariablesService from "./WorkflowVariableService";
-import ServiceCatalogDependencyService from "./ServiceCatalogDependencyService";
+import ServiceDependencyService from "./ServiceDependencyService";
 import TelemetryExceptionService from "./TelemetryExceptionService";
 import ExceptionInstanceService from "./ExceptionInstanceService";
 import ScheduledMaintenanceTemplateService from "./ScheduledMaintenanceTemplateService";
@@ -284,7 +282,6 @@ const services = [
     MonitorGroupResourceService,
     MonitorGroupOwnerUserService,
     MonitorGroupOwnerTeamService,
-    TelemetryServiceService,
     // On Call Duty Policy Schedule
     OnCallDutyPolicyScheduleService,
     OnCallDutyPolicyScheduleLayerUserService,
@@ -292,13 +289,12 @@ const services = [
     OnCallDutyPolicyEscalationRuleScheduleService,
     UsageBillingService,
     ProjectCallSMSConfigService,
-    ServiceCatalogService,
-    ServiceCatalogOwnerTeamService,
-    ServiceCatalogOwnerUserService,
-    ServiceCatalogDependencyService,
-    ServiceCatalogMonitorService,
-    ServiceCatalogTelemetryServiceService,
-    ServiceCatalogCodeRepositoryService,
+    ServiceService,
+    ServiceOwnerTeamService,
+    ServiceOwnerUserService,
+    ServiceDependencyService,
+    ServiceMonitorService,
+    ServiceCodeRepositoryService,
     TelemetryExceptionService,
     // scheduled maintenance templates
     ScheduledMaintenanceTemplateService,

package/build/dist/Server/Services/Index.js.map

@@ -1 +1 @@
-{"version":3,"file":"Index.js","sourceRoot":"","sources":["../../../../Server/Services/Index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Index.js","sourceRoot":"","sources":["../../../../Server/Services/Index.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/OpenTelemetryIngestService.js

@@ -9,8 +9,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import OneUptimeDate from "../../Types/Date";
 import Metric, { AggregationTemporality, } from "../../Models/AnalyticsModels/Metric";
-import TelemetryService from "../../Models/DatabaseModels/TelemetryService";
-import TelemetryServiceService from "../../Server/Services/TelemetryServiceService";
+import Service from "../../Models/DatabaseModels/Service";
+import ServiceService from "../../Server/Services/ServiceService";
 import { DEFAULT_RETENTION_IN_DAYS } from "../../Models/DatabaseModels/TelemetryUsageBilling";
 import TelemetryUtil from "../../Server/Utils/Telemetry/Telemetry";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
@@ -21,7 +21,7 @@ export var OtelAggregationTemporality;
 })(OtelAggregationTemporality || (OtelAggregationTemporality = {}));
 export default class OTelIngestService {
     static async telemetryServiceFromName(data) {
-        const service = await TelemetryServiceService.findOneBy({
+        const service = await ServiceService.findOneBy({
             query: {
                 projectId: data.projectId,
                 name: data.serviceName,
@@ -36,12 +36,12 @@ export default class OTelIngestService {
         });
         if (!service) {
             // create service
-            const newService = new TelemetryService();
+            const newService = new Service();
             newService.projectId = data.projectId;
             newService.name = data.serviceName;
             newService.description = data.serviceName;
             newService.retainTelemetryDataForDays = DEFAULT_RETENTION_IN_DAYS;
-            const createdService = await TelemetryServiceService.create({
+            const createdService = await ServiceService.create({
                 data: newService,
                 props: {
                     isRoot: true,
@@ -129,8 +129,8 @@ export default class OTelIngestService {
                 newDbMetric.attributes = {};
             }
             newDbMetric.attributes = Object.assign(Object.assign({}, TelemetryUtil.getAttributesForServiceIdAndServiceName({
-                serviceId: data.telemetryServiceId,
-                serviceName: data.telemetryServiceName,
+                serviceId: data.serviceId,
+                serviceName: data.serviceName,
             })), TelemetryUtil.getAttributes({
                 items: datapoint["attributes"] || [],
                 prefixKeysWithString: "metricAttributes",

package/build/dist/Server/Services/OpenTelemetryIngestService.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenTelemetryIngestService.js","sourceRoot":"","sources":["../../../../Server/Services/OpenTelemetryIngestService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OpenTelemetryIngestService.js","sourceRoot":"","sources":["../../../../Server/Services/OpenTelemetryIngestService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/{ServiceCatalogCodeRepositoryService.js → ServiceCodeRepositoryService.js}

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import BadDataException from "../../Types/Exception/BadDataException";
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogCodeRepository";
+import Model from "../../Models/DatabaseModels/ServiceCodeRepository";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 export class Service extends DatabaseService {
     constructor() {
@@ -17,18 +17,18 @@ export class Service extends DatabaseService {
     }
     async onBeforeCreate(createBy) {
         var _a, _b;
-        if (!createBy.data.serviceCatalogId && !createBy.data.serviceCatalog) {
-            throw new BadDataException("serviceCatalog is required");
+        if (!createBy.data.serviceId && !createBy.data.service) {
+            throw new BadDataException("service is required");
         }
         if (!createBy.data.codeRepository && !createBy.data.codeRepositoryId) {
             throw new BadDataException("codeRepository is required");
         }
-        const serviceCatalogId = createBy.data.serviceCatalogId || ((_a = createBy.data.serviceCatalog) === null || _a === void 0 ? void 0 : _a._id);
+        const serviceId = createBy.data.serviceId || ((_a = createBy.data.service) === null || _a === void 0 ? void 0 : _a._id);
         const codeRepositoryId = createBy.data.codeRepositoryId || ((_b = createBy.data.codeRepository) === null || _b === void 0 ? void 0 : _b._id);
-        // check if this code repository is already added to the service catalog for this service.
+        // check if this code repository is already added to the service for this service.
         const existingCodeRepository = await this.findOneBy({
             query: {
-                serviceCatalogId: serviceCatalogId,
+                serviceId: serviceId,
                 codeRepositoryId: codeRepositoryId,
             },
             props: {
@@ -51,4 +51,4 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Service.prototype, "onBeforeCreate", null);
 export default new Service();
-//# sourceMappingURL=ServiceCatalogCodeRepositoryService.js.map
+//# sourceMappingURL=ServiceCodeRepositoryService.js.map

package/build/dist/Server/Services/ServiceCodeRepositoryService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceCodeRepositoryService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceCodeRepositoryService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAGtE,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,mDAAmD,CAAC;AAEtE,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACvD,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACrE,MAAM,IAAI,gBAAgB,CAAC,4BAA4B,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,SAAS,GACb,QAAQ,CAAC,IAAI,CAAC,SAAS,KAAI,MAAA,QAAQ,CAAC,IAAI,CAAC,OAAO,0CAAE,GAAG,CAAA,CAAC;QACxD,MAAM,gBAAgB,GACpB,QAAQ,CAAC,IAAI,CAAC,gBAAgB,KAAI,MAAA,QAAQ,CAAC,IAAI,CAAC,cAAc,0CAAE,GAAG,CAAA,CAAC;QAEtE,kFAAkF;QAClF,MAAM,sBAAsB,GAAiB,MAAM,IAAI,CAAC,SAAS,CAAC;YAChE,KAAK,EAAE;gBACL,SAAS,EAAE,SAAqB;gBAChC,gBAAgB,EAAE,gBAA4B;aAC/C;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IAAI,sBAAsB,EAAE,CAAC;YAC3B,MAAM,IAAI,gBAAgB,CACxB,iDAAiD,CAClD,CAAC;QACJ,CAAC;QAED,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;CACF;AAtC0B;IADxB,WAAW,EAAE;;;;6CAsCb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/{ServiceCatalogDependencyService.js → ServiceDependencyService.js}

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import BadDataException from "../../Types/Exception/BadDataException";
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogDependency";
+import Model from "../../Models/DatabaseModels/ServiceDependency";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 export class Service extends DatabaseService {
     constructor() {
@@ -18,18 +18,17 @@ export class Service extends DatabaseService {
     async onBeforeCreate(createBy) {
         // select a random color.
         var _a, _b;
-        if (!createBy.data.serviceCatalogId && !createBy.data.serviceCatalog) {
-            throw new BadDataException("serviceCatalog is required");
+        if (!createBy.data.serviceId && !createBy.data.service) {
+            throw new BadDataException("service is required");
         }
-        if (!createBy.data.dependencyServiceCatalogId &&
-            !createBy.data.dependencyServiceCatalog) {
-            throw new BadDataException("dependencyServiceCatalog is required");
+        if (!createBy.data.dependencyServiceId &&
+            !createBy.data.dependencyService) {
+            throw new BadDataException("dependencyService is required");
         }
-        // serviceCatalogId and dependencyServiceCatalogId should not be the same
-        const serviceCatalogId = createBy.data.serviceCatalogId || ((_a = createBy.data.serviceCatalog) === null || _a === void 0 ? void 0 : _a._id);
-        const dependencyServiceCatalogId = createBy.data.dependencyServiceCatalogId ||
-            ((_b = createBy.data.dependencyServiceCatalog) === null || _b === void 0 ? void 0 : _b._id);
-        if ((serviceCatalogId === null || serviceCatalogId === void 0 ? void 0 : serviceCatalogId.toString()) === (dependencyServiceCatalogId === null || dependencyServiceCatalogId === void 0 ? void 0 : dependencyServiceCatalogId.toString())) {
+        // serviceId and dependencyServiceId should not be the same
+        const serviceId = createBy.data.serviceId || ((_a = createBy.data.service) === null || _a === void 0 ? void 0 : _a._id);
+        const dependencyServiceId = createBy.data.dependencyServiceId || ((_b = createBy.data.dependencyService) === null || _b === void 0 ? void 0 : _b._id);
+        if ((serviceId === null || serviceId === void 0 ? void 0 : serviceId.toString()) === (dependencyServiceId === null || dependencyServiceId === void 0 ? void 0 : dependencyServiceId.toString())) {
             throw new BadDataException("Service cannot depend on itself.");
         }
         return {
@@ -45,4 +44,4 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Service.prototype, "onBeforeCreate", null);
 export default new Service();
-//# sourceMappingURL=ServiceCatalogDependencyService.js.map
+//# sourceMappingURL=ServiceDependencyService.js.map

package/build/dist/Server/Services/ServiceDependencyService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceDependencyService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceDependencyService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAGtE,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,+CAA+C,CAAC;AAElE,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,yBAAyB;;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACvD,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,IACE,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB;YAClC,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAChC,CAAC;YACD,MAAM,IAAI,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;QAC9D,CAAC;QAED,2DAA2D;QAC3D,MAAM,SAAS,GACb,QAAQ,CAAC,IAAI,CAAC,SAAS,KAAI,MAAA,QAAQ,CAAC,IAAI,CAAC,OAAO,0CAAE,GAAG,CAAA,CAAC;QACxD,MAAM,mBAAmB,GACvB,QAAQ,CAAC,IAAI,CAAC,mBAAmB,KAAI,MAAA,QAAQ,CAAC,IAAI,CAAC,iBAAiB,0CAAE,GAAG,CAAA,CAAC;QAE5E,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAE,OAAK,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,QAAQ,EAAE,CAAA,EAAE,CAAC;YAC9D,MAAM,IAAI,gBAAgB,CAAC,kCAAkC,CAAC,CAAC;QACjE,CAAC;QAED,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;CACF;AA/B0B;IADxB,WAAW,EAAE;;;;6CA+Bb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/{ServiceCatalogMonitorService.js → ServiceMonitorService.js}

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import BadDataException from "../../Types/Exception/BadDataException";
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogMonitor";
+import Model from "../../Models/DatabaseModels/ServiceMonitor";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 export class Service extends DatabaseService {
     constructor() {
@@ -18,19 +18,19 @@ export class Service extends DatabaseService {
     async onBeforeCreate(createBy) {
         // select a random color.
         var _a, _b;
-        if (!createBy.data.serviceCatalogId && !createBy.data.serviceCatalog) {
-            throw new BadDataException("serviceCatalog is required");
+        if (!createBy.data.serviceId && !createBy.data.service) {
+            throw new BadDataException("service is required");
         }
         if (!createBy.data.monitor && !createBy.data.monitorId) {
             throw new BadDataException("monitor is required");
         }
-        // serviceCatalogId and dependencyServiceCatalogId should not be the same
-        const serviceCatalogId = createBy.data.serviceCatalogId || ((_a = createBy.data.serviceCatalog) === null || _a === void 0 ? void 0 : _a._id);
+        // serviceId and dependencyServiceId should not be the same
+        const serviceId = createBy.data.serviceId || ((_a = createBy.data.service) === null || _a === void 0 ? void 0 : _a._id);
         const monitorId = createBy.data.monitorId || ((_b = createBy.data.monitor) === null || _b === void 0 ? void 0 : _b._id);
-        // check if this monitor is already added to the service catalog for this service.
+        // check if this monitor is already added to the service for this service.
         const existingMonitor = await this.findOneBy({
             query: {
-                serviceCatalogId: serviceCatalogId,
+                serviceId: serviceId,
                 monitorId: monitorId,
             },
             props: {
@@ -53,4 +53,4 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Service.prototype, "onBeforeCreate", null);
 export default new Service();
-//# sourceMappingURL=ServiceCatalogMonitorService.js.map
+//# sourceMappingURL=ServiceMonitorService.js.map

package/build/dist/Server/Services/ServiceMonitorService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceMonitorService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceMonitorService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAGtE,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,4CAA4C,CAAC;AAE/D,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,yBAAyB;;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACvD,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACvD,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,2DAA2D;QAC3D,MAAM,SAAS,GACb,QAAQ,CAAC,IAAI,CAAC,SAAS,KAAI,MAAA,QAAQ,CAAC,IAAI,CAAC,OAAO,0CAAE,GAAG,CAAA,CAAC;QACxD,MAAM,SAAS,GACb,QAAQ,CAAC,IAAI,CAAC,SAAS,KAAI,MAAA,QAAQ,CAAC,IAAI,CAAC,OAAO,0CAAE,GAAG,CAAA,CAAC;QAExD,0EAA0E;QAE1E,MAAM,eAAe,GAAiB,MAAM,IAAI,CAAC,SAAS,CAAC;YACzD,KAAK,EAAE;gBACL,SAAS,EAAE,SAAqB;gBAChC,SAAS,EAAE,SAAqB;aACjC;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,IAAI,gBAAgB,CAAC,yCAAyC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;CACF;AAxC0B;IADxB,WAAW,EAAE;;;;6CAwCb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/{ServiceCatalogOwnerUserService.js → ServiceOwnerTeamService.js}

@@ -1,9 +1,9 @@
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogOwnerUser";
+import Model from "../../Models/DatabaseModels/ServiceOwnerTeam";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
 }
 export default new Service();
-//# sourceMappingURL=ServiceCatalogOwnerUserService.js.map
+//# sourceMappingURL=ServiceOwnerTeamService.js.map

package/build/dist/Server/Services/ServiceOwnerTeamService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceOwnerTeamService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceOwnerTeamService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,8CAA8C,CAAC;AAEjE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/{ServiceCatalogOwnerTeamService.js → ServiceOwnerUserService.js}

@@ -1,9 +1,9 @@
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogOwnerTeam";
+import Model from "../../Models/DatabaseModels/ServiceOwnerUser";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
 }
 export default new Service();
-//# sourceMappingURL=ServiceCatalogOwnerTeamService.js.map
+//# sourceMappingURL=ServiceOwnerUserService.js.map

package/build/dist/Server/Services/ServiceOwnerUserService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceOwnerUserService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceOwnerUserService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,8CAA8C,CAAC;AAEjE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/{TelemetryServiceService.js → ServiceService.js}

@@ -12,14 +12,13 @@ import ArrayUtil from "../../Utils/Array";
 import { BrightColors } from "../../Types/BrandColors";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
-import Model from "../../Models/DatabaseModels/TelemetryService";
+import Model from "../../Models/DatabaseModels/Service";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
     async onBeforeCreate(createBy) {
-        createBy.data.telemetryServiceToken = ObjectID.generate();
         // select a random color.
         createBy.data.serviceColor = ArrayUtil.selectItemByRandom(BrightColors);
         return {
@@ -27,9 +26,9 @@ export class Service extends DatabaseService {
             createBy: createBy,
         };
     }
-    async getTelemetryDataRetentionInDays(telemetryServiceId) {
-        const project = await this.findOneById({
-            id: telemetryServiceId,
+    async getTelemetryDataRetentionInDays(serviceId) {
+        const service = await this.findOneById({
+            id: serviceId,
             select: {
                 retainTelemetryDataForDays: true,
             },
@@ -37,10 +36,10 @@ export class Service extends DatabaseService {
                 isRoot: true,
             },
         });
-        if (!project) {
-            throw new BadDataException("Project not found");
+        if (!service) {
+            throw new BadDataException("Service not found");
         }
-        return project.retainTelemetryDataForDays || 15; // default is 15 days.
+        return service.retainTelemetryDataForDays || 15; // default is 15 days.
     }
 }
 __decorate([
@@ -56,4 +55,4 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Service.prototype, "getTelemetryDataRetentionInDays", null);
 export default new Service();
-//# sourceMappingURL=TelemetryServiceService.js.map
+//# sourceMappingURL=ServiceService.js.map

package/build/dist/Server/Services/ServiceService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceService.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,MAAM,qCAAqC,CAAC;AACxD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,yBAAyB;QACzB,QAAQ,CAAC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAExE,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;IAGY,AAAN,KAAK,CAAC,+BAA+B,CAC1C,SAAmB;QAEnB,MAAM,OAAO,GAAiB,MAAM,IAAI,CAAC,WAAW,CAAC;YACnD,EAAE,EAAE,SAAS;YACb,MAAM,EAAE;gBACN,0BAA0B,EAAE,IAAI;aACjC;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,OAAO,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC,sBAAsB;IACzE,CAAC;CACF;AAhC0B;IADxB,WAAW,EAAE;;;;6CAWb;AAGY;IADZ,WAAW,EAAE;;qCAED,QAAQ;;8DAiBpB;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/TelemetryExceptionService.js

@@ -32,7 +32,7 @@ export class Service extends DatabaseService {
                 projectId: true,
                 message: true,
                 stackTrace: true,
-                telemetryServiceId: true,
+                serviceId: true,
                 exceptionType: true,
             },
             props,
@@ -117,9 +117,8 @@ export class Service extends DatabaseService {
         if (telemetryException.message) {
             metadata.errorMessage = telemetryException.message;
         }
-        if (telemetryException.telemetryServiceId) {
-            metadata.telemetryServiceId =
-                telemetryException.telemetryServiceId.toString();
+        if (telemetryException.serviceId) {
+            metadata.serviceId = telemetryException.serviceId.toString();
         }
         return metadata;
     }

package/build/dist/Server/Services/TelemetryExceptionService.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryExceptionService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryExceptionService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,gDAAgD,CAAC;AACnE,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAElE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAC7D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAGjE,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,oCAAoC,MAAM,wCAAwC,CAAC;AAC1F,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAOzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGY,AAAN,KAAK,CAAC,6BAA6B,CACxC,MAA2C;QAE3C,MAAM,EAAE,oBAAoB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QAE/C,8BAA8B;QAC9B,MAAM,kBAAkB,GAAiB,MAAM,IAAI,CAAC,WAAW,CAAC;YAC9D,EAAE,EAAE,oBAAoB;YACxB,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI;gBAChB,kBAAkB,EAAE,IAAI;gBACxB,aAAa,EAAE,IAAI;aACpB;YACD,KAAK;SACN,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;YACzD,MAAM,IAAI,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;QAC9D,CAAC;QAED,qEAAqE;QACrE,MAAM,IAAI,CAAC,0BAA0B,CAAC,oBAAoB,CAAC,CAAC;QAE5D,2BAA2B;QAC3B,MAAM,WAAW,GAAgB,MAAM,IAAI,CAAC,sBAAsB,CAAC;YACjE,kBAAkB;YAClB,oBAAoB;YACpB,KAAK;SACN,CAAC,CAAC;QAEH,2CAA2C;QAC3C,MAAM,oCAAoC,CAAC,4BAA4B,CAAC;YACtE,SAAS,EAAE,kBAAkB,CAAC,SAAS;YACvC,aAAa,EAAE,WAAW,CAAC,EAAG;YAC9B,oBAAoB;YACpB,KAAK;SACN,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;IAGa,AAAN,KAAK,CAAC,0BAA0B,CACtC,oBAA8B;QAE9B,MAAM,gBAAgB,GACpB,MAAM,oCAAoC,CAAC,SAAS,CAAC;YACnD,KAAK,EAAE;gBACL,oBAAoB,EAAE,oBAAoB;gBAC1C,WAAW,EAAE;oBACX,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC;wBACxB,iBAAiB,CAAC,SAAS;wBAC3B,iBAAiB,CAAC,KAAK;qBACxB,CAAC;iBACH;aACF;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,aAAa,EAAE,IAAI;aACpB;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEL,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,IAAI,gBAAgB,CACxB,uHAAuH,CACxH,CAAC;QACJ,CAAC;IACH,CAAC;IAGa,AAAN,KAAK,CAAC,sBAAsB,CAAC,MAIpC;QACC,MAAM,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QAEnE,MAAM,WAAW,GAAgB,IAAI,WAAW,EAAE,CAAC;QACnD,WAAW,CAAC,SAAS,GAAG,kBAAkB,CAAC,SAAU,CAAC;QACtD,WAAW,CAAC,QAAQ,GAAG,eAAe,CAAC,YAAY,CAAC;QACpD,WAAW,CAAC,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC;QAEjD,sDAAsD;QACtD,MAAM,aAAa,GACjB,kBAAkB,CAAC,aAAa,IAAI,WAAW,CAAC;QAClD,MAAM,gBAAgB,GACpB,kBAAkB,CAAC,OAAO,IAAI,sBAAsB,CAAC;QAEvD,WAAW,CAAC,IAAI,GAAG,OAAO,aAAa,KAAK,gBAAgB,EAAE,CAAC;QAC/D,WAAW,CAAC,WAAW,GAAG,uCAAuC,gBAAgB,EAAE,CAAC;QAEpF,iBAAiB;QACjB,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC;YACpD,kBAAkB;YAClB,oBAAoB;SACrB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAgB,MAAM,kBAAkB,CAAC,MAAM,CAAC;YAC/D,IAAI,EAAE,WAAW;YACjB,KAAK,oBACA,KAAK,CACT;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,gBAAgB,CAAC,gCAAgC,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,yBAAyB,CAAC,MAGjC;QACC,MAAM,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC;QAE5D,MAAM,QAAQ,GAA6B;YACzC,QAAQ,EAAE,eAAe,CAAC,YAAY;YACtC,WAAW,EAAE,oBAAoB,CAAC,QAAQ,EAAE;SAC7C,CAAC;QAEF,IAAI,kBAAkB,CAAC,UAAU,EAAE,CAAC;YAClC,QAAQ,CAAC,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC;QACtD,CAAC;QAED,IAAI,kBAAkB,CAAC,OAAO,EAAE,CAAC;YAC/B,QAAQ,CAAC,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC;QACrD,CAAC;QAED,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;YAC1C,QAAQ,CAAC,kBAAkB;gBACzB,kBAAkB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;QACrD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AA/Ic;IADZ,WAAW,EAAE;;;;4DA2Cb;AAGa;IADb,WAAW,EAAE;;qCAEU,QAAQ;;yDA2B/B;AAGa;IADb,WAAW,EAAE;;;;qDAwCb;AA8BH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"TelemetryExceptionService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryExceptionService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/TelemetryUsageBillingService.js

@@ -16,7 +16,7 @@ import Decimal from "../../Types/Decimal";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ProductType from "../../Types/MeteredPlan/ProductType";
 import Model, { DEFAULT_RETENTION_IN_DAYS, } from "../../Models/DatabaseModels/TelemetryUsageBilling";
-import TelemetryServiceService from "./TelemetryServiceService";
+import ServiceService from "./ServiceService";
 import SpanService from "./SpanService";
 import LogService from "./LogService";
 import MetricService from "./MetricService";
@@ -72,7 +72,7 @@ export class Service extends DatabaseService {
         const usageDayString = OneUptimeDate.getDateString(usageDate);
         const startOfDay = OneUptimeDate.getStartOfDay(usageDate);
         const endOfDay = OneUptimeDate.getEndOfDay(usageDate);
-        const telemetryServices = await TelemetryServiceService.findBy({
+        const services = await ServiceService.findBy({
             query: {
                 projectId: data.projectId,
             },
@@ -86,18 +86,18 @@ export class Service extends DatabaseService {
                 isRoot: true,
             },
         });
-        if (!telemetryServices || telemetryServices.length === 0) {
+        if (!services || services.length === 0) {
             return;
         }
-        for (const telemetryService of telemetryServices) {
-            if (!(telemetryService === null || telemetryService === void 0 ? void 0 : telemetryService.id)) {
+        for (const service of services) {
+            if (!(service === null || service === void 0 ? void 0 : service.id)) {
                 continue;
             }
             const existingEntry = await this.findOneBy({
                 query: {
                     projectId: data.projectId,
                     productType: data.productType,
-                    telemetryServiceId: telemetryService.id,
+                    serviceId: service.id,
                     day: usageDayString,
                 },
                 select: {
@@ -116,7 +116,7 @@ export class Service extends DatabaseService {
                     const spanCount = await SpanService.countBy({
                         query: {
                             projectId: data.projectId,
-                            serviceId: telemetryService.id,
+                            serviceId: service.id,
                             startTime: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
                         },
                         skip: 0,
@@ -128,7 +128,7 @@ export class Service extends DatabaseService {
                     const exceptionCount = await ExceptionInstanceService.countBy({
                         query: {
                             projectId: data.projectId,
-                            serviceId: telemetryService.id,
+                            serviceId: service.id,
                             time: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
                         },
                         skip: 0,
@@ -150,7 +150,7 @@ export class Service extends DatabaseService {
                     const count = await LogService.countBy({
                         query: {
                             projectId: data.projectId,
-                            serviceId: telemetryService.id,
+                            serviceId: service.id,
                             time: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
                         },
                         skip: 0,
@@ -169,7 +169,7 @@ export class Service extends DatabaseService {
                     const count = await MetricService.countBy({
                         query: {
                             projectId: data.projectId,
-                            serviceId: telemetryService.id,
+                            serviceId: service.id,
                             time: AnalyticsQueryHelper.inBetween(startOfDay, endOfDay),
                         },
                         skip: 0,
@@ -186,7 +186,7 @@ export class Service extends DatabaseService {
                 }
             }
             catch (error) {
-                logger.error(`Failed to compute telemetry usage for service ${(_a = telemetryService.id) === null || _a === void 0 ? void 0 : _a.toString()}:`);
+                logger.error(`Failed to compute telemetry usage for service ${(_a = service.id) === null || _a === void 0 ? void 0 : _a.toString()}:`);
                 logger.error(error);
                 continue;
             }
@@ -197,12 +197,11 @@ export class Service extends DatabaseService {
             if (!Number.isFinite(estimatedGigabytes) || estimatedGigabytes <= 0) {
                 continue;
             }
-            const dataRetentionInDays = telemetryService.retainTelemetryDataForDays ||
-                DEFAULT_RETENTION_IN_DAYS;
+            const dataRetentionInDays = service.retainTelemetryDataForDays || DEFAULT_RETENTION_IN_DAYS;
             await this.updateUsageBilling({
                 projectId: data.projectId,
                 productType: data.productType,
-                telemetryServiceId: telemetryService.id,
+                serviceId: service.id,
                 dataIngestedInGB: estimatedGigabytes,
                 retentionInDays: dataRetentionInDays,
                 usageDate: usageDate,
@@ -229,7 +228,7 @@ export class Service extends DatabaseService {
             query: {
                 projectId: data.projectId,
                 productType: data.productType,
-                telemetryServiceId: data.telemetryServiceId,
+                serviceId: data.serviceId,
                 isReportedToBillingProvider: false,
                 day: usageDayString,
             },
@@ -270,7 +269,7 @@ export class Service extends DatabaseService {
             usageBilling.projectId = data.projectId;
             usageBilling.productType = data.productType;
             usageBilling.dataIngestedInGB = new Decimal(data.dataIngestedInGB);
-            usageBilling.telemetryServiceId = data.telemetryServiceId;
+            usageBilling.serviceId = data.serviceId;
             usageBilling.retainTelemetryDataForDays = data.retentionInDays;
             usageBilling.isReportedToBillingProvider = false;
             usageBilling.createdAt = usageDate;

package/build/dist/Server/Services/TelemetryUsageBillingService.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryUsageBillingService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryUsageBillingService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TelemetryUsageBillingService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryUsageBillingService.ts"],"names":[],"mappings":"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"}