@oneuptime/common 10.0.71 → 10.0.73

package/Models/DatabaseModels/Alert.ts

@@ -975,6 +975,61 @@ export default class Alert extends BaseModel {
   })
   public createdCriteriaId?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.AlertManager,
+      Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.LongText,
+    required: false,
+    isDefaultValueColumn: false,
+    title: "Series Fingerprint",
+    description:
+      "For metric monitors with per-series alerting (e.g. grouped by host.name), this is a stable hash of the series label values so one alert is created per affected series.",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    nullable: true,
+  })
+  public seriesFingerprint?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.AlertManager,
+      Permission.ReadAlert,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.JSON,
+    required: false,
+    isDefaultValueColumn: false,
+    title: "Series Labels",
+    description:
+      "Attribute key/value pairs that identify the affected series (e.g. {host.name: prod-db-01}) when this alert was created from a per-series metric breach.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public seriesLabels?: JSONObject = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/Incident.ts

@@ -1456,6 +1456,61 @@ export default class Incident extends BaseModel {
   })
   public createdIncidentTemplateId?: string = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.IncidentManager,
+      Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.LongText,
+    required: false,
+    isDefaultValueColumn: false,
+    title: "Series Fingerprint",
+    description:
+      "For metric monitors with per-series alerting (e.g. grouped by host.name), this is a stable hash of the series label values so one incident is created per affected series.",
+  })
+  @Column({
+    type: ColumnType.LongText,
+    nullable: true,
+  })
+  public seriesFingerprint?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.IncidentManager,
+      Permission.ReadProjectIncident,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.JSON,
+    required: false,
+    isDefaultValueColumn: false,
+    title: "Series Labels",
+    description:
+      "Attribute key/value pairs that identify the affected series (e.g. {host.name: prod-db-01}) when this incident was created from a per-series metric breach.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public seriesLabels?: JSONObject = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

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/Models/DatabaseModels/StatusPage.ts

@@ -43,6 +43,7 @@ import {
   ManyToOne,
 } from "typeorm";
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
+import { DEFAULT_STATUS_PAGE_LANGUAGE } from "../../Types/StatusPage/StatusPageLanguage";
 
 @EnableDocumentation()
 @EnableMCP()
@@ -2991,4 +2992,83 @@ export default class StatusPage extends BaseModel {
     create: PlanType.Free,
   })
   public embeddedOverallStatusToken?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageManager,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageManager,
+      Permission.ReadProjectStatusPage,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageManager,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "Default Language",
+    required: false,
+    defaultValue: DEFAULT_STATUS_PAGE_LANGUAGE,
+    description:
+      "Default language that the status page is shown in when a visitor arrives for the first time.",
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    nullable: true,
+    default: DEFAULT_STATUS_PAGE_LANGUAGE,
+  })
+  public defaultLanguage?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageManager,
+      Permission.CreateProjectStatusPage,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.StatusPageManager,
+      Permission.ReadProjectStatusPage,
+      Permission.ReadAllProjectResources,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.StatusPageManager,
+      Permission.EditProjectStatusPage,
+    ],
+  })
+  @TableColumn({
+    isDefaultValueColumn: false,
+    required: false,
+    type: TableColumnType.JSON,
+    title: "Enabled Languages",
+    description:
+      "Languages offered in the footer language switcher. Leave empty to offer all supported languages.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: true,
+  })
+  public enabledLanguages?: Array<string> = undefined;
 }

package/Server/API/StatusPageAPI.ts

@@ -225,6 +225,7 @@ export default class StatusPageAPI extends BaseAPI<
               pageTitle: true,
               pageDescription: true,
               name: true,
+              defaultLanguage: true,
             },
             props: {
               isRoot: true,
@@ -244,6 +245,7 @@ export default class StatusPageAPI extends BaseAPI<
           title: statusPage.pageTitle || statusPage.name,
           description: statusPage.pageDescription,
           _id: statusPage._id?.toString(),
+          defaultLanguage: statusPage.defaultLanguage || null,
         });
       },
     );
@@ -883,6 +885,8 @@ export default class StatusPageAPI extends BaseAPI<
             showAnnouncementsOnStatusPage: true,
             showScheduledMaintenanceEventsOnStatusPage: true,
             showSubscriberPageOnStatusPage: true,
