@oneuptime/common 10.0.70 → 10.0.72

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/KubernetesCluster.ts

@@ -73,10 +73,12 @@ import {
 })
 @CrudApiEndpoint(new Route("/kubernetes-cluster"))
 @SlugifyColumn("name", "slug")
-// Enforce one cluster row per (projectId, clusterIdentifier) at the DB level.
-// Without this, two pods emitting OTel telemetry for a new cluster at the
-// same time (e.g. when the agent is first installed or during a rolling
-// update) race in findOrCreateByClusterIdentifier and create duplicate rows.
+/*
+ * Enforce one cluster row per (projectId, clusterIdentifier) at the DB level.
+ * Without this, two pods emitting OTel telemetry for a new cluster at the
+ * same time (e.g. when the agent is first installed or during a rolling
+ * update) race in findOrCreateByClusterIdentifier and create duplicate rows.
+ */
 @Index(["projectId", "clusterIdentifier"], { unique: true })
 @TableMetadata({
   tableName: "KubernetesCluster",

package/Models/DatabaseModels/Project.ts

@@ -342,15 +342,15 @@ export default class Project extends TenantModel {
     update: [Permission.ProjectOwner, Permission.ManageProjectBilling],
   })
   @TableColumn({
-    type: TableColumnType.Email,
+    type: TableColumnType.LongText,
     title: "Finance / Accounting Email",
     description:
-      "Invoices, receipts and billing related notifications will be sent to this email in addition to project owner.",
-    example: "accounting@example.com",
+      "Invoices, receipts and billing related notifications will be sent to these emails in addition to project owner. Separate multiple emails with a comma.",
+    example: "accounting@example.com, finance@example.com",
   })
   @Column({
-    type: ColumnType.Email,
-    length: ColumnLength.Email,
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
     nullable: true,
     unique: false,
   })

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/1776881254913-DedupeKubernetesClustersAndAddUniqueIndex.ts

@@ -26,7 +26,8 @@ import { MigrationInterface, QueryRunner } from "typeorm";
 export class DedupeKubernetesClustersAndAddUniqueIndex1776881254913
   implements MigrationInterface
 {
-  public name: string = "DedupeKubernetesClustersAndAddUniqueIndex1776881254913";
+  public name: string =
+    "DedupeKubernetesClustersAndAddUniqueIndex1776881254913";
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     // 1: reparent KubernetesResource FKs from duplicates -> survivor.
@@ -128,7 +129,9 @@ export class DedupeKubernetesClustersAndAddUniqueIndex1776881254913
     await queryRunner.query(
       `DROP INDEX "public"."IDX_9756988b48848f4f7532a2af0d"`,
     );
-    // Duplicate rows dropped in up() are lost — a down-migration cannot
-    // resurrect them (and reinstating duplicates is not desirable anyway).
+    /*
+     * Duplicate rows dropped in up() are lost — a down-migration cannot
+     * resurrect them (and reinstating duplicates is not desirable anyway).
+     */
   }
 }

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

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1776886248361 implements MigrationInterface {
+  public name = "MigrationName1776886248361";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ALTER COLUMN "financeAccountingEmail" TYPE character varying(500)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ALTER COLUMN "financeAccountingEmail" TYPE character varying(100)`,
+    );
+  }
+}

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/Index.ts

@@ -289,6 +289,8 @@ 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";
 export default [
   InitialMigration,
   MigrationName1717678334852,
@@ -581,4 +583,6 @@ export default [
   MigrationName1776801030808,
   MigrationName1776865086264,
   DedupeKubernetesClustersAndAddUniqueIndex1776881254913,
+  MigrationName1776940714709,
+  AddStatusPageLanguageSettings1776971364783,
 ];

package/Server/Services/AIBillingService.ts

@@ -94,8 +94,8 @@ export class AIBillingService extends BaseService {
         amountInUSD,
         {
           sendInvoiceByEmail: project.sendInvoicesByEmail || false,
-          recipientEmail: project.financeAccountingEmail
-            ? new Email(project.financeAccountingEmail)
+          recipientEmails: project.financeAccountingEmail
+            ? Email.parseList(project.financeAccountingEmail)
             : undefined,
           projectId: project.id || undefined,
         },

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