@oneuptime/common 10.8.2 → 11.0.1

package/Server/Services/MetricAggregationService.ts

@@ -1,4 +1,5 @@
 import { SQL, Statement } from "../Utils/AnalyticsDatabase/Statement";
+import { getQuerySettings } from "../Utils/AnalyticsDatabase/QuerySettingsHelper";
 import MetricService from "./MetricService";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import { JSONObject } from "../../Types/JSON";
@@ -32,15 +33,15 @@ export interface FacetRequest extends MetricFilters {
 /*
  * Facet aggregation for the Metrics page sidebar. Same shape as
  * TraceAggregationService / LogAggregationService — per-facet GROUP BY on
- * the analytics table, with a `serviceType` discriminator that lets the
- * `serviceId` column carry Host / DockerHost / KubernetesCluster ids for
- * the corresponding virtual facets.
+ * the analytics table, with a `primaryEntityType` discriminator that lets
+ * the `primaryEntityId` column carry Host / DockerHost / KubernetesCluster
+ * ids for the corresponding virtual facets.
  */
 export class MetricAggregationService {
   private static readonly DEFAULT_FACET_LIMIT: number = 500;
   private static readonly TABLE_NAME: string = AnalyticsTableName.Metric;
   private static readonly TOP_LEVEL_COLUMNS: Set<string> = new Set([
-    "serviceId",
+    "primaryEntityId",
     "name",
   ]);
   private static readonly RESOURCE_FACET_KEYS: Map<string, ServiceType> =
@@ -82,6 +83,11 @@ export class MetricAggregationService {
   }
 
   private static buildFacetStatement(request: FacetRequest): Statement {
+    // Pre-rename alias from stale clients; the V3 column is primaryEntityId.
+    if (request.facetKey === "serviceId") {
+      request.facetKey = "primaryEntityId";
+    }
+
     const limit: number =
       request.limit ?? MetricAggregationService.DEFAULT_FACET_LIMIT;
 
@@ -98,7 +104,7 @@ export class MetricAggregationService {
 
     if (isResourceFacet) {
       statement.append(
-        SQL`SELECT toString(serviceId) AS val, count() AS cnt FROM ${MetricAggregationService.TABLE_NAME}`,
+        SQL`SELECT toString(primaryEntityId) AS val, count() AS cnt FROM ${MetricAggregationService.TABLE_NAME}`,
       );
     } else if (isTopLevelColumn) {
       statement.append(
@@ -106,10 +112,10 @@ export class MetricAggregationService {
       );
     } else {
       statement.append(
-        SQL`SELECT JSONExtractRaw(attributes, ${{
+        SQL`SELECT attributes[${{
           type: TableColumnType.Text,
           value: request.facetKey,
-        }}) AS val, count() AS cnt FROM ${MetricAggregationService.TABLE_NAME}`,
+        }}] AS val, count() AS cnt FROM ${MetricAggregationService.TABLE_NAME}`,
       );
     }
 
@@ -128,27 +134,33 @@ export class MetricAggregationService {
 
     if (isResourceFacet) {
       statement.append(
-        SQL` AND serviceType = ${{
+        SQL` AND primaryEntityType = ${{
           type: TableColumnType.Text,
           value: resourceServiceType as string,
         }}`,
       );
-    } else if (request.facetKey === "serviceId") {
+    } else if (request.facetKey === "primaryEntityId") {
       statement.append(
-        SQL` AND (serviceType = '' OR serviceType = ${{
+        SQL` AND (primaryEntityType = '' OR primaryEntityType = ${{
           type: TableColumnType.Text,
           value: ServiceType.OpenTelemetry as string,
         }})`,
       );
     } else if (!isTopLevelColumn) {
       statement.append(
-        SQL` AND JSONHas(attributes, ${{
+        SQL` AND mapContains(attributes, ${{
           type: TableColumnType.Text,
           value: request.facetKey,
-        }}) = 1`,
+        }})`,
       );
     }
 
+    /*
+     * Read-side retention filter: rows past their per-service retention
+     * stay in their part until the whole part drops (ttl_only_drop_parts).
+     */
+    statement.append(" AND retentionDate >= now()");
+
     MetricAggregationService.appendCommonFilters(statement, request);
 
     statement.append(
@@ -163,7 +175,10 @@ export class MetricAggregationService {
      * so a slow facet never starves the endpoint.
      */
     statement.append(
-      " SETTINGS max_execution_time = 45, timeout_overflow_mode = 'break'",
+      getQuerySettings({
+        maxExecutionTimeInSeconds: 45,
+        timeoutOverflowMode: "break",
+      }),
     );
 
     return statement;
@@ -175,7 +190,7 @@ export class MetricAggregationService {
   ): void {
     if (request.serviceIds && request.serviceIds.length > 0) {
       statement.append(
-        SQL` AND serviceId IN (${{
+        SQL` AND primaryEntityId IN (${{
           type: TableColumnType.ObjectID,
           value: new Includes(
             request.serviceIds.map((id: ObjectID) => {

package/Server/Services/MetricBaselineService.ts

@@ -98,19 +98,19 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
   ];
 
   /**
-   * Fetch the rolling-window baseline for one (metric, [service],
+   * Fetch the rolling-window baseline for one (metric, [entity],
    * hour-of-week) cell. Aggregates the AggregateFunction states across
    * the last `windowDays` days. Returns null when no data exists.
    *
-   * `serviceId` is optional: when omitted, baselines are aggregated
-   * across every serviceId that ingested the metric in the window.
-   * Useful for monitor criteria whose query isn't scoped to a single
-   * telemetry service.
+   * `primaryEntityId` is optional: when omitted, baselines are
+   * aggregated across every primaryEntityId that ingested the metric in
+   * the window. Useful for monitor criteria whose query isn't scoped to
+   * a single telemetry service.
    */
   public async getBaseline(input: {
     projectId: ObjectID | string;
     metricName: string;
-    serviceId?: ObjectID | string | undefined;
+    primaryEntityId?: ObjectID | string | undefined;
     hourOfWeek: number;
     windowDays?: number | undefined;
     minSamples?: number | undefined;
@@ -133,27 +133,27 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
       Math.min(167, Math.floor(input.hourOfWeek)),
     );
 
-    const serviceIdClause: string = input.serviceId
-      ? `AND serviceId = '${this.escapeString(
-          input.serviceId instanceof ObjectID
-            ? input.serviceId.toString()
-            : input.serviceId,
+    const primaryEntityIdClause: string = input.primaryEntityId
+      ? `AND primaryEntityId = '${this.escapeString(
+          input.primaryEntityId instanceof ObjectID
+            ? input.primaryEntityId.toString()
+            : input.primaryEntityId,
         )}'`
       : "";
 
     const sql: string = `
       SELECT
-        countMerge(sampleCountState)         AS sampleCount,
-        avgMerge(meanState)                  AS mean,
-        stddevPopMerge(stddevState)          AS stddev,
-        quantileMerge(0.5)(medianState)      AS median,
-        quantileMerge(0.95)(p95State)        AS p95,
-        minMerge(minObsState)                AS minObserved,
-        maxMerge(maxObsState)                AS maxObserved
+        countMerge(sampleCountState)                AS sampleCount,
+        avgMerge(meanState)                         AS mean,
+        stddevPopMerge(stddevState)                 AS stddev,
+        quantileBFloat16Merge(0.5)(medianState)     AS median,
+        quantileBFloat16Merge(0.95)(p95State)       AS p95,
+        minMerge(minObsState)                       AS minObserved,
+        maxMerge(maxObsState)                       AS maxObserved
       FROM MetricBaselineHourly
       WHERE projectId = '${projectIdStr}'
         AND name = '${metricNameStr}'
-        ${serviceIdClause}
+        ${primaryEntityIdClause}
         AND hourOfWeek = ${hour}
         AND day >= today() - INTERVAL ${windowDays} DAY
     `;
@@ -223,13 +223,13 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
 
   /**
    * Coverage probe: how much baseline data we have for a (metric,
-   * service) pair. Used by the form UI to show "Learning — N days of
+   * entity) pair. Used by the form UI to show "Learning — N days of
    * data, baseline ready in M days".
    */
   public async getCoverage(input: {
     projectId: ObjectID | string;
     metricName: string;
-    serviceId?: ObjectID | string | undefined;
+    primaryEntityId?: ObjectID | string | undefined;
   }): Promise<{ totalSamples: number; oldestDay: Date | null }> {
     const projectIdStr: string = this.escapeString(
       input.projectId instanceof ObjectID
@@ -238,11 +238,11 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
     );
     const metricNameStr: string = this.escapeString(input.metricName);
 
-    const serviceIdClause: string = input.serviceId
-      ? `AND serviceId = '${this.escapeString(
-          input.serviceId instanceof ObjectID
-            ? input.serviceId.toString()
-            : input.serviceId,
+    const primaryEntityIdClause: string = input.primaryEntityId
+      ? `AND primaryEntityId = '${this.escapeString(
+          input.primaryEntityId instanceof ObjectID
+            ? input.primaryEntityId.toString()
+            : input.primaryEntityId,
         )}'`
       : "";
 
@@ -253,7 +253,7 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
       FROM MetricBaselineHourly
       WHERE projectId = '${projectIdStr}'
         AND name = '${metricNameStr}'
-        ${serviceIdClause}
+        ${primaryEntityIdClause}
         AND day >= today() - INTERVAL ${MetricBaselineService.MAX_WINDOW_DAYS} DAY
     `;
 
@@ -295,7 +295,7 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
   public async getBandSeries(input: {
     projectId: ObjectID | string;
     metricName: string;
-    serviceId?: ObjectID | string | undefined;
+    primaryEntityId?: ObjectID | string | undefined;
     startTime: Date;
     endTime: Date;
     intervalMinutes: number;
@@ -317,11 +317,11 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
     );
     const metricNameStr: string = this.escapeString(input.metricName);
 
-    const serviceIdClause: string = input.serviceId
-      ? `AND serviceId = '${this.escapeString(
-          input.serviceId instanceof ObjectID
-            ? input.serviceId.toString()
-            : input.serviceId,
+    const primaryEntityIdClause: string = input.primaryEntityId
+      ? `AND primaryEntityId = '${this.escapeString(
+          input.primaryEntityId instanceof ObjectID
+            ? input.primaryEntityId.toString()
+            : input.primaryEntityId,
         )}'`
       : "";
 
@@ -334,7 +334,7 @@ export class MetricBaselineService extends AnalyticsDatabaseService<MetricBaseli
       FROM MetricBaselineHourly
       WHERE projectId = '${projectIdStr}'
         AND name = '${metricNameStr}'
-        ${serviceIdClause}
+        ${primaryEntityIdClause}
         AND day >= today() - INTERVAL ${windowDays} DAY
       GROUP BY hourOfWeek
     `;

package/Server/Services/MetricItemAggMV1mByHostV2Service.ts

@@ -0,0 +1,30 @@
+import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
+import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
+import MetricItemAggMV1mByHostV2 from "../../Models/AnalyticsModels/MetricItemAggMV1mByHostV2";
+
+/**
+ * Read-side service for the `MetricItemAggMV1mByHostV2` MV target table —
+ * per-(host entity key, minute) pre-aggregated metric values for
+ * host-detail chart queries. Sister of `MetricItemAggMV1mService` (which
+ * is keyed by primaryEntityId rather than host).
+ *
+ * Today's reads go through `MetricService.tryBuildHostAggregateMVStatement`
+ * with raw SQL; this service exists so the model is registered with the
+ * analytics framework and the auto-create flow can manage the table + MV
+ * on app startup (idempotent with the RekeyMetricHostRollupToEntityKey
+ * migration, which also backfills from the dropped V1 table).
+ *
+ * AggregateFunction columns require `*Merge()` finalizers at read time —
+ * the generic typed `findBy` path is therefore not useful and should not
+ * be relied on against this table.
+ */
+export class MetricItemAggMV1mByHostV2Service extends AnalyticsDatabaseService<MetricItemAggMV1mByHostV2> {
+  public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) {
+    super({
+      modelType: MetricItemAggMV1mByHostV2,
+      database: clickhouseDatabase,
+    });
+  }
+}
+
+export default new MetricItemAggMV1mByHostV2Service();

package/Server/Services/MetricService.ts

@@ -7,6 +7,7 @@ import AggregateBy, {
 import DeleteBy from "../Types/AnalyticsDatabase/DeleteBy";
 import Query from "../Types/AnalyticsDatabase/Query";
 import { SQL, Statement } from "../Utils/AnalyticsDatabase/Statement";
+import { getQuerySettings } from "../Utils/AnalyticsDatabase/QuerySettingsHelper";
 import AggregationType, {
   getPercentileLevel,
   isPercentileAggregation,
@@ -14,6 +15,8 @@ import AggregationType, {
 import AggregationInterval from "../../Types/BaseDatabase/AggregationInterval";
 import AnalyticsTableName from "../../Types/AnalyticsDatabase/AnalyticsTableName";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
+import { keyForHost } from "../../Utils/Telemetry/EntityKey";
+import ObjectID from "../../Types/ObjectID";
 import logger, { LogAttributes } from "../Utils/Logger";
 
 export class MetricService extends AnalyticsDatabaseService<Metric> {
@@ -22,7 +25,7 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
   }
 
   /*
-   * Cascade deletes from `MetricItemV2` into the aggregating
+   * Cascade deletes from `MetricItemV3` into the aggregating
    * materialized-view target tables.
    *
    * `MetricItemAggMV1m` and `MetricBaselineHourly` are AggregatingMergeTree
@@ -35,12 +38,12 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
    * See https://github.com/OneUptime/oneuptime/issues/2419.
    *
    * The cascade only runs when the caller scoped the delete by
-   * `serviceId`. Global time-based purges (TTL cleanup) are handled by
-   * each MV table's own `retentionDate TTL DELETE`, so cascading those
+   * `primaryEntityId`. Global time-based purges (TTL cleanup) are handled
+   * by each MV table's own `retentionDate TTL DELETE`, so cascading those
    * would pointlessly scan the whole MV. The per-host MV
-   * (`MetricItemAggMV1mByHost`) is keyed by `hostIdentifier` rather than
-   * `serviceId`, so a service-scoped delete has nothing to remove there —
-   * skip it.
+   * (`MetricItemAggMV1mByHostV2`) is keyed by `hostEntityKey` rather than
+   * `primaryEntityId`, so an entity-scoped delete has nothing to remove
+   * there — skip it.
    */
   public override async deleteBy(deleteBy: DeleteBy<Metric>): Promise<void> {
     await super.deleteBy(deleteBy);
@@ -96,29 +99,29 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
     >;
 
     /*
-     * Cascade only when the delete is scoped by serviceId. The MV sort
-     * key is (projectId, name, serviceId, bucketTime); without serviceId
-     * the DELETE would scan a huge swath of unrelated rows and risk
-     * removing data that belongs to other entities sharing the same
-     * project.
+     * Cascade only when the delete is scoped by primaryEntityId. The MV
+     * sort key is (projectId, name, primaryEntityId, bucketTime); without
+     * primaryEntityId the DELETE would scan a huge swath of unrelated
+     * rows and risk removing data that belongs to other entities sharing
+     * the same project.
      */
     if (
-      queryRecord["serviceId"] === undefined ||
-      queryRecord["serviceId"] === null
+      queryRecord["primaryEntityId"] === undefined ||
+      queryRecord["primaryEntityId"] === null
     ) {
       return null;
     }
 
     /*
      * Only project the keys the MV target tables actually expose.
-     * `time`, `attributes`, `serviceType`, and the metric-payload
+     * `time`, `attributes`, `primaryEntityType`, and the metric-payload
      * columns don't exist on the MV schema and would either fail
      * where-statement generation or reference a missing column.
      */
     const allowedKeys: ReadonlyArray<string> = [
       "projectId",
       "name",
-      "serviceId",
+      "primaryEntityId",
     ];
     const out: Record<string, unknown> = {};
     for (const key of allowedKeys) {
@@ -175,7 +178,7 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
        * dominant attribute-filtered path and the per-host MV is
        * the only one that can serve them. If it doesn't apply
        * (no host filter, or extra attrs/groupBy), fall through
-       * to the project/serviceId MV, then to the base table.
+       * to the project/primaryEntityId MV, then to the base table.
        */
       const hostMvStatement: {
         statement: Statement;
@@ -329,6 +332,7 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
       ` FROM ${databaseName}.${this.model.tableName} WHERE TRUE `,
     );
     statement.append(whereStatement);
+    statement.append(this.getRetentionReadFilter());
     statement.append(SQL`) `);
 
     statement.append(SQL` GROUP BY `).append(`${aggregationTimestampColumn}`);
@@ -358,7 +362,13 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
      * cluster behavior consistent across aggregation kinds.
      */
     statement.append(
-      ` SETTINGS optimize_aggregation_in_order=1, optimize_move_to_prewhere=1, max_threads=4`,
+      getQuerySettings({
+        additionalSettings: {
+          optimize_aggregation_in_order: 1,
+          optimize_move_to_prewhere: 1,
+          max_threads: 4,
+        },
+      }),
     );
 
     const columns: Array<string> = [
@@ -388,7 +398,7 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
    *   - The dashboard's effective bucket interval is >= 1 minute (the
    *     MV stores 1-minute states; sub-minute requests need raw rows).
    *   - The query carries no per-attribute filter or group-by, since
-   *     the MV is keyed by (projectId, name, serviceId, bucketTime)
+   *     the MV is keyed by (projectId, name, primaryEntityId, bucketTime)
    *     only — it does not preserve attribute breakdowns.
    *   - The query carries no group-by other than the time bucket.
    *
@@ -449,6 +459,26 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
       return null;
     }
 
+    /*
+     * The MV only carries projectId/name/primaryEntityId/bucketTime, so a
+     * query filtering on any other column (e.g. entityKeys membership,
+     * which exists only on the raw Metric table) must fall back to the
+     * raw-table path or the generated WHERE would reference a column the
+     * MV does not have.
+     */
+    const mvQueryableColumns: ReadonlyArray<string> = [
+      "projectId",
+      "name",
+      "primaryEntityId",
+      "time", // stripped below; bucketTime range is added explicitly
+      "attributes", // guarded empty above
+    ];
+    for (const queryKey of Object.keys(queryRecord)) {
+      if (!mvQueryableColumns.includes(queryKey)) {
+        return null;
+      }
+    }
+
     if (!this.database) {
       this.useDefaultDatabase();
     }
@@ -490,7 +520,7 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
     );
     statement.append(SQL` FROM ${databaseName}.MetricItemAggMV1m`);
     statement.append(
-      ` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp!)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp!)}')`,
+      ` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp!)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp!)}')${this.getRetentionReadFilter()}`,
     );
     statement.append(SQL` `).append(nonTimeWhere);
 
@@ -509,7 +539,13 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
       }} `,
     );
     statement.append(
-      ` SETTINGS optimize_aggregation_in_order=1, optimize_move_to_prewhere=1, max_threads=4`,
+      getQuerySettings({
+        additionalSettings: {
+          optimize_aggregation_in_order: 1,
+          optimize_move_to_prewhere: 1,
+          max_threads: 4,
+        },
+      }),
     );
 
     logger.debug(`${this.model.tableName} MV Aggregate Statement`, {
@@ -531,16 +567,20 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
   /*
    * Per-host materialized-view fast path.
    *
-   * Returns a statement that reads from MetricItemAggMV1mByHost
-   * (created by AddMetricMinuteAggregateByHostMaterializedView)
-   * when:
+   * Returns a statement that reads from MetricItemAggMV1mByHostV2
+   * (created by RekeyMetricHostRollupToEntityKey), which is keyed by
+   * the stable `hostEntityKey` — the incoming `resource.host.name`
+   * filter value is folded into that key server-side via
+   * EntityKey.keyForHost, so spelling drift (case/whitespace) in the
+   * reported hostname still lands on one rollup stream. Applies when:
    *
    *   - The aggregation is Sum/Avg/Min/Max/Count over `value`.
    *   - The only attribute filter is `resource.host.name` as a
    *     bare-string equality (the dashboard's host detail page
-   *     pattern).
+   *     pattern), and the query carries a `projectId` (the entity
+   *     key is tenant-scoped by construction).
    *   - The query carries no group-by other than the time
-   *     bucket — the MV is keyed by hostIdentifier and does not
+   *     bucket — the MV is keyed by hostEntityKey and does not
    *     preserve other attribute breakdowns.
    *
    * Returns `null` if any condition fails so the caller falls
@@ -601,12 +641,54 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
     if (attrValue === undefined || attrValue === null) {
       return null;
     }
+
+    /*
+     * The MV only carries projectId/name/hostEntityKey/bucketTime. Any
+     * other query key (primaryEntityId, entityScope, entityKeys, ...)
+     * would compile to a WHERE over a column the MV does not have, so
+     * fall back to the raw table for those. Mirrors
+     * tryBuildMinuteAggregateMVStatement.
+     */
+    const mvQueryableColumns: ReadonlyArray<string> = [
+      "projectId",
+      "name",
+      "time", // stripped below; bucketTime range is added explicitly
+      "attributes", // rewritten below into the hostEntityKey predicate
+    ];
+    for (const queryKey of Object.keys(queryRecord)) {
+      if (!mvQueryableColumns.includes(queryKey)) {
+        return null;
+      }
+    }
     const hostIdentifier: string =
       typeof attrValue === "string" ? attrValue : "";
     if (!hostIdentifier) {
       return null;
     }
 
+    /*
+     * The entity key folds the tenant in (sha256(projectId|host|...)), so
+     * the MV row can only be located when the query is project-scoped.
+     * Dashboard reads always are; anything else falls back safely.
+     */
+    const projectIdValue: unknown = queryRecord["projectId"];
+    let projectId: string = "";
+    if (projectIdValue instanceof ObjectID) {
+      projectId = projectIdValue.toString();
+    } else if (typeof projectIdValue === "string") {
+      projectId = projectIdValue;
+    }
+    if (!projectId) {
+      return null;
+    }
+
+    /*
+     * Same canonicalized key the ingest pipeline stamps into
+     * MetricItemV3.hostEntityKey (and the V2 MV groups by) — byte-equality
+     * is what makes this lookup correct, see Common/Utils/Telemetry/EntityKey.
+     */
+    const hostEntityKey: string = keyForHost(projectId, hostIdentifier);
+
     const interval: AggregationInterval = AggregateUtil.getAggregationInterval({
       startDate: aggregateBy.startTimestamp!,
       endDate: aggregateBy.endTimestamp!,
@@ -637,7 +719,7 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
      * Strip both `time` (column doesn't exist on the MV; we
      * inject an explicit bucketTime range below) and
      * `attributes` (the attribute filter is now an explicit
-     * `hostIdentifier =` predicate against an MV column).
+     * `hostEntityKey =` predicate against an MV column).
      */
     const filteredQuery: typeof aggregateBy.query =
       this.stripAttributesAndTimeFromQuery(
@@ -654,13 +736,13 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
     statement.append(
       `SELECT ${mergedExpr} as value, date_trunc('${intervalLower}', toStartOfInterval(bucketTime, INTERVAL 1 ${intervalLower})) as time`,
     );
-    statement.append(SQL` FROM ${databaseName}.MetricItemAggMV1mByHost`);
+    statement.append(SQL` FROM ${databaseName}.MetricItemAggMV1mByHostV2`);
     statement.append(
-      ` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp!)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp!)}')`,
+      ` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp!)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp!)}')${this.getRetentionReadFilter()}`,
     );
     statement.append(
-      SQL` AND hostIdentifier = ${{
-        value: hostIdentifier,
+      SQL` AND hostEntityKey = ${{
+        value: hostEntityKey,
         type: TableColumnType.Text,
       }}`,
     );
@@ -681,7 +763,13 @@ export class MetricService extends AnalyticsDatabaseService<Metric> {
       }} `,
     );
     statement.append(
-      ` SETTINGS optimize_aggregation_in_order=1, optimize_move_to_prewhere=1, max_threads=4`,
+      getQuerySettings({
+        additionalSettings: {
+          optimize_aggregation_in_order: 1,
+          optimize_move_to_prewhere: 1,
+          max_threads: 4,
+        },
+      }),
     );
 
     logger.debug(`${this.model.tableName} Host MV Aggregate Statement`, {