@oneuptime/common 10.0.72 → 10.0.75

package/Models/DatabaseModels/Project.ts

@@ -2049,6 +2049,32 @@ export default class Project extends TenantModel {
   })
   public defaultMetricCardinalityBudget?: number = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.ReadProject,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [Permission.ProjectOwner, Permission.ProjectAdmin],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    required: false,
+    title: "Default Telemetry Data Retention (Days)",
+    description:
+      "Project-wide default number of days to retain telemetry data (logs, traces, metrics). Services without a per-service override use this value.",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: false,
+    default: 15,
+  })
+  public defaultTelemetryRetentionInDays?: number = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/Service.ts

@@ -627,13 +627,13 @@ export default class Service extends BaseModel {
   @TableColumn({
     type: TableColumnType.Number,
     title: "Retain Telemetry Data For Days",
-    description: "Number of days to retain telemetry data for this service.",
+    description:
+      "Number of days to retain telemetry data for this service. Leave blank to use the project-wide default.",
   })
   @Column({
     type: ColumnType.Number,
     nullable: true,
     unique: false,
-    default: 15,
   })
   public retainTelemetryDataForDays?: number = undefined;
 

package/Server/Infrastructure/Postgres/SchemaMigrations/1777018175127-AddTelemetryRetentionSettings.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddTelemetryRetentionSettings1777018175127
+  implements MigrationInterface
+{
+  public name = "AddTelemetryRetentionSettings1777018175127";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD COLUMN IF NOT EXISTS "defaultTelemetryRetentionInDays" integer NOT NULL DEFAULT '15'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Service" ALTER COLUMN "retainTelemetryDataForDays" DROP DEFAULT`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Service" ALTER COLUMN "retainTelemetryDataForDays" SET DEFAULT '15'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN IF EXISTS "defaultTelemetryRetentionInDays"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -291,6 +291,7 @@ import { MigrationName1776865086264 } from "./1776865086264-MigrationName";
 import { DedupeKubernetesClustersAndAddUniqueIndex1776881254913 } from "./1776881254913-DedupeKubernetesClustersAndAddUniqueIndex";
 import { MigrationName1776940714709 } from "./1776940714709-MigrationName";
 import { AddStatusPageLanguageSettings1776971364783 } from "./1776971364783-AddStatusPageLanguageSettings";
+import { AddTelemetryRetentionSettings1777018175127 } from "./1777018175127-AddTelemetryRetentionSettings";
 export default [
   InitialMigration,
   MigrationName1717678334852,
@@ -585,4 +586,5 @@ export default [
   DedupeKubernetesClustersAndAddUniqueIndex1776881254913,
   MigrationName1776940714709,
   AddStatusPageLanguageSettings1776971364783,
+  AddTelemetryRetentionSettings1777018175127,
 ];

package/Server/Services/OpenTelemetryIngestService.ts

@@ -4,7 +4,9 @@ import ObjectID from "../../Types/ObjectID";
 import Metric, {
   AggregationTemporality,
 } from "../../Models/AnalyticsModels/Metric";
+import Project from "../../Models/DatabaseModels/Project";
 import Service from "../../Models/DatabaseModels/Service";
+import ProjectService from "../../Server/Services/ProjectService";
 import ServiceService from "../../Server/Services/ServiceService";
 import { DEFAULT_RETENTION_IN_DAYS } from "../../Models/DatabaseModels/TelemetryUsageBilling";
 import TelemetryUtil from "../../Server/Utils/Telemetry/Telemetry";
@@ -22,6 +24,25 @@ export interface TelemetryServiceMetadata {
 }
 
 export default class OTelIngestService {
+  @CaptureSpan()
+  private static async getProjectDefaultRetentionInDays(
+    projectId: ObjectID,
+  ): Promise<number> {
+    const project: Project | null = await ProjectService.findOneById({
+      id: projectId,
+      select: {
+        defaultTelemetryRetentionInDays: true,
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    return (
+      project?.defaultTelemetryRetentionInDays || DEFAULT_RETENTION_IN_DAYS
+    );
+  }
+
   @CaptureSpan()
   public static async telemetryServiceFromName(data: {
     serviceName: string;
@@ -45,12 +66,14 @@ export default class OTelIngestService {
     });
 
     if (!service) {
+      const projectDefaultRetention: number =
+        await this.getProjectDefaultRetentionInDays(data.projectId);
+
       try {
         const newService: Service = new Service();
         newService.projectId = data.projectId;
         newService.name = data.serviceName;
         newService.description = data.serviceName;
-        newService.retainTelemetryDataForDays = DEFAULT_RETENTION_IN_DAYS;
 
         const createdService: Service = await ServiceService.create({
           data: newService,
@@ -61,7 +84,7 @@ export default class OTelIngestService {
 
         return {
           serviceId: createdService.id!,
-          dataRententionInDays: DEFAULT_RETENTION_IN_DAYS,
+          dataRententionInDays: projectDefaultRetention,
         };
       } catch {
         /*
@@ -87,7 +110,7 @@ export default class OTelIngestService {
             serviceId: existingService.id!,
             dataRententionInDays:
               existingService.retainTelemetryDataForDays ||
-              DEFAULT_RETENTION_IN_DAYS,
+              projectDefaultRetention,
           };
         }
 
@@ -97,10 +120,18 @@ export default class OTelIngestService {
       }
     }
 
+    if (service.retainTelemetryDataForDays) {
+      return {
+        serviceId: service.id!,
+        dataRententionInDays: service.retainTelemetryDataForDays,
+      };
+    }
+
     return {
       serviceId: service.id!,
-      dataRententionInDays:
-        service.retainTelemetryDataForDays || DEFAULT_RETENTION_IN_DAYS,
+      dataRententionInDays: await this.getProjectDefaultRetentionInDays(
+        data.projectId,
+      ),
     };
   }
   @CaptureSpan()

package/Server/Services/ServiceService.ts

@@ -1,13 +1,17 @@
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
+import ProjectService from "./ProjectService";
 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/Service";
+import Project from "../../Models/DatabaseModels/Project";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
+const DEFAULT_TELEMETRY_RETENTION_IN_DAYS: number = 15;
+
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
@@ -33,6 +37,7 @@ export class Service extends DatabaseService<Model> {
     const service: Model | null = await this.findOneById({
       id: serviceId,
       select: {
+        projectId: true,
         retainTelemetryDataForDays: true,
       },
       props: {
@@ -44,7 +49,28 @@ export class Service extends DatabaseService<Model> {
       throw new BadDataException("Service not found");
     }
 
-    return service.retainTelemetryDataForDays || 15; // default is 15 days.
+    if (service.retainTelemetryDataForDays) {
+      return service.retainTelemetryDataForDays;
+    }
+
+    // Fall back to project-level default.
+    if (service.projectId) {
+      const project: Project | null = await ProjectService.findOneById({
+        id: service.projectId,
+        select: {
+          defaultTelemetryRetentionInDays: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (project?.defaultTelemetryRetentionInDays) {
+        return project.defaultTelemetryRetentionInDays;
+      }
+    }
+
+    return DEFAULT_TELEMETRY_RETENTION_IN_DAYS;
   }
 }
 

package/Server/Utils/Monitor/MonitorAlert.ts

@@ -16,9 +16,7 @@ import { TelemetryQuery } from "../../../Types/Telemetry/TelemetryQuery";
 import { DisableAutomaticAlertCreation } from "../../EnvironmentConfig";
 import AlertService from "../../Services/AlertService";
 import AlertSeverityService from "../../Services/AlertSeverityService";
-import AlertStateService from "../../Services/AlertStateService";
 import AlertStateTimelineService from "../../Services/AlertStateTimelineService";
-import AlertState from "../../../Models/DatabaseModels/AlertState";
 import logger, { LogAttributes } from "../Logger";
 import CaptureSpan from "../Telemetry/CaptureSpan";
 import DataToProcess from "./DataToProcess";
@@ -372,82 +370,6 @@ export default class MonitorAlert {
         input.openAlert.projectId!,
       );
 
-    /*
-     * Skip the Resolved insert if the alert's timeline is already at or past
-     * the Resolved state in the project's workflow order. Two cases:
-     *  1. Latest timeline state is Resolved but Alert.currentAlertStateId is
-     *     stuck on an earlier state (partial-failure from a prior resolve).
-     *     Re-inserting Resolved would throw "Alert state cannot be same as
-     *     previous state" from AlertStateTimelineService.onBeforeCreate.
-     *  2. The project defines a custom state after Resolved (e.g. Closed) and
-     *     the alert has moved into it. Inserting Resolved would throw
-     *     "cannot transition to Resolved from Closed because Resolved is
-     *     before Closed in the order of alert states."
-     * Either failure bubbles up through ingest workers and causes monitors to
-     * flap. Reconcile Alert.currentAlertStateId if out of sync with the
-     * timeline, then return.
-     */
-    const [resolvedState, latestTimeline]: [
-      AlertState | null,
-      AlertStateTimeline | null,
-    ] = await Promise.all([
-      AlertStateService.findOneBy({
-        query: {
-          _id: resolvedStateId.toString(),
-        },
-        select: {
-          order: true,
-        },
-        props: {
-          isRoot: true,
-        },
-      }),
-      AlertStateTimelineService.findOneBy({
-        query: {
-          alertId: input.openAlert.id!,
-        },
-        sort: {
-          startsAt: SortOrder.Descending,
-        },
-        select: {
-          alertStateId: true,
-          alertState: {
-            order: true,
-          },
-        },
-        props: {
-          isRoot: true,
-        },
-      }),
-    ]);
-
-    const latestOrder: number | undefined | null =
-      latestTimeline?.alertState?.order;
-    const resolvedOrder: number | undefined | null = resolvedState?.order;
-
-    if (
-      latestTimeline?.alertStateId &&
-      typeof latestOrder === "number" &&
-      typeof resolvedOrder === "number" &&
-      latestOrder >= resolvedOrder
-    ) {
-      if (
-        input.openAlert.currentAlertStateId?.toString() !==
-        latestTimeline.alertStateId.toString()
-      ) {
-        await AlertService.updateOneById({
-          id: input.openAlert.id!,
-          data: {
-            currentAlertStateId: latestTimeline.alertStateId,
-          },
-          props: {
-            isRoot: true,
-          },
-        });
-      }
-      return;
-    }
-
     const alertStateTimeline: AlertStateTimeline = new AlertStateTimeline();
     alertStateTimeline.alertId = input.openAlert.id!;
     alertStateTimeline.alertStateId = resolvedStateId;

package/Server/Utils/Monitor/MonitorIncident.ts

@@ -17,10 +17,8 @@ import { TelemetryQuery } from "../../../Types/Telemetry/TelemetryQuery";
 import { DisableAutomaticIncidentCreation } from "../../EnvironmentConfig";
 import IncidentService from "../../Services/IncidentService";
 import IncidentSeverityService from "../../Services/IncidentSeverityService";
-import IncidentStateService from "../../Services/IncidentStateService";
 import IncidentStateTimelineService from "../../Services/IncidentStateTimelineService";
 import IncidentMemberService from "../../Services/IncidentMemberService";
-import IncidentState from "../../../Models/DatabaseModels/IncidentState";
 import logger, { LogAttributes } from "../Logger";
 import CaptureSpan from "../Telemetry/CaptureSpan";
 import DataToProcess from "./DataToProcess";
@@ -468,82 +466,6 @@ export default class MonitorIncident {
         input.openIncident.projectId!,
       );
 
-    /*
-     * Skip the Resolved insert if the incident's timeline is already at or
-     * past the Resolved state in the project's workflow order. Two cases:
-     *  1. Latest timeline state is Resolved but Incident.currentIncidentStateId
-     *     is stuck on an earlier state (partial-failure from a prior resolve).
-     *     Re-inserting Resolved would throw "state cannot be same as previous"
-     *     from IncidentStateTimelineService.onBeforeCreate.
-     *  2. The project defines a custom state after Resolved (e.g. Closed) and
-     *     the incident has moved into it. Inserting Resolved would throw
-     *     "cannot transition to Resolved from Closed because Resolved is
-     *     before Closed in the order of incident states."
-     * Either failure bubbles up through ingest workers and causes monitors to
-     * flap. Reconcile Incident.currentIncidentStateId if out of sync with the
-     * timeline, then return.
-     */
-    const [resolvedState, latestTimeline]: [
-      IncidentState | null,
-      IncidentStateTimeline | null,
-    ] = await Promise.all([
-      IncidentStateService.findOneBy({
-        query: {
-          _id: resolvedStateId.toString(),
-        },
-        select: {
-          order: true,
-        },
-        props: {
-          isRoot: true,
-        },
-      }),
-      IncidentStateTimelineService.findOneBy({
-        query: {
-          incidentId: input.openIncident.id!,
-        },
-        sort: {
-          startsAt: SortOrder.Descending,
-        },
-        select: {
-          incidentStateId: true,
-          incidentState: {
-            order: true,
-          },
-        },
-        props: {
-          isRoot: true,
-        },
-      }),
-    ]);
-
-    const latestOrder: number | undefined | null =
-      latestTimeline?.incidentState?.order;
-    const resolvedOrder: number | undefined | null = resolvedState?.order;
-
-    if (
-      latestTimeline?.incidentStateId &&
-      typeof latestOrder === "number" &&
-      typeof resolvedOrder === "number" &&
-      latestOrder >= resolvedOrder
-    ) {
-      if (
-        input.openIncident.currentIncidentStateId?.toString() !==
-        latestTimeline.incidentStateId.toString()
-      ) {
-        await IncidentService.updateOneById({
-          id: input.openIncident.id!,
-          data: {
-            currentIncidentStateId: latestTimeline.incidentStateId,
-          },
-          props: {
-            isRoot: true,
-          },
-        });
-      }
-      return;
-    }
-
     const incidentStateTimeline: IncidentStateTimeline =
       new IncidentStateTimeline();
     incidentStateTimeline.incidentId = input.openIncident.id!;

package/Types/AdminDashboard/AdminDashboardLanguage.ts

@@ -0,0 +1,33 @@
+export interface AdminDashboardLanguage {
+  code: string;
+  nativeName: string;
+  englishName: string;
+}
+
+export const DEFAULT_ADMIN_DASHBOARD_LANGUAGE: string = "en";
+
+export const SUPPORTED_ADMIN_DASHBOARD_LANGUAGES: Array<AdminDashboardLanguage> =
+  [
+    { code: "en", nativeName: "English", englishName: "English" },
+    { code: "de", nativeName: "Deutsch", englishName: "German" },
+    { code: "fr", nativeName: "Français", englishName: "French" },
+    { code: "es", nativeName: "Español", englishName: "Spanish" },
+    { code: "it", nativeName: "Italiano", englishName: "Italian" },
+    { code: "pt", nativeName: "Português", englishName: "Portuguese" },
+    { code: "nl", nativeName: "Nederlands", englishName: "Dutch" },
+    { code: "da", nativeName: "Dansk", englishName: "Danish" },
+    { code: "no", nativeName: "Norsk", englishName: "Norwegian" },
+    { code: "sv", nativeName: "Svenska", englishName: "Swedish" },
+    { code: "ru", nativeName: "Русский", englishName: "Russian" },
+    { code: "ja", nativeName: "日本語", englishName: "Japanese" },
+    { code: "ko", nativeName: "한국어", englishName: "Korean" },
+    { code: "zh", nativeName: "中文", englishName: "Chinese" },
+    { code: "hi", nativeName: "हिन्दी", englishName: "Hindi" },
+  ];
+
+export const SUPPORTED_ADMIN_DASHBOARD_LANGUAGE_CODES: Array<string> =
+  SUPPORTED_ADMIN_DASHBOARD_LANGUAGES.map(
+    (language: AdminDashboardLanguage) => {
+      return language.code;
+    },
+  );

package/Types/Dashboard/DashboardLanguage.ts

@@ -0,0 +1,30 @@
+export interface DashboardLanguage {
+  code: string;
+  nativeName: string;
+  englishName: string;
+}
+
+export const DEFAULT_DASHBOARD_LANGUAGE: string = "en";
+
+export const SUPPORTED_DASHBOARD_LANGUAGES: Array<DashboardLanguage> = [
+  { code: "en", nativeName: "English", englishName: "English" },
+  { code: "de", nativeName: "Deutsch", englishName: "German" },
+  { code: "fr", nativeName: "Français", englishName: "French" },
+  { code: "es", nativeName: "Español", englishName: "Spanish" },
+  { code: "it", nativeName: "Italiano", englishName: "Italian" },
+  { code: "pt", nativeName: "Português", englishName: "Portuguese" },
+  { code: "nl", nativeName: "Nederlands", englishName: "Dutch" },
+  { code: "da", nativeName: "Dansk", englishName: "Danish" },
+  { code: "no", nativeName: "Norsk", englishName: "Norwegian" },
+  { code: "sv", nativeName: "Svenska", englishName: "Swedish" },
+  { code: "ru", nativeName: "Русский", englishName: "Russian" },
+  { code: "ja", nativeName: "日本語", englishName: "Japanese" },
+  { code: "ko", nativeName: "한국어", englishName: "Korean" },
+  { code: "zh", nativeName: "中文", englishName: "Chinese" },
+  { code: "hi", nativeName: "हिन्दी", englishName: "Hindi" },
+];
+
+export const SUPPORTED_DASHBOARD_LANGUAGE_CODES: Array<string> =
+  SUPPORTED_DASHBOARD_LANGUAGES.map((language: DashboardLanguage) => {
+    return language.code;
+  });

package/Types/StatusPage/StatusPageLanguage.ts

@@ -21,6 +21,7 @@ export const SUPPORTED_STATUS_PAGE_LANGUAGES: Array<StatusPageLanguage> = [
   { code: "ja", nativeName: "日本語", englishName: "Japanese" },
   { code: "ko", nativeName: "한국어", englishName: "Korean" },
   { code: "zh", nativeName: "中文", englishName: "Chinese" },
+  { code: "hi", nativeName: "हिन्दी", englishName: "Hindi" },
 ];
 
 export const SUPPORTED_STATUS_PAGE_LANGUAGE_CODES: Array<string> =

package/build/dist/Models/DatabaseModels/Project.js

@@ -126,6 +126,7 @@ let Project = class Project extends TenantModel {
         // GitHub App Installation ID for this project
         this.gitHubAppInstallationId = undefined;
         this.defaultMetricCardinalityBudget = undefined;
+        this.defaultTelemetryRetentionInDays = undefined;
         this.defaultMetricDownsamplingRetentionDays = undefined;
         this.enableAuditLogs = undefined;
         this.auditLogsRetentionInDays = undefined;
@@ -2141,6 +2142,32 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], Project.prototype, "defaultMetricCardinalityBudget", void 0);
+__decorate([
+    ColumnAccessControl({
+        create: [],
+        read: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.Viewer,
+            Permission.ReadProject,
+            Permission.ReadAllProjectResources,
+        ],
+        update: [Permission.ProjectOwner, Permission.ProjectAdmin],
+    }),
+    TableColumn({
+        type: TableColumnType.Number,
+        required: false,
+        title: "Default Telemetry Data Retention (Days)",
+        description: "Project-wide default number of days to retain telemetry data (logs, traces, metrics). Services without a per-service override use this value.",
+    }),
+    Column({
+        type: ColumnType.Number,
+        nullable: false,
+        default: 15,
+    }),
+    __metadata("design:type", Number)
+], Project.prototype, "defaultTelemetryRetentionInDays", void 0);
 __decorate([
     ColumnAccessControl({
         create: [],