[Infra] Replace MetricsUIAggregation in favor of estypes.AggregationsAggregate

x-pack/plugins/observability_solution/infra/common/http_api/host_details/process_list.ts

@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { MetricsAPISeriesRT, MetricsAPIRow } from '../metrics_api';
+import { MetricsAPISeriesRT, type MetricsAPIRow } from '@kbn/metrics-data-access-plugin/common';
 
 const AggValueRT = rt.type({
   value: rt.number,

x-pack/plugins/observability_solution/infra/common/http_api/index.ts

@@ -7,7 +7,6 @@
 
 export * from './metadata_api';
 export * from './metrics_explorer';
-export * from './metrics_api';
 export * from './snapshot_api';
 export * from './host_details';
 export * from './infra';

x-pack/plugins/observability_solution/infra/common/http_api/snapshot_api.ts

@@ -8,7 +8,7 @@
 import { createLiteralValueFromUndefinedRT } from '@kbn/io-ts-utils';
 import * as rt from 'io-ts';
 import { SnapshotMetricTypeRT, ItemTypeRT } from '@kbn/metrics-data-access-plugin/common';
-import { MetricsAPISeriesRT } from './metrics_api';
+import { MetricsAPISeriesRT } from '@kbn/metrics-data-access-plugin/common';
 
 export const SnapshotNodePathRT = rt.intersection([
   rt.type({

x-pack/plugins/observability_solution/infra/server/infra_server.ts

@@ -23,7 +23,6 @@ import {
   initGetLogAnalysisIdFormatsRoute,
 } from './routes/log_analysis';
 import { initMetadataRoute } from './routes/metadata';
-import { initMetricsAPIRoute } from './routes/metrics_api';
 import { initMetricsSourceConfigurationRoutes } from './routes/metrics_sources';
 import { initNodeDetailsRoute } from './routes/node_details';
 import { initOverviewRoute } from './routes/overview';
@@ -54,7 +53,6 @@ export const registerRoutes = (libs: InfraBackendLibs) => {
   initValidateLogAnalysisIndicesRoute(libs);
   initGetLogEntryExamplesRoute(libs);
   initMetricsExplorerViewRoutes(libs);
-  initMetricsAPIRoute(libs);
   initMetadataRoute(libs);
   initInventoryMetaRoute(libs);
   initInventoryViewRoutes(libs);

x-pack/plugins/observability_solution/infra/server/lib/alerting/inventory_metric_threshold/lib/is_rate.ts

@@ -8,16 +8,15 @@
 import { has } from 'lodash';
 import {
   MetricsUIAggregation,
-  MetricsUIAggregationRT,
   ESSumBucketAggRT,
-  ESTermsWithAggregationRT,
   ESDerivativeAggRT,
   ESBasicMetricAggRT,
+  ESTermsWithAggregationRT,
 } from '@kbn/metrics-data-access-plugin/common';
 import { SnapshotCustomMetricInput } from '../../../../../common/http_api';
 
 export const isMetricRate = (metric: MetricsUIAggregation | undefined): boolean => {
-  if (!MetricsUIAggregationRT.is(metric)) {
+  if (!metric) {
     return false;
   }
   const values = Object.values(metric);
@@ -32,7 +31,7 @@ export const isCustomMetricRate = (customMetric: SnapshotCustomMetricInput) => {
 };
 
 export const isInterfaceRateAgg = (metric: MetricsUIAggregation | undefined) => {
-  if (!MetricsUIAggregationRT.is(metric)) {
+  if (!metric) {
     return false;
   }
   const values = Object.values(metric);

x-pack/plugins/observability_solution/infra/server/lib/metrics/index.ts

@@ -6,8 +6,8 @@
  */
 
 import { decodeOrThrow } from '@kbn/io-ts-utils';
+import type { MetricsAPIResponse, MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 import { TIMESTAMP_FIELD } from '../../../common/constants';
-import { MetricsAPIRequest, MetricsAPIResponse } from '../../../common/http_api';
 import {
   ESSearchClient,
   CompositeResponseRT,

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/calculate_bucket_size/index.ts

@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { MetricsAPITimerange } from '../../../../../common/http_api';
+import type { MetricsAPITimerange } from '@kbn/metrics-data-access-plugin/common';
 import { calculateAuto } from './calculate_auto';
 import {
   getUnitValue,

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/calculate_date_histogram_offset.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MetricsAPITimerange } from '../../../../common/http_api';
+import type { MetricsAPITimerange } from '@kbn/metrics-data-access-plugin/common';
 import { calculateBucketSize } from './calculate_bucket_size';
 
 export const calculateDateHistogramOffset = (timerange: MetricsAPITimerange): string => {

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/calculate_interval.ts

@@ -6,9 +6,9 @@
  */
 
 import { isArray, isNumber } from 'lodash';
-import { MetricsAPIRequest } from '../../../../common/http_api';
-import { ESSearchClient } from '../types';
+import type { MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
+import type { ESSearchClient } from '../types';
 
 export const calculatedInterval = async (search: ESSearchClient, options: MetricsAPIRequest) => {
   const useModuleInterval =

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/convert_buckets_to_metrics_series.test.ts

@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { MetricsAPIRequest } from '../../../../common/http_api';
 import moment from 'moment';
 import { convertBucketsToMetricsApiSeries } from './convert_buckets_to_metrics_series';
+import type { MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 
 const keys = ['example-0'];
 

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/convert_buckets_to_metrics_series.ts

@@ -7,12 +7,12 @@
 
 import { get, values, first } from 'lodash';
 import * as rt from 'io-ts';
-import {
+import type {
   MetricsAPIRequest,
   MetricsAPISeries,
   MetricsAPIColumn,
   MetricsAPIRow,
-} from '../../../../common/http_api/metrics_api';
+} from '@kbn/metrics-data-access-plugin/common';
 import {
   Bucket,
   BasicMetricValueRT,

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/create_aggregations.test.ts

@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 import { createAggregations, createCompositeAggregations } from './create_aggregations';
 import moment from 'moment';
-import { MetricsAPIRequest } from '../../../../common/http_api';
 
 const options: MetricsAPIRequest = {
   timerange: {

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/create_aggregations.ts

@@ -8,9 +8,9 @@
 import { AggregationOptionsByType } from '@kbn/es-types';
 
 import Boom from '@hapi/boom';
+import { type MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 import { afterKeyObjectRT } from '../../../../common/http_api';
 import { TIMESTAMP_FIELD } from '../../../../common/constants';
-import { MetricsAPIRequest } from '../../../../common/http_api/metrics_api';
 import { calculateDateHistogramOffset } from './calculate_date_histogram_offset';
 import { createMetricsAggregations } from './create_metrics_aggregations';
 import { calculateBucketSize } from './calculate_bucket_size';

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/create_metrics_aggregations.test.ts

@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { MetricsAPIRequest } from '../../../../common/http_api';
 import moment from 'moment';
 import { createMetricsAggregations } from './create_metrics_aggregations';
+import type { MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 
 const options: MetricsAPIRequest = {
   timerange: {

x-pack/plugins/observability_solution/infra/server/lib/metrics/lib/create_metrics_aggregations.ts

@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { MetricsUIAggregation } from '@kbn/metrics-data-access-plugin/common';
-import { MetricsAPIRequest } from '../../../../common/http_api/metrics_api';
+import type { MetricsUIAggregation } from '@kbn/metrics-data-access-plugin/common';
+import type { MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 
 export const createMetricsAggregations = (options: MetricsAPIRequest): MetricsUIAggregation => {
   const { metrics } = options;

x-pack/plugins/observability_solution/infra/server/routes/snapshot/lib/apply_metadata_to_last_path.ts

@@ -6,14 +6,12 @@
  */
 
 import { get, last, first, isArray } from 'lodash';
-import { findInventoryFields } from '@kbn/metrics-data-access-plugin/common';
 import {
-  SnapshotRequest,
-  SnapshotNodePath,
-  SnapshotNode,
-  MetricsAPISeries,
-  MetricsAPIRow,
-} from '../../../../common/http_api';
+  type MetricsAPIRow,
+  type MetricsAPISeries,
+  findInventoryFields,
+} from '@kbn/metrics-data-access-plugin/common';
+import { SnapshotRequest, SnapshotNodePath, SnapshotNode } from '../../../../common/http_api';
 import { META_KEY } from './constants';
 
 export const isIPv4 = (subject: string) => /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(subject);

x-pack/plugins/observability_solution/infra/server/routes/snapshot/lib/create_timerange_with_interval.ts

@@ -6,8 +6,11 @@
  */
 
 import { uniq } from 'lodash';
-import { MetricsUIAggregation, ESBasicMetricAggRT } from '@kbn/metrics-data-access-plugin/common';
-import { MetricsAPITimerange } from '../../../../common/http_api';
+import {
+  type MetricsUIAggregation,
+  ESBasicMetricAggRT,
+  type MetricsAPITimerange,
+} from '@kbn/metrics-data-access-plugin/common';
 import { ESSearchClient } from '../../../lib/metrics/types';
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
 import { getMetricsAggregations, InfraSnapshotRequestOptions } from './get_metrics_aggregations';

x-pack/plugins/observability_solution/infra/server/routes/snapshot/lib/get_metrics_aggregations.ts

@@ -7,10 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { JsonObject } from '@kbn/utility-types';
-import {
+import type {
   InventoryItemType,
   MetricsUIAggregation,
-  MetricsUIAggregationRT,
 } from '@kbn/metrics-data-access-plugin/common';
 import { findInventoryModel } from '@kbn/metrics-data-access-plugin/common';
 import { networkTraffic } from '@kbn/metrics-data-access-plugin/common';
@@ -54,7 +53,7 @@ export const getMetricsAggregations = (
   const { metrics } = options;
   return metrics.reduce((aggs, metric, index) => {
     const aggregation = metricToAggregation(options.nodeType, metric, index);
-    if (!MetricsUIAggregationRT.is(aggregation)) {
+    if (!aggregation) {
       throw new Error(
         i18n.translate('xpack.infra.snapshot.missingSnapshotMetricError', {
           defaultMessage: 'The aggregation for {metric} for {nodeType} is not available.',

x-pack/plugins/observability_solution/infra/server/routes/snapshot/lib/query_all_data.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MetricsAPIRequest, MetricsAPIResponse } from '../../../../common/http_api';
+import type { MetricsAPIResponse, MetricsAPIRequest } from '@kbn/metrics-data-access-plugin/common';
 import { ESSearchClient } from '../../../lib/metrics/types';
 import { query } from '../../../lib/metrics';