From 767500d07b7c57a61a66c574ad9088260349e26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Wed, 23 Dec 2020 11:48:21 +0100
Subject: [PATCH] [APM] Filter out service nodes if there are no metrics
 (#86639) (#86873)

* filtering out metrics without service.node.name

* filtering out metrics without service.node.name

* addressing pr comments

* fix TS issue
---
 .../apm/server/lib/service_nodes/index.ts     | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/service_nodes/index.ts b/x-pack/plugins/apm/server/lib/service_nodes/index.ts
index d5e29532e3d7b..ca58a1b0e7126 100644
--- a/x-pack/plugins/apm/server/lib/service_nodes/index.ts
+++ b/x-pack/plugins/apm/server/lib/service_nodes/index.ts
@@ -4,16 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Setup, SetupTimeRange } from '../helpers/setup_request';
-import { getServiceNodesProjection } from '../../projections/service_nodes';
-import { mergeProjection } from '../../projections/util/merge_projection';
-import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes';
 import {
-  METRIC_PROCESS_CPU_PERCENT,
-  METRIC_JAVA_THREAD_COUNT,
   METRIC_JAVA_HEAP_MEMORY_USED,
   METRIC_JAVA_NON_HEAP_MEMORY_USED,
+  METRIC_JAVA_THREAD_COUNT,
+  METRIC_PROCESS_CPU_PERCENT,
 } from '../../../common/elasticsearch_fieldnames';
+import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes';
+import { getServiceNodesProjection } from '../../projections/service_nodes';
+import { mergeProjection } from '../../projections/util/merge_projection';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
 const getServiceNodes = async ({
   setup,
@@ -68,15 +68,21 @@ const getServiceNodes = async ({
     return [];
   }
 
-  return response.aggregations.nodes.buckets.map((bucket) => {
-    return {
+  return response.aggregations.nodes.buckets
+    .map((bucket) => ({
       name: bucket.key as string,
       cpu: bucket.cpu.value,
       heapMemory: bucket.heapMemory.value,
       nonHeapMemory: bucket.nonHeapMemory.value,
       threadCount: bucket.threadCount.value,
-    };
-  });
+    }))
+    .filter(
+      (item) =>
+        item.cpu !== null ||
+        item.heapMemory !== null ||
+        item.nonHeapMemory !== null ||
+        item.threadCount != null
+    );
 };
 
 export { getServiceNodes };