[7.10] [APM] Hide service if only data is from ML (#80145) (#81128)

Closes #79998.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts

@@ -58,14 +58,27 @@ export async function getServicesItems({
     }),
   ]);
 
-  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');
 }

x-pack/test/apm_api_integration/trial/tests/services/top_services.ts

@@ -99,6 +99,25 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expect(definedHealthStatuses.length).to.be(0);
         });
       });
+
+      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');
+        });
+      });
     });
   });
 }