@oneuptime/common 10.8.2 → 11.0.0

package/build/dist/Server/Services/MetricAggregationService.js

@@ -8,6 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { SQL, Statement } from "../Utils/AnalyticsDatabase/Statement";
+import { getQuerySettings } from "../Utils/AnalyticsDatabase/QuerySettingsHelper";
 import MetricService from "./MetricService";
 import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
 import BadDataException from "../../Types/Exception/BadDataException";
@@ -18,9 +19,9 @@ import ServiceType from "../../Types/Telemetry/ServiceType";
 /*
  * 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 {
     static async getFacetValues(request) {
@@ -41,6 +42,10 @@ export class MetricAggregationService {
     }
     static buildFacetStatement(request) {
         var _a;
+        // Pre-rename alias from stale clients; the V3 column is primaryEntityId.
+        if (request.facetKey === "serviceId") {
+            request.facetKey = "primaryEntityId";
+        }
         const limit = (_a = request.limit) !== null && _a !== void 0 ? _a : MetricAggregationService.DEFAULT_FACET_LIMIT;
         MetricAggregationService.validateFacetKey(request.facetKey);
         const resourceServiceType = MetricAggregationService.RESOURCE_FACET_KEYS.get(request.facetKey);
@@ -49,16 +54,16 @@ export class MetricAggregationService {
             MetricAggregationService.isTopLevelColumn(request.facetKey);
         const statement = new Statement();
         if (isResourceFacet) {
-            statement.append(SQL `SELECT toString(serviceId) AS val, count() AS cnt FROM ${MetricAggregationService.TABLE_NAME}`);
+            statement.append(SQL `SELECT toString(primaryEntityId) AS val, count() AS cnt FROM ${MetricAggregationService.TABLE_NAME}`);
         }
         else if (isTopLevelColumn) {
             statement.append(SQL `SELECT toString(${request.facetKey}) AS val, count() AS cnt FROM ${MetricAggregationService.TABLE_NAME}`);
         }
         else {
-            statement.append(SQL `SELECT JSONExtractRaw(attributes, ${{
+            statement.append(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}`);
         }
         statement.append(SQL ` WHERE projectId = ${{
             type: TableColumnType.ObjectID,
@@ -71,23 +76,28 @@ export class MetricAggregationService {
             value: request.endTime,
         }}`);
         if (isResourceFacet) {
-            statement.append(SQL ` AND serviceType = ${{
+            statement.append(SQL ` AND primaryEntityType = ${{
                 type: TableColumnType.Text,
                 value: resourceServiceType,
             }}`);
         }
-        else if (request.facetKey === "serviceId") {
-            statement.append(SQL ` AND (serviceType = '' OR serviceType = ${{
+        else if (request.facetKey === "primaryEntityId") {
+            statement.append(SQL ` AND (primaryEntityType = '' OR primaryEntityType = ${{
                 type: TableColumnType.Text,
                 value: ServiceType.OpenTelemetry,
             }})`);
         }
         else if (!isTopLevelColumn) {
-            statement.append(SQL ` AND JSONHas(attributes, ${{
+            statement.append(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(SQL ` GROUP BY val ORDER BY cnt DESC LIMIT ${{
             type: TableColumnType.Number,
@@ -97,12 +107,15 @@ export class MetricAggregationService {
          * Defense in depth: cap runtime below nginx's 60s proxy_read_timeout
          * so a slow facet never starves the endpoint.
          */
-        statement.append(" SETTINGS max_execution_time = 45, timeout_overflow_mode = 'break'");
+        statement.append(getQuerySettings({
+            maxExecutionTimeInSeconds: 45,
+            timeoutOverflowMode: "break",
+        }));
         return statement;
     }
     static appendCommonFilters(statement, request) {
         if (request.serviceIds && request.serviceIds.length > 0) {
-            statement.append(SQL ` AND serviceId IN (${{
+            statement.append(SQL ` AND primaryEntityId IN (${{
                 type: TableColumnType.ObjectID,
                 value: new Includes(request.serviceIds.map((id) => {
                     return id.toString();
@@ -139,7 +152,7 @@ export class MetricAggregationService {
 MetricAggregationService.DEFAULT_FACET_LIMIT = 500;
 MetricAggregationService.TABLE_NAME = AnalyticsTableName.Metric;
 MetricAggregationService.TOP_LEVEL_COLUMNS = new Set([
-    "serviceId",
+    "primaryEntityId",
     "name",
 ]);
 MetricAggregationService.RESOURCE_FACET_KEYS = new Map([

package/build/dist/Server/Services/MetricAggregationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetricAggregationService.js","sourceRoot":"","sources":["../../../../Server/Services/MetricAggregationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MetricAggregationService.js","sourceRoot":"","sources":["../../../../Server/Services/MetricAggregationService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/MetricBaselineService.js

@@ -23,14 +23,14 @@ export class MetricBaselineService extends AnalyticsDatabaseService {
         super({ modelType: MetricBaselineHourly, database: clickhouseDatabase });
     }
     /**
-     * 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.
      */
     async getBaseline(input) {
         const windowDays = Math.min(input.windowDays || MetricBaselineService.DEFAULT_WINDOW_DAYS, MetricBaselineService.MAX_WINDOW_DAYS);
@@ -40,24 +40,24 @@ export class MetricBaselineService extends AnalyticsDatabaseService {
             : input.projectId);
         const metricNameStr = this.escapeString(input.metricName);
         const hour = Math.max(0, Math.min(167, Math.floor(input.hourOfWeek)));
-        const serviceIdClause = input.serviceId
-            ? `AND serviceId = '${this.escapeString(input.serviceId instanceof ObjectID
-                ? input.serviceId.toString()
-                : input.serviceId)}'`
+        const primaryEntityIdClause = input.primaryEntityId
+            ? `AND primaryEntityId = '${this.escapeString(input.primaryEntityId instanceof ObjectID
+                ? input.primaryEntityId.toString()
+                : input.primaryEntityId)}'`
             : "";
         const sql = `
       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
     `;
@@ -94,7 +94,7 @@ export class MetricBaselineService extends AnalyticsDatabaseService {
     }
     /**
      * 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".
      */
     async getCoverage(input) {
@@ -102,10 +102,10 @@ export class MetricBaselineService extends AnalyticsDatabaseService {
             ? input.projectId.toString()
             : input.projectId);
         const metricNameStr = this.escapeString(input.metricName);
-        const serviceIdClause = input.serviceId
-            ? `AND serviceId = '${this.escapeString(input.serviceId instanceof ObjectID
-                ? input.serviceId.toString()
-                : input.serviceId)}'`
+        const primaryEntityIdClause = input.primaryEntityId
+            ? `AND primaryEntityId = '${this.escapeString(input.primaryEntityId instanceof ObjectID
+                ? input.primaryEntityId.toString()
+                : input.primaryEntityId)}'`
             : "";
         const sql = `
       SELECT
@@ -114,7 +114,7 @@ export class MetricBaselineService extends AnalyticsDatabaseService {
       FROM MetricBaselineHourly
       WHERE projectId = '${projectIdStr}'
         AND name = '${metricNameStr}'
-        ${serviceIdClause}
+        ${primaryEntityIdClause}
         AND day >= today() - INTERVAL ${MetricBaselineService.MAX_WINDOW_DAYS} DAY
     `;
         const resultSet = (await this.executeQuery(sql));
@@ -144,10 +144,10 @@ export class MetricBaselineService extends AnalyticsDatabaseService {
             ? input.projectId.toString()
             : input.projectId);
         const metricNameStr = this.escapeString(input.metricName);
-        const serviceIdClause = input.serviceId
-            ? `AND serviceId = '${this.escapeString(input.serviceId instanceof ObjectID
-                ? input.serviceId.toString()
-                : input.serviceId)}'`
+        const primaryEntityIdClause = input.primaryEntityId
+            ? `AND primaryEntityId = '${this.escapeString(input.primaryEntityId instanceof ObjectID
+                ? input.primaryEntityId.toString()
+                : input.primaryEntityId)}'`
             : "";
         const sql = `
       SELECT
@@ -158,7 +158,7 @@ export class MetricBaselineService extends AnalyticsDatabaseService {
       FROM MetricBaselineHourly
       WHERE projectId = '${projectIdStr}'
         AND name = '${metricNameStr}'
-        ${serviceIdClause}
+        ${primaryEntityIdClause}
         AND day >= today() - INTERVAL ${windowDays} DAY
       GROUP BY hourOfWeek
     `;

package/build/dist/Server/Services/MetricBaselineService.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetricBaselineService.js","sourceRoot":"","sources":["../../../../Server/Services/MetricBaselineService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MetricBaselineService.js","sourceRoot":"","sources":["../../../../Server/Services/MetricBaselineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/MetricItemAggMV1mByHostV2Service.js

@@ -0,0 +1,28 @@
+import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
+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 {
+    constructor(clickhouseDatabase) {
+        super({
+            modelType: MetricItemAggMV1mByHostV2,
+            database: clickhouseDatabase,
+        });
+    }
+}
+export default new MetricItemAggMV1mByHostV2Service();
+//# sourceMappingURL=MetricItemAggMV1mByHostV2Service.js.map

package/build/dist/Server/Services/MetricItemAggMV1mByHostV2Service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MetricItemAggMV1mByHostV2Service.js","sourceRoot":"","sources":["../../../../Server/Services/MetricItemAggMV1mByHostV2Service.ts"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAElE,OAAO,yBAAyB,MAAM,wDAAwD,CAAC;AAE/F;;;;;;;;;;;;;;;GAeG;AACH,MAAM,OAAO,gCAAiC,SAAQ,wBAAmD;IACvG,YAAmB,kBAAmD;QACpE,KAAK,CAAC;YACJ,SAAS,EAAE,yBAAyB;YACpC,QAAQ,EAAE,kBAAkB;SAC7B,CAAC,CAAC;IACL,CAAC;CACF;AAED,eAAe,IAAI,gCAAgC,EAAE,CAAC"}

package/build/dist/Server/Services/MetricService.js

@@ -2,16 +2,19 @@ import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
 import Metric from "../../Models/AnalyticsModels/Metric";
 import { AggregateUtil, } from "../Types/AnalyticsDatabase/AggregateBy";
 import { SQL } from "../Utils/AnalyticsDatabase/Statement";
+import { getQuerySettings } from "../Utils/AnalyticsDatabase/QuerySettingsHelper";
 import AggregationType, { getPercentileLevel, isPercentileAggregation, } from "../../Types/BaseDatabase/AggregationType";
 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 from "../Utils/Logger";
 export class MetricService extends AnalyticsDatabaseService {
     constructor(clickhouseDatabase) {
         super({ modelType: Metric, database: clickhouseDatabase });
     }
     /*
-     * Cascade deletes from `MetricItemV2` into the aggregating
+     * Cascade deletes from `MetricItemV3` into the aggregating
      * materialized-view target tables.
      *
      * `MetricItemAggMV1m` and `MetricBaselineHourly` are AggregatingMergeTree
@@ -24,12 +27,12 @@ export class MetricService extends AnalyticsDatabaseService {
      * 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.
      */
     async deleteBy(deleteBy) {
         await super.deleteBy(deleteBy);
@@ -68,26 +71,26 @@ export class MetricService extends AnalyticsDatabaseService {
         }
         const queryRecord = query;
         /*
-         * 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) {
+        if (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 = [
             "projectId",
             "name",
-            "serviceId",
+            "primaryEntityId",
         ];
         const out = {};
         for (const key of allowedKeys) {
@@ -139,7 +142,7 @@ export class MetricService extends AnalyticsDatabaseService {
              * 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 = this.tryBuildHostAggregateMVStatement(aggregateBy);
             if (hostMvStatement) {
@@ -262,6 +265,7 @@ export class MetricService extends AnalyticsDatabaseService {
         statement.append(`SELECT ${innerSelectClause}`);
         statement.append(` FROM ${databaseName}.${this.model.tableName} WHERE TRUE `);
         statement.append(whereStatement);
+        statement.append(this.getRetentionReadFilter());
         statement.append(SQL `) `);
         statement.append(SQL ` GROUP BY `).append(`${aggregationTimestampColumn}`);
         for (const key of groupByKeys) {
@@ -282,7 +286,13 @@ export class MetricService extends AnalyticsDatabaseService {
          * path bypasses the base method, so we mirror them here to keep
          * cluster behavior consistent across aggregation kinds.
          */
-        statement.append(` SETTINGS optimize_aggregation_in_order=1, optimize_move_to_prewhere=1, max_threads=4`);
+        statement.append(getQuerySettings({
+            additionalSettings: {
+                optimize_aggregation_in_order: 1,
+                optimize_move_to_prewhere: 1,
+                max_threads: 4,
+            },
+        }));
         const columns = [
             aggregationColumn,
             aggregationTimestampColumn,
@@ -307,7 +317,7 @@ export class MetricService extends AnalyticsDatabaseService {
      *   - 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.
      *
@@ -354,6 +364,25 @@ export class MetricService extends AnalyticsDatabaseService {
         if (aggregateBy.groupBy && Object.keys(aggregateBy.groupBy).length > 0) {
             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 = [
+            "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();
         }
@@ -387,7 +416,7 @@ export class MetricService extends AnalyticsDatabaseService {
         const statement = SQL ``;
         statement.append(`SELECT ${mergedExpr} as value, date_trunc('${intervalLower}', toStartOfInterval(bucketTime, INTERVAL 1 ${intervalLower})) as time`);
         statement.append(SQL ` FROM ${databaseName}.MetricItemAggMV1m`);
-        statement.append(` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp)}')`);
+        statement.append(` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp)}')${this.getRetentionReadFilter()}`);
         statement.append(SQL ` `).append(nonTimeWhere);
         statement.append(SQL ` GROUP BY `).append(`time`);
         statement.append(SQL ` ORDER BY `).append(sortStatement);
@@ -399,7 +428,13 @@ export class MetricService extends AnalyticsDatabaseService {
             value: Number(aggregateBy.skip),
             type: TableColumnType.Number,
         }} `);
-        statement.append(` SETTINGS optimize_aggregation_in_order=1, optimize_move_to_prewhere=1, max_threads=4`);
+        statement.append(getQuerySettings({
+            additionalSettings: {
+                optimize_aggregation_in_order: 1,
+                optimize_move_to_prewhere: 1,
+                max_threads: 4,
+            },
+        }));
         logger.debug(`${this.model.tableName} MV Aggregate Statement`, {
             tableName: this.model.tableName,
         });
@@ -417,16 +452,20 @@ export class MetricService extends AnalyticsDatabaseService {
     /*
      * 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
@@ -477,10 +516,50 @@ export class MetricService extends AnalyticsDatabaseService {
         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 = [
+            "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 = 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 = queryRecord["projectId"];
+        let projectId = "";
+        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 = keyForHost(projectId, hostIdentifier);
         const interval = AggregateUtil.getAggregationInterval({
             startDate: aggregateBy.startTimestamp,
             endDate: aggregateBy.endTimestamp,
@@ -511,17 +590,17 @@ export class MetricService extends AnalyticsDatabaseService {
          * 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 = this.stripAttributesAndTimeFromQuery(aggregateBy.query);
         const nonTimeWhere = this.statementGenerator.toWhereStatement(filteredQuery);
         const sortStatement = this.statementGenerator.toSortStatement(aggregateBy.sort);
         const statement = SQL ``;
         statement.append(`SELECT ${mergedExpr} as value, date_trunc('${intervalLower}', toStartOfInterval(bucketTime, INTERVAL 1 ${intervalLower})) as time`);
-        statement.append(SQL ` FROM ${databaseName}.MetricItemAggMV1mByHost`);
-        statement.append(` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp)}')`);
-        statement.append(SQL ` AND hostIdentifier = ${{
-            value: hostIdentifier,
+        statement.append(SQL ` FROM ${databaseName}.MetricItemAggMV1mByHostV2`);
+        statement.append(` WHERE bucketTime >= toDateTime('${this.formatDateTime(aggregateBy.startTimestamp)}') AND bucketTime <= toDateTime('${this.formatDateTime(aggregateBy.endTimestamp)}')${this.getRetentionReadFilter()}`);
+        statement.append(SQL ` AND hostEntityKey = ${{
+            value: hostEntityKey,
             type: TableColumnType.Text,
         }}`);
         statement.append(SQL ` `).append(nonTimeWhere);
@@ -535,7 +614,13 @@ export class MetricService extends AnalyticsDatabaseService {
             value: Number(aggregateBy.skip),
             type: TableColumnType.Number,
         }} `);
-        statement.append(` SETTINGS optimize_aggregation_in_order=1, optimize_move_to_prewhere=1, max_threads=4`);
+        statement.append(getQuerySettings({
+            additionalSettings: {
+                optimize_aggregation_in_order: 1,
+                optimize_move_to_prewhere: 1,
+                max_threads: 4,
+            },
+        }));
         logger.debug(`${this.model.tableName} Host MV Aggregate Statement`, {
             tableName: this.model.tableName,
         });