From be8d756d409502d70e5f56925874f136a4ba5936 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Mon, 12 Oct 2020 13:48:39 +0200
Subject: [PATCH] [APM] Hide service if only data is from ML

Closes #79998.
---
 .../get_services/get_services_items.ts        | 29 ++++++++++++++-----
 .../trial/tests/services/top_services.ts      | 19 ++++++++++++
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
index 092485c46fb08..68c91eafa1fe4 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
@@ -52,14 +52,27 @@ export async function getServicesItems({
     getHealthStatuses(params, setup.uiFilters.environment),
   ]);
 
-  const allMetrics = [
-    ...transactionDurationAverages,
-    ...agentNames,
-    ...transactionRates,
-    ...transactionErrorRates,
-    ...environments,
-    ...healthStatuses,
-  ];
+  const apmServiceMetrics = joinByKey(
+    [
+      ...transactionDurationAverages,
+      ...agentNames,
+      ...transactionRates,
+      ...transactionErrorRates,
+      ...environments,
+    ],
+    'serviceName'
+  );
+
+  const apmServices = apmServiceMetrics.map(({ serviceName }) => serviceName);
+
+  // make sure to exclude health statuses from services
+  // that are not found in APM data
+
+  const matchedHealthStatuses = healthStatuses.filter(({ serviceName }) =>
+    apmServices.includes(serviceName)
+  );
+
+  const allMetrics = [...apmServiceMetrics, ...matchedHealthStatuses];
 
   return joinByKey(allMetrics, 'serviceName');
 }
diff --git a/x-pack/test/apm_api_integration/trial/tests/services/top_services.ts b/x-pack/test/apm_api_integration/trial/tests/services/top_services.ts
index c23c26f504a6c..321aa18aea031 100644
--- a/x-pack/test/apm_api_integration/trial/tests/services/top_services.ts
+++ b/x-pack/test/apm_api_integration/trial/tests/services/top_services.ts
@@ -71,6 +71,25 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           `);
         });
       });
+
+      describe('and fetching a list of services with a filter', () => {
+        let response: PromiseReturnType<typeof supertest.get>;
+        before(async () => {
+          response = await supertest.get(
+            `/api/apm/services?start=${start}&end=${end}&uiFilters=${encodeURIComponent(
+              `{"kuery":"service.name:opbeans-java","environment":"ENVIRONMENT_ALL"}`
+            )}`
+          );
+        });
+
+        it('does not return health statuses for services that are not found in APM data', () => {
+          expect(response.status).to.be(200);
+
+          expect(response.body.items.length).to.be(1);
+
+          expect(response.body.items[0].serviceName).to.be('opbeans-java');
+        });
+      });
     });
   });
 }