+            defaultLanguage: true,
+            enabledLanguages: true,
           };
 
           const hasEnabledSSO: PositiveNumber =

package/Server/Infrastructure/Postgres/SchemaMigrations/1776940714709-MigrationName.ts

@@ -0,0 +1,41 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1776940714709 implements MigrationInterface {
+  public name = "MigrationName1776940714709";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Incident" ADD "seriesFingerprint" character varying`,
+    );
+    await queryRunner.query(`ALTER TABLE "Incident" ADD "seriesLabels" jsonb`);
+    await queryRunner.query(
+      `ALTER TABLE "Alert" ADD "seriesFingerprint" character varying`,
+    );
+    await queryRunner.query(`ALTER TABLE "Alert" ADD "seriesLabels" jsonb`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_865fc7905f35947b294ca36b83" ON "Incident" ("seriesFingerprint") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_5705362784705d225735b1a844" ON "Alert" ("seriesFingerprint") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_5705362784705d225735b1a844"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_865fc7905f35947b294ca36b83"`,
+    );
+    await queryRunner.query(`ALTER TABLE "Alert" DROP COLUMN "seriesLabels"`);
+    await queryRunner.query(
+      `ALTER TABLE "Alert" DROP COLUMN "seriesFingerprint"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" DROP COLUMN "seriesLabels"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" DROP COLUMN "seriesFingerprint"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1776971364783-AddStatusPageLanguageSettings.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddStatusPageLanguageSettings1776971364783
+  implements MigrationInterface
+{
+  public name: string = "AddStatusPageLanguageSettings1776971364783";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "defaultLanguage" character varying DEFAULT 'en'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "enabledLanguages" jsonb`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "enabledLanguages"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "defaultLanguage"`,
+    );
+  }
+}

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

@@ -289,6 +289,9 @@ import { MigrationName1776761171349 } from "./1776761171349-MigrationName";
 import { MigrationName1776801030808 } from "./1776801030808-MigrationName";
 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,
@@ -581,4 +584,7 @@ export default [
   MigrationName1776801030808,
   MigrationName1776865086264,
   DedupeKubernetesClustersAndAddUniqueIndex1776881254913,
+  MigrationName1776940714709,
+  AddStatusPageLanguageSettings1776971364783,
+  AddTelemetryRetentionSettings1777018175127,
 ];

package/Server/Services/AnalyticsDatabaseService.ts

@@ -454,10 +454,9 @@ export default class AnalyticsDatabaseService<
 
       // convert date column from string to date.
 
-      const groupByColumnName: keyof TBaseModel | undefined =
-        aggregateBy.groupBy && Object.keys(aggregateBy.groupBy).length > 0
-          ? (Object.keys(aggregateBy.groupBy)[0] as keyof TBaseModel)
-          : undefined;
+      const groupByColumnNames: Array<string> = aggregateBy.groupBy
+        ? Object.keys(aggregateBy.groupBy)
+        : [];
 
       for (const item of items) {
         if (
@@ -483,6 +482,14 @@ export default class AnalyticsDatabaseService<
             );
         }
 
+        /*
+         * Preserve every group-by column on the aggregated row. The
+         * previous implementation only copied the first column, which
+         * silently dropped the rest when callers grouped by more than
+         * one dimension (e.g. attributes + name). `AggregatedModel`'s
+         * index signature already accepts arbitrary keys, so existing
+         * single-column consumers still work.
+         */
         const aggregatedModel: AggregatedModel = {
           timestamp: OneUptimeDate.fromString(
             (item as JSONObject)[
@@ -492,11 +499,14 @@ export default class AnalyticsDatabaseService<
           value: (item as JSONObject)[
             aggregateBy.aggregateColumnName as string
           ] as number,
-          [groupByColumnName as string]: (item as JSONObject)[
-            groupByColumnName as string
-          ],
         };
 
+        for (const groupByColumnName of groupByColumnNames) {
+          aggregatedModel[groupByColumnName] = (item as JSONObject)[
+            groupByColumnName
+          ] as AggregatedModel[string];
+        }
+
         aggregatedItems.push(aggregatedModel);
       }
 

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;
   }
 }