@oneuptime/common 9.3.7 → 9.3.9

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

@@ -101,10 +101,10 @@ import ScheduledMaintenanceOwnerUser from "./ScheduledMaintenanceOwnerUser";
 import ScheduledMaintenancePublicNote from "./ScheduledMaintenancePublicNote";
 import ScheduledMaintenanceState from "./ScheduledMaintenanceState";
 import ScheduledMaintenanceStateTimeline from "./ScheduledMaintenanceStateTimeline";
-import ServiceCatalog from "./ServiceCatalog";
-import ServiceCatalogOwnerTeam from "./ServiceCatalogOwnerTeam";
-import ServiceCatalogOwnerUser from "./ServiceCatalogOwnerUser";
-import ServiceCatalogCodeRepository from "./ServiceCatalogCodeRepository";
+import Service from "./Service";
+import ServiceOwnerTeam from "./ServiceOwnerTeam";
+import ServiceOwnerUser from "./ServiceOwnerUser";
+import ServiceCodeRepository from "./ServiceCodeRepository";
 import CodeRepository from "./CodeRepository";
 // Short link.
 import ShortLink from "./ShortLink";
@@ -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";
@@ -157,9 +156,8 @@ import UserSms from "./UserSMS";
 import Workflow from "./Workflow";
 import WorkflowLog from "./WorkflowLog";
 import WorkflowVariables from "./WorkflowVariable";
-import ServiceCatalogDependency from "./ServiceCatalogDependency";
-import ServiceCatalogMonitor from "./ServiceCatalogMonitor";
-import ServiceCatalogTelemetryService from "./ServiceCatalogTelemetryService";
+import ServiceDependency from "./ServiceDependency";
+import ServiceMonitor from "./ServiceMonitor";
 
 import UserTotpAuth from "./UserTotpAuth";
 import UserWebAuthn from "./UserWebAuthn";
@@ -354,8 +352,6 @@ const AllModelTypes: Array<{
   MonitorGroupOwnerUser,
   MonitorGroupResource,
 
-  TelemetryService,
-
   OnCallDutyPolicySchedule,
   OnCallDutyPolicyScheduleLayer,
   OnCallDutyPolicyScheduleLayerUser,
@@ -372,13 +368,12 @@ const AllModelTypes: Array<{
 
   AcmeChallenge,
 
-  ServiceCatalog,
-  ServiceCatalogOwnerTeam,
-  ServiceCatalogOwnerUser,
-  ServiceCatalogDependency,
-  ServiceCatalogMonitor,
-  ServiceCatalogTelemetryService,
-  ServiceCatalogCodeRepository,
+  Service,
+  ServiceOwnerTeam,
+  ServiceOwnerUser,
+  ServiceDependency,
+  ServiceMonitor,
+  ServiceCodeRepository,
 
   // Code Repository
   CodeRepository,

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/{ServiceCatalog.ts → 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";
@@ -24,7 +22,7 @@ import UniqueColumnBy from "../../Types/Database/UniqueColumnBy";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
-import TechStack from "../../Types/ServiceCatalog/TechStack";
+import TechStack from "../../Types/Service/TechStack";
 import {
   Column,
   Entity,
@@ -38,37 +36,31 @@ import {
 @AccessControlColumn("labels")
 @EnableDocumentation()
 @TenantColumn("projectId")
-@TableBillingAccessControl({
-  create: PlanType.Growth,
-  read: PlanType.Growth,
-  update: PlanType.Growth,
-  delete: PlanType.Growth,
-})
 @TableAccessControl({
   create: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.CreateServiceCatalog,
+    Permission.CreateService,
   ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ProjectMember,
-    Permission.ReadServiceCatalog,
+    Permission.ReadService,
   ],
   delete: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.DeleteServiceCatalog,
+    Permission.DeleteService,
   ],
   update: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.EditServiceCatalog,
+    Permission.EditService,
   ],
 })
 @EnableWorkflow({
@@ -77,33 +69,33 @@ import {
   update: true,
   read: true,
 })
-@CrudApiEndpoint(new Route("/service-catalog"))
+@CrudApiEndpoint(new Route("/service"))
 @SlugifyColumn("name", "slug")
 @TableMetadata({
-  tableName: "ServiceCatalog",
-  singularName: "Service in Service Catalog",
-  pluralName: "Services in Service Catalog",
+  tableName: "Service",
+  singularName: "Service",
+  pluralName: "Services",
   icon: IconProp.SquareStack,
   tableDescription:
-    "Service Catalog is a collection of services that you have in your organization. It can be a collection of services that you are monitoring or services that you are providing to your customers. It can be anything that you want to keep track of.",
+    "Services is a collection of services that you have in your organization. It can be a collection of services that you are monitoring or services that you are providing to your customers. It can be anything that you want to keep track of.",
 })
 @Entity({
-  name: "ServiceCatalog",
+  name: "Service",
 })
-export default class ServiceCatalog extends BaseModel {
+export default class Service extends BaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [],
   })
@@ -133,14 +125,14 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [],
   })
@@ -165,20 +157,20 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.EditServiceCatalog,
+      Permission.EditService,
     ],
   })
   @TableColumn({
@@ -204,7 +196,7 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [],
   })
@@ -228,20 +220,20 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.EditServiceCatalog,
+      Permission.EditService,
     ],
   })
   @TableColumn({
@@ -264,14 +256,14 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [],
   })
@@ -302,14 +294,14 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [],
   })
@@ -334,7 +326,7 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [],
   })
@@ -368,7 +360,7 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [],
   })
@@ -391,20 +383,20 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.EditServiceCatalog,
+      Permission.EditService,
     ],
   })
   @TableColumn({
@@ -422,13 +414,13 @@ export default class ServiceCatalog extends BaseModel {
     { eager: false },
   )
   @JoinTable({
-    name: "ServiceCatalogLabel",
+    name: "ServiceLabel",
     inverseJoinColumn: {
       name: "labelId",
       referencedColumnName: "_id",
     },
     joinColumn: {
-      name: "serviceCatalogId",
+      name: "serviceId",
       referencedColumnName: "_id",
     },
   })
@@ -439,20 +431,20 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.EditServiceCatalog,
+      Permission.EditService,
     ],
   })
   @ColorField()
@@ -490,20 +482,20 @@ export default class ServiceCatalog extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalog,
+      Permission.CreateService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalog,
+      Permission.ReadService,
     ],
     update: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.EditServiceCatalog,
+      Permission.EditService,
     ],
   })
   @TableColumn({
@@ -519,4 +511,38 @@ export default class ServiceCatalog 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;
 }