refactor: update host metrics to support dynamic schema selection and include wait state in CPU idle calculation

Author: crespocarlos

x-pack/solutions/observability/plugins/infra/public/components/asset_details/components/kpis/host_kpi_charts.tsx

@@ -9,6 +9,7 @@ import React from 'react';
 import { EuiFlexItem } from '@elastic/eui';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import type { Filter, Query, TimeRange } from '@kbn/es-query';
+import type { DataSchemaFormat } from '@kbn/metrics-data-access-plugin/common';
 import { Kpi } from './kpi';
 import { useHostKpiCharts } from '../../hooks/use_host_metrics_charts';
 
@@ -20,6 +21,8 @@ export interface HostKpiChartsProps {
   lastReloadRequestTime?: number;
   getSubtitle?: (formulaValue: string) => string;
   loading?: boolean;
+
+  schema?: DataSchemaFormat | null;
 }
 
 export const HostKpiCharts = ({
@@ -30,10 +33,12 @@ export const HostKpiCharts = ({
   query,
   lastReloadRequestTime,
   loading = false,
+  schema,
 }: HostKpiChartsProps) => {
   const charts = useHostKpiCharts({
     dataViewId: dataView?.id,
     getSubtitle,
+    schema,
   });
 
   return (

x-pack/solutions/observability/plugins/infra/public/components/asset_details/hooks/use_host_metrics_charts.ts

@@ -6,29 +6,27 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { findInventoryModel } from '@kbn/metrics-data-access-plugin/common';
+import { DataSchemaFormat, findInventoryModel } from '@kbn/metrics-data-access-plugin/common';
 import useAsync from 'react-use/lib/useAsync';
-import type { SchemaTypes } from '../../../../common/http_api/shared/schema_type';
-import { usePluginConfig } from '../../../containers/plugin_config_context';
 import type { HostMetricTypes } from '../charts/types';
 import { useChartSeriesColor } from './use_chart_series_color';
 
 export const useHostCharts = ({
   metric,
   dataViewId,
   overview,
+  schema,
 }: {
   metric: HostMetricTypes;
   dataViewId?: string;
   overview?: boolean;
+  schema?: DataSchemaFormat | null;
 }) => {
-  const config = usePluginConfig();
-
   const { value: charts = [], error } = useAsync(async () => {
     const hostCharts = await getHostsCharts({
       metric,
       overview,
-      schema: config.featureFlags.hostOtelEnabled ? 'semconv' : 'ecs',
+      schema: schema ?? DataSchemaFormat.ECS,
     });
 
     return hostCharts.map((chart) => ({
@@ -39,24 +37,25 @@ export const useHostCharts = ({
         },
       }),
     }));
-  }, [config.featureFlags.hostOtelEnabled, dataViewId, metric, overview]);
+  }, [dataViewId, metric, overview, schema]);
 
   return { charts, error };
 };
 
 export const useKubernetesCharts = ({
   dataViewId,
   overview,
+  schema,
 }: {
   dataViewId?: string;
   overview?: boolean;
+  schema?: DataSchemaFormat | null;
 }) => {
   const model = findInventoryModel('host');
-  const config = usePluginConfig();
 
   const { value: charts = [], error } = useAsync(async () => {
     const { kubernetesNode } = await model.metrics.getCharts({
-      schema: config.featureFlags.hostOtelEnabled ? 'semconv' : 'ecs',
+      schema: schema ?? DataSchemaFormat.ECS,
     });
 
     if (!kubernetesNode) {
@@ -82,7 +81,7 @@ export const useKubernetesCharts = ({
         }),
       };
     });
-  }, [model.metrics, config.featureFlags.hostOtelEnabled, overview, dataViewId]);
+  }, [model.metrics, schema, overview, dataViewId]);
 
   return { charts, error };
 };
@@ -98,17 +97,19 @@ export const useHostKpiCharts = ({
   dataViewId,
   seriesColor,
   getSubtitle,
+  schema,
 }: {
   dataViewId?: string;
   seriesColor?: string;
   getSubtitle?: (formulaValue: string) => string;
+  schema?: DataSchemaFormat | null;
 }) => {
   seriesColor = useChartSeriesColor(seriesColor);
-  const config = usePluginConfig();
+
   const { value: charts = [] } = useAsync(async () => {
     const model = findInventoryModel('host');
     const { cpu, memory, disk } = await model.metrics.getCharts({
-      schema: config.featureFlags.hostOtelEnabled ? 'semconv' : 'ecs',
+      schema: schema ?? DataSchemaFormat.ECS,
     });
 
     return [
@@ -127,7 +128,7 @@ export const useHostKpiCharts = ({
         },
       }),
     }));
-  }, [dataViewId, seriesColor, getSubtitle, config.featureFlags.hostOtelEnabled]);
+  }, [dataViewId, seriesColor, getSubtitle, schema]);
 
   return charts;
 };
