[7.x] [APM] Service Map: Not Defined option doesn't work properly (#…

…77757) | fixing api test (#78964) (#79063) * [APM] Service Map: `Not Defined` option doesn't work properly (#77757) * Service Map: option doesn't work properly * addressing PR comment * addressing PR comment * adding unit tests * addressing PR comment * fixing tests * addressing PR comment * addressing PR comment * addressing PR comment * addressing PR comment * addressing PR comment * add filter by environment * addressing PR comment * fixing API tests Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> * fixing api test (#78964) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Oct 1, 2020 · 88569a5 · 88569a5
1 parent 6490428
commit 88569a5
Show file tree

Hide file tree

Showing 25 changed files with 19,899 additions and 4,919 deletions.
diff --git a/...gins/apm/server/lib/service_map/__snapshots__/get_service_map_from_trace_ids.test.ts.snap b/...gins/apm/server/lib/service_map/__snapshots__/get_service_map_from_trace_ids.test.ts.snap
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
@@ -14,6 +14,7 @@ import { getServicesProjection } from '../../projections/services';
 import { mergeProjection } from '../../projections/util/merge_projection';
 import { PromiseReturnType } from '../../../typings/common';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
+import { getEnvironmentUiFilterES } from '../helpers/convert_ui_filters/get_environment_ui_filter_es';
 import { transformServiceMapResponses } from './transform_service_map_responses';
 import { getServiceMapFromTraceIds } from './get_service_map_from_trace_ids';
 import { getTraceSampleIds } from './get_trace_sample_ids';
@@ -85,21 +86,27 @@ async function getServicesData(options: IEnvOptions) {
     searchAggregatedTransactions,
   });
 
-  const { filter } = projection.body.query.bool;
+  let { filter } = projection.body.query.bool;
+
+  if (options.serviceName) {
+    filter = filter.concat({
+      term: {
+        [SERVICE_NAME]: options.serviceName,
+      },
+    });
+  }
+
+  if (options.environment) {
+    filter = filter.concat(getEnvironmentUiFilterES(options.environment));
+  }
 
   const params = mergeProjection(projection, {
     body: {
       size: 0,
       query: {
         bool: {
           ...projection.body.query.bool,
-          filter: options.serviceName
-            ? filter.concat({
-                term: {
-                  [SERVICE_NAME]: options.serviceName,
-                },
-              })
-            : filter,
+          filter,
         },
       },
       aggs: {