From ca27ec8385f547a3a0b87d7dc36067388207ceba Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Wed, 23 Sep 2020 16:32:24 -0700
Subject: [PATCH] [Metrics UI] Fix EC2 Query to only include aws.ec2 nodes
 (#78236)

* [Metrics UI] Fix EC2 Query to only include aws.ec2 nodes

* Making the filter more generic so we can apply it easily to any inventory model
---
 .../plugins/infra/common/inventory_models/aws_ec2/index.ts | 1 +
 x-pack/plugins/infra/common/inventory_models/types.ts      | 1 +
 .../lib/transform_request_to_metrics_api_request.ts        | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_ec2/index.ts b/x-pack/plugins/infra/common/inventory_models/aws_ec2/index.ts
index c12137f7810d..6453332be4f5 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_ec2/index.ts
+++ b/x-pack/plugins/infra/common/inventory_models/aws_ec2/index.ts
@@ -31,4 +31,5 @@ export const awsEC2: InventoryModel = {
   },
   requiredMetrics: ['awsEC2CpuUtilization', 'awsEC2NetworkTraffic', 'awsEC2DiskIOBytes'],
   tooltipMetrics: ['cpu', 'rx', 'tx'],
+  nodeFilter: [{ term: { 'event.dataset': 'aws.ec2' } }],
 };
diff --git a/x-pack/plugins/infra/common/inventory_models/types.ts b/x-pack/plugins/infra/common/inventory_models/types.ts
index 7eb74056dcf2..5cc788f23836 100644
--- a/x-pack/plugins/infra/common/inventory_models/types.ts
+++ b/x-pack/plugins/infra/common/inventory_models/types.ts
@@ -371,4 +371,5 @@ export interface InventoryModel {
   metrics: InventoryMetrics;
   requiredMetrics: InventoryMetric[];
   tooltipMetrics: SnapshotMetricType[];
+  nodeFilter?: object[];
 }
diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/transform_request_to_metrics_api_request.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/transform_request_to_metrics_api_request.ts
index ca64d832667a..b18b45f4935d 100644
--- a/x-pack/plugins/infra/server/routes/snapshot/lib/transform_request_to_metrics_api_request.ts
+++ b/x-pack/plugins/infra/server/routes/snapshot/lib/transform_request_to_metrics_api_request.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { findInventoryFields } from '../../../../common/inventory_models';
+import { findInventoryFields, findInventoryModel } from '../../../../common/inventory_models';
 import { MetricsAPIRequest, SnapshotRequest } from '../../../../common/http_api';
 import { ESSearchClient } from '../../../lib/metrics/types';
 import { InfraSource } from '../../../lib/sources';
@@ -52,6 +52,11 @@ export const transformRequestToMetricsAPIRequest = async (
     filters.push({ term: { 'cloud.region': snapshotRequest.region } });
   }
 
+  const inventoryModel = findInventoryModel(snapshotRequest.nodeType);
+  if (inventoryModel && inventoryModel.nodeFilter) {
+    inventoryModel.nodeFilter?.forEach((f) => filters.push(f));
+  }
+
   const inventoryFields = findInventoryFields(
     snapshotRequest.nodeType,
     source.configuration.fields