@oneuptime/common 10.0.71 → 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/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/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/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/Utils/Monitor/Criteria/MetricMonitorCriteria.ts

@@ -8,6 +8,7 @@ import MetricCriteriaContext, {
   MetricComponent,
   MetricComponentValue,
 } from "../../../../Types/Monitor/MetricMonitor/MetricCriteriaContext";
+import MetricSeriesResult from "../../../../Types/Monitor/MetricMonitor/MetricSeriesResult";
 import MonitorStep from "../../../../Types/Monitor/MonitorStep";
 import { JSONObject } from "../../../../Types/JSON";
 import DataToProcess from "../DataToProcess";
@@ -23,6 +24,20 @@ import CaptureSpan from "../../Telemetry/CaptureSpan";
 import MetricUnitUtil from "../../../../Utils/MetricUnitUtil";
 import MetricFormulaEvaluator from "../../../../Utils/Metrics/MetricFormulaEvaluator";
 
+/**
+ * Result of evaluating a single criteria filter against a single metric
+ * series. `rootCause` is null when the filter did not match; otherwise
+ * it's the human-readable comparison message. `context` always reflects
+ * the metric identity for this series (used to render the metric
+ * details + breaching samples section of the incident root cause).
+ */
+export interface MetricSeriesEvaluationResult {
+  fingerprint: string | undefined;
+  labels: JSONObject;
+  rootCause: string | null;
+  context: MetricCriteriaContext;
+}
+
 export default class MetricMonitorCriteria {
   @CaptureSpan()
   public static async isMonitorInstanceCriteriaFilterMet(input: {
@@ -30,8 +45,50 @@ export default class MetricMonitorCriteria {
     criteriaFilter: CriteriaFilter;
     monitorStep: MonitorStep;
   }): Promise<string | null> {
-    // Metric Monitoring Check
+    const evaluations: Array<MetricSeriesEvaluationResult> =
+      MetricMonitorCriteria.evaluateAllSeries(input);
+
+    /*
+     * Backwards-compat: the scalar entrypoint collapses per-series
+     * evaluation down to the first matching series so existing callers
+     * (single-incident path) keep working. The per-series code path uses
+     * `evaluateAllSeries` directly.
+     */
+    const match: MetricSeriesEvaluationResult | undefined = evaluations.find(
+      (e: MetricSeriesEvaluationResult) => {
+        return e.rootCause !== null;
+      },
+    );
+
+    /*
+     * Always populate the legacy single-context field so the root-cause
+     * renderer can still read metric identity from the criteria filter
+     * even when nothing matched. Pick the first evaluation's context.
+     */
+    if (evaluations.length > 0) {
+      input.criteriaFilter.metricCriteriaContext = (
+        match || evaluations[0]!
+      ).context;
+    }
 
+    return match ? match.rootCause : null;
+  }
+
+  /**
+   * Evaluate a single criteria filter against every series produced by
+   * the monitor. For monitors without group-by, this returns a single
+   * evaluation covering all aggregated results (legacy behavior). For
+   * monitors with group-by attributes set, it returns one evaluation
+   * per unique series fingerprint — each with its own
+   * `MetricCriteriaContext` carrying that series' breaching samples
+   * and labels. The caller fans this out into one incident per
+   * breaching series.
+   */
+  public static evaluateAllSeries(input: {
+    dataToProcess: DataToProcess;
+    criteriaFilter: CriteriaFilter;
+    monitorStep: MonitorStep;
+  }): Array<MetricSeriesEvaluationResult> {
     if (
       input.criteriaFilter.metricMonitorOptions &&
       !input.criteriaFilter.metricMonitorOptions.metricAggregationType
@@ -41,20 +98,14 @@ export default class MetricMonitorCriteria {
     }
 
     if (input.criteriaFilter.checkOn !== CheckOn.MetricValue) {
-      return null;
+      return [];
     }
 
-    const rawThreshold: number | null = CompareCriteria.convertToNumber(
-      input.criteriaFilter.value,
-    );
-
-    const metricAlias: string =
-      input.criteriaFilter.metricMonitorOptions?.metricAlias || "";
-
     const metricResponse: MetricMonitorResponse =
       input.dataToProcess as MetricMonitorResponse;
-    const metricAggregatedResult: Array<AggregatedResult> =
-      metricResponse.metricResult || [];
+
+    const seriesBreakdown: Array<MetricSeriesResult> | undefined =
+      metricResponse.seriesBreakdown;
 
     const queryConfigs: Array<MetricQueryConfigData> =
       input.monitorStep.data?.metricMonitor?.metricViewConfig?.queryConfigs ||
@@ -63,6 +114,60 @@ export default class MetricMonitorCriteria {
       input.monitorStep.data?.metricMonitor?.metricViewConfig?.formulaConfigs ||
       [];
 
+    /*
+     * Series-less path: one synthetic "all-series" evaluation over the
+     * flat metricResult. Preserves the pre-group-by behavior exactly.
+     */
+    if (!seriesBreakdown || seriesBreakdown.length === 0) {
+      const result: MetricSeriesEvaluationResult =
+        MetricMonitorCriteria.evaluateOneSeries({
+          criteriaFilter: input.criteriaFilter,
+          aggregatedResults: metricResponse.metricResult || [],
+          queryConfigs,
+          formulaConfigs,
+          seriesFingerprint: undefined,
+          seriesLabels: {},
+        });
+      return [result];
+    }
+
+    return seriesBreakdown.map((series: MetricSeriesResult) => {
+      return MetricMonitorCriteria.evaluateOneSeries({
+        criteriaFilter: input.criteriaFilter,
+        aggregatedResults: series.aggregatedResults,
+        queryConfigs,
+        formulaConfigs,
+        seriesFingerprint: series.fingerprint,
+        seriesLabels: series.labels,
+      });
+    });
+  }
+
+  /**
+   * Core evaluation loop: compare the samples for one metric series
+   * against the criteria threshold. Builds the metric identity context,
+   * identifies breaching samples, and assembles the human-readable
+   * root-cause message. Factored out so `evaluateAllSeries` can invoke
+   * it once per series without duplicating logic.
+   */
+  private static evaluateOneSeries(input: {
+    criteriaFilter: CriteriaFilter;
+    aggregatedResults: Array<AggregatedResult>;
+    queryConfigs: Array<MetricQueryConfigData>;
+    formulaConfigs: Array<MetricFormulaConfigData>;
+    seriesFingerprint: string | undefined;
+    seriesLabels: JSONObject;
+  }): MetricSeriesEvaluationResult {
+    const rawThreshold: number | null = CompareCriteria.convertToNumber(
+      input.criteriaFilter.value,
+    );
+
+    const metricAlias: string =
+      input.criteriaFilter.metricMonitorOptions?.metricAlias || "";
+
+    const metricAggregatedResult: Array<AggregatedResult> =
+      input.aggregatedResults;
+
     /*
      * Resolve which query/formula the alias refers to. Use explicit index
      * checks (not `findIndex() || -1`, which incorrectly falls back to -1
@@ -73,25 +178,25 @@ export default class MetricMonitorCriteria {
     let aliasIndex: number = -1;
 
     if (metricAlias) {
-      const qIdx: number = queryConfigs.findIndex(
+      const qIdx: number = input.queryConfigs.findIndex(
         (q: MetricQueryConfigData) => {
           return q.metricAliasData?.metricVariable === metricAlias;
         },
       );
 
       if (qIdx >= 0) {
-        matchedQuery = queryConfigs[qIdx] || null;
+        matchedQuery = input.queryConfigs[qIdx] || null;
         aliasIndex = qIdx;
       } else {
-        const fIdx: number = formulaConfigs.findIndex(
+        const fIdx: number = input.formulaConfigs.findIndex(
           (f: MetricFormulaConfigData) => {
             return f.metricAliasData?.metricVariable === metricAlias;
           },
         );
 
         if (fIdx >= 0) {
-          matchedFormula = formulaConfigs[fIdx] || null;
-          aliasIndex = queryConfigs.length + fIdx;
+          matchedFormula = input.formulaConfigs[fIdx] || null;
+          aliasIndex = input.queryConfigs.length + fIdx;
         }
       }
     }
@@ -105,8 +210,8 @@ export default class MetricMonitorCriteria {
         ? metricAggregatedResult[aliasIndex]
         : metricAggregatedResult[0];
 
-    if (!matchedQuery && !matchedFormula && queryConfigs[0]) {
-      matchedQuery = queryConfigs[0];
+    if (!matchedQuery && !matchedFormula && input.queryConfigs[0]) {
+      matchedQuery = input.queryConfigs[0];
     }
 
     /*
@@ -119,14 +224,24 @@ export default class MetricMonitorCriteria {
         matchedFormula,
         metricAlias,
         criteriaFilter: input.criteriaFilter,
-        queryConfigs,
-        formulaConfigs,
+        queryConfigs: input.queryConfigs,
+        formulaConfigs: input.formulaConfigs,
       });
 
-    input.criteriaFilter.metricCriteriaContext = metricContext;
+    if (input.seriesFingerprint) {
+      metricContext.seriesFingerprint = input.seriesFingerprint;
+    }
+    if (input.seriesLabels && Object.keys(input.seriesLabels).length > 0) {
+      metricContext.seriesLabels = input.seriesLabels;
+    }
 
     if (rawThreshold === null) {
-      return null;
+      return {
+        fingerprint: input.seriesFingerprint,
+        labels: input.seriesLabels,
+        rootCause: null,
+        context: metricContext,
+      };
     }
 
     /*
@@ -180,11 +295,21 @@ export default class MetricMonitorCriteria {
         NoDataPolicy.Ignore;
 
       if (policy === NoDataPolicy.Ignore) {
-        return null;
+        return {
+          fingerprint: input.seriesFingerprint,
+          labels: input.seriesLabels,
+          rootCause: null,
+          context: metricContext,
+        };
       }
 
       if (policy === NoDataPolicy.Trigger) {
-        return `No data received for ${metricContext.metricName} in the evaluation window — triggering per no-data policy.`;
+        return {
+          fingerprint: input.seriesFingerprint,
+          labels: input.seriesLabels,
+          rootCause: `No data received for ${metricContext.metricName} in the evaluation window — triggering per no-data policy.`,
+          context: metricContext,
+        };
       }
 
       // TreatAsZero: fall through to the comparator with value 0.
@@ -206,7 +331,12 @@ export default class MetricMonitorCriteria {
       });
 
     if (!comparisonMessage) {
-      return null;
+      return {
+        fingerprint: input.seriesFingerprint,
+        labels: input.seriesLabels,
+        rootCause: null,
+        context: metricContext,
+      };
     }
 
     /*
@@ -232,8 +362,8 @@ export default class MetricMonitorCriteria {
       matchedFormula
         ? MetricMonitorCriteria.buildComponentValueLookup({
             components: metricContext.components || [],
-            queryConfigs,
-            formulaConfigs,
+            queryConfigs: input.queryConfigs,
+            formulaConfigs: input.formulaConfigs,
             metricAggregatedResult,
           })
         : null;
@@ -276,7 +406,12 @@ export default class MetricMonitorCriteria {
       metricContext.breachingSamples = breachingSamples;
     }
 
-    return comparisonMessage;
+    return {
+      fingerprint: input.seriesFingerprint,
+      labels: input.seriesLabels,
+      rootCause: comparisonMessage,
+      context: metricContext,
+    };
   }
 
   private static buildComponentValueLookup(input: {
@@ -438,6 +573,17 @@ export default class MetricMonitorCriteria {
       ? Object.keys(q.metricQueryData.groupBy as Record<string, unknown>)
       : [];
 
+    /*
+     * Include user-selected attribute keys as part of the groupBy view
+     * so the root-cause block shows "Grouped By: host.name" not just the
+     * raw columns ClickHouse was asked to partition on.
+     */
+    const groupByAttributeKeys: Array<string> =
+      q?.metricQueryData?.groupByAttributeKeys || [];
+    const allGroupBy: Array<string> = Array.from(
+      new Set([...groupBy, ...groupByAttributeKeys]),
+    );
+
     const components: Array<MetricComponent> | undefined = f
       ? MetricMonitorCriteria.buildFormulaComponents({
           formulaConfig: f,
@@ -454,7 +600,7 @@ export default class MetricMonitorCriteria {
       isFormula: Boolean(f),
       formulaExpression: f?.metricFormulaData?.metricFormula,
       filterAttributes,
-      groupBy,
+      groupBy: allGroupBy,
       timeWindowMinutes:
         input.criteriaFilter.evaluateOverTimeOptions?.timeValueInMinutes,
       ...(components && components.length > 0 ? { components } : {}),