@@ -139,11 +140,13 @@ const getHostsCharts = async ({
 }: {
   metric: HostMetricTypes;
   overview?: boolean;
-  schema: SchemaTypes;
+  schema?: DataSchemaFormat | null;
 }) => {
   const model = findInventoryModel('host');
 
-  const { cpu, memory, network, disk, logs } = await model.metrics.getCharts({ schema });
+  const { cpu, memory, network, disk, logs } = await model.metrics.getCharts({
+    schema: schema ?? DataSchemaFormat.ECS,
+  });
 
   switch (metric) {
     case 'cpu':

x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/components/kpis/kpi_charts.tsx

@@ -80,6 +80,7 @@ export const KpiCharts = () => {
       lastReloadRequestTime={afterLoadedState.reloadRequestTime}
       getSubtitle={afterLoadedState.getSubtitle}
       loading={loading}
+      schema={searchCriteria.preferredSchema}
     />
   );
 };

x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metrics_grid.tsx

@@ -12,10 +12,15 @@ import { Chart } from './chart';
 import { Popover } from '../../common/popover';
 import { useMetricsDataViewContext } from '../../../../../../containers/metrics_source';
 import { useMetricsCharts } from '../../../hooks/use_metrics_charts';
+import { useUnifiedSearchContext } from '../../../hooks/use_unified_search';
 
 export const MetricsGrid = () => {
   const { metricsView } = useMetricsDataViewContext();
-  const charts = useMetricsCharts({ dataViewId: metricsView?.dataViewReference.id });
+  const { searchCriteria } = useUnifiedSearchContext();
+  const charts = useMetricsCharts({
+    dataViewId: metricsView?.dataViewReference.id,
+    schema: searchCriteria.preferredSchema,
+  });
 
   return (
     <>

x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/hooks/use_metrics_charts.ts

@@ -7,17 +7,21 @@
 
 import useAsync from 'react-use/lib/useAsync';
 import type { LensBreakdownConfig } from '@kbn/lens-embeddable-utils/config_builder';
+import { DataSchemaFormat } from '@kbn/metrics-data-access-plugin/common';
 import { findInventoryModel } from '@kbn/metrics-data-access-plugin/common';
-import { usePluginConfig } from '../../../../containers/plugin_config_context';
 import { PAGE_SIZE_OPTIONS } from '../constants';
 
-export const useMetricsCharts = ({ dataViewId }: { dataViewId?: string }) => {
-  const config = usePluginConfig();
-
+export const useMetricsCharts = ({
+  dataViewId,
+  schema,
+}: {
+  dataViewId?: string;
+  schema?: DataSchemaFormat | null;
+}) => {
   const { value: charts = [] } = useAsync(async () => {
     const model = findInventoryModel('host');
     const { cpu, disk, memory, network } = await model.metrics.getCharts({
-      schema: config.featureFlags.hostOtelEnabled ? 'semconv' : 'ecs',
+      schema: schema ?? DataSchemaFormat.ECS,
     });
 
     return [
@@ -52,7 +56,7 @@ export const useMetricsCharts = ({ dataViewId }: { dataViewId?: string }) => {
         },
       }),
     }));
-  }, [dataViewId, config.featureFlags.hostOtelEnabled]);
+  }, [schema, dataViewId]);
 
   return charts;
 };

x-pack/solutions/observability/plugins/metrics_data_access/common/inventory_models/host/metrics/charts/index.ts

@@ -11,7 +11,11 @@ import { init as initMemoryCharts } from './memory';
 import { init as initNetworkCharts } from './network';
 import { logs } from './logs';
 import { charts as kubernetesNodeCharts } from '../../../kubernetes/node/metrics';
-import type { ChartsConfigMap, FormulasCatalog } from '../../../shared/metrics/types';
+import {
+  DataSchemaFormat,
+  type ChartsConfigMap,
+  type FormulasCatalog,
+} from '../../../shared/metrics/types';
 import type { HostFormulas } from '../formulas';
 
 export const initCharts = (formulas: FormulasCatalog<HostFormulas>) => {
@@ -21,7 +25,9 @@ export const initCharts = (formulas: FormulasCatalog<HostFormulas>) => {
     memory: initMemoryCharts(formulas),
     network: initNetworkCharts(formulas),
     logs,
-    ...(formulas.schema === 'ecs' ? { kubernetesNode: kubernetesNodeCharts.node } : {}),
+    ...(formulas.schema === DataSchemaFormat.ECS
+      ? { kubernetesNode: kubernetesNodeCharts.node }
+      : {}),
   } satisfies ChartsConfigMap;
 };
 export type HostCharts = ReturnType<typeof initCharts>;

x-pack/solutions/observability/plugins/metrics_data_access/common/inventory_models/host/metrics/snapshot/cpu_v2.ts

@@ -19,7 +19,7 @@ export const cpuV2: SchemaBasedAggregations = {
     cpu_idle: {
       terms: {
         field: 'state',
-        include: ['idle'],
+        include: ['idle', 'wait'],
       },
       aggs: {
         avg: {