Remove environment from uiFilters

x-pack/plugins/apm/common/utils/queries.test.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SERVICE_ENVIRONMENT } from '../elasticsearch_fieldnames';
+import { ENVIRONMENT_NOT_DEFINED } from '../environment_filter_values';
+import { environmentQuery } from './queries';
+
+describe('environmentQuery', () => {
+  describe('when environment is undefined', () => {
+    it('returns an empty query', () => {
+      expect(environmentQuery()).toEqual([]);
+    });
+  });
+
+  it('creates a query for a service environment', () => {
+    expect(environmentQuery('test')).toEqual([
+      {
+        term: { [SERVICE_ENVIRONMENT]: 'test' },
+      },
+    ]);
+  });
+
+  it('creates a query for missing service environments', () => {
+    expect(environmentQuery(ENVIRONMENT_NOT_DEFINED.value)[0]).toHaveProperty(
+      ['bool', 'must_not', 'exists', 'field'],
+      SERVICE_ENVIRONMENT
+    );
+  });
+});

x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts → x-pack/plugins/apm/common/utils/queries.ts

@@ -5,19 +5,41 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../typings/elasticsearch';
 import {
   ENVIRONMENT_NOT_DEFINED,
   ENVIRONMENT_ALL,
-} from '../../../../common/environment_filter_values';
-import { SERVICE_ENVIRONMENT } from '../../../../common/elasticsearch_fieldnames';
+} from '../environment_filter_values';
+import { SERVICE_ENVIRONMENT } from '../elasticsearch_fieldnames';
 
-export function getEnvironmentUiFilterES(environment?: string): ESFilter[] {
+type QueryContainer = ESFilter;
+
+export function environmentQuery(environment?: string): QueryContainer[] {
   if (!environment || environment === ENVIRONMENT_ALL.value) {
     return [];
   }
+
   if (environment === ENVIRONMENT_NOT_DEFINED.value) {
     return [{ bool: { must_not: { exists: { field: SERVICE_ENVIRONMENT } } } }];
   }
+
   return [{ term: { [SERVICE_ENVIRONMENT]: environment } }];
 }
+
+export function rangeQuery(
+  start: number,
+  end: number,
+  field = '@timestamp'
+): QueryContainer[] {
+  return [
+    {
+      range: {
+        [field]: {
+          gte: start,
+          lte: end,
+          format: 'epoch_millis',
+        },
+      },
+    },
+  ];
+}

x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx

@@ -68,7 +68,7 @@ type ErrorGroupDetailsProps = RouteComponentProps<{
 export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
   const { serviceName, groupId } = match.params;
   const { urlParams, uiFilters } = useUrlParams();
-  const { start, end } = urlParams;
+  const { environment, start, end } = urlParams;
 
   const { data: errorGroupData } = useFetcher(
     (callApmApi) => {
@@ -81,6 +81,7 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
               groupId,
             },
             query: {
+              environment,
               start,
               end,
               uiFilters: JSON.stringify(uiFilters),
@@ -89,7 +90,7 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
         });
       }
     },
-    [serviceName, start, end, groupId, uiFilters]
+    [environment, serviceName, start, end, groupId, uiFilters]
   );
 
   const { errorDistributionData } = useErrorGroupDistributionFetcher({

x-pack/plugins/apm/public/components/app/correlations/error_correlations.tsx

@@ -51,7 +51,13 @@ export function ErrorCorrelations({ onClose }: Props) {
 
   const { serviceName } = useParams<{ serviceName?: string }>();
   const { urlParams, uiFilters } = useUrlParams();
-  const { transactionName, transactionType, start, end } = urlParams;
+  const {
+    environment,
+    transactionName,
+    transactionType,
+    start,
+    end,
+  } = urlParams;
   const { defaultFieldNames } = useFieldNames();
   const [fieldNames, setFieldNames] = useLocalStorage(
     `apm.correlations.errors.fields:${serviceName}`,
@@ -65,6 +71,7 @@ export function ErrorCorrelations({ onClose }: Props) {
           endpoint: 'GET /api/apm/correlations/failed_transactions',
           params: {
             query: {
+              environment,
               serviceName,
               transactionName,
               transactionType,
@@ -78,6 +85,7 @@ export function ErrorCorrelations({ onClose }: Props) {
       }
     },
     [
+      environment,
       serviceName,
       start,
       end,

x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx

@@ -49,7 +49,13 @@ export function LatencyCorrelations({ onClose }: Props) {
 
   const { serviceName } = useParams<{ serviceName?: string }>();
   const { urlParams, uiFilters } = useUrlParams();
-  const { transactionName, transactionType, start, end } = urlParams;
+  const {
+    environment,
+    transactionName,
+    transactionType,
+    start,
+    end,
+  } = urlParams;
   const { defaultFieldNames } = useFieldNames();
   const [fieldNames, setFieldNames] = useLocalStorage(
     `apm.correlations.latency.fields:${serviceName}`,
@@ -70,6 +76,7 @@ export function LatencyCorrelations({ onClose }: Props) {
           endpoint: 'GET /api/apm/correlations/slow_transactions',
           params: {
             query: {
+              environment,
               serviceName,
               transactionName,
               transactionType,
@@ -84,6 +91,7 @@ export function LatencyCorrelations({ onClose }: Props) {
       }
     },
     [
+      environment,
       serviceName,
       start,
       end,

x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx

@@ -28,7 +28,7 @@ interface ErrorGroupOverviewProps {
 
 export function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) {
   const { urlParams, uiFilters } = useUrlParams();
-  const { start, end, sortField, sortDirection } = urlParams;
+  const { environment, start, end, sortField, sortDirection } = urlParams;
   const { errorDistributionData } = useErrorGroupDistributionFetcher({
     serviceName,
     groupId: undefined,
@@ -46,6 +46,7 @@ export function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) {
               serviceName,
             },
             query: {
+              environment,
               start,
               end,
               sortField,
@@ -56,7 +57,7 @@ export function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) {
         });
       }
     },
-    [serviceName, start, end, sortField, sortDirection, uiFilters]
+    [environment, serviceName, start, end, sortField, sortDirection, uiFilters]
   );
 
   useTrackPageview({

x-pack/plugins/apm/public/components/app/service_inventory/index.tsx

@@ -39,19 +39,24 @@ function useServicesFetcher() {
   const { urlParams, uiFilters } = useUrlParams();
   const { core } = useApmPluginContext();
   const upgradeAssistantHref = useUpgradeAssistantHref();
-  const { start, end } = urlParams;
+  const { environment, start, end } = urlParams;
   const { data = initialData, status } = useFetcher(
     (callApmApi) => {
       if (start && end) {
         return callApmApi({
           endpoint: 'GET /api/apm/services',
           params: {
-            query: { start, end, uiFilters: JSON.stringify(uiFilters) },
+            query: {
+              environment,
+              start,
+              end,
+              uiFilters: JSON.stringify(uiFilters),
+            },
           },
         });
       }
     },
-    [start, end, uiFilters]
+    [environment, start, end, uiFilters]
   );
 
   useEffect(() => {

x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx

@@ -14,10 +14,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import {
-  ENVIRONMENT_ALL,
-  getNextEnvironmentUrlParam,
-} from '../../../../../common/environment_filter_values';
+import { getNextEnvironmentUrlParam } from '../../../../../common/environment_filter_values';
 import {
   asMillisecondDuration,
   asPercent,
@@ -182,7 +179,7 @@ export function ServiceOverviewDependenciesTable({ serviceName }: Props) {
           query: {
             start,
             end,
-            environment: environment || ENVIRONMENT_ALL.value,
+            environment,
             numBuckets: 20,
           },
         },

x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx

@@ -52,7 +52,7 @@ const DEFAULT_SORT = {
 
 export function ServiceOverviewErrorsTable({ serviceName }: Props) {
   const {
-    urlParams: { start, end },
+    urlParams: { environment, start, end },
     uiFilters,
   } = useUrlParams();
   const { transactionType } = useApmServiceContext();
@@ -152,6 +152,7 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
         params: {
           path: { serviceName },
           query: {
+            environment,
             start,
             end,
             uiFilters: JSON.stringify(uiFilters),
@@ -178,6 +179,7 @@ export function ServiceOverviewErrorsTable({ serviceName }: Props) {
       });
     },
     [
+      environment,
       start,
       end,
       serviceName,

x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_chart_and_table.tsx

@@ -25,7 +25,7 @@ export function ServiceOverviewInstancesChartAndTable({
   const { transactionType } = useApmServiceContext();
 
   const {
-    urlParams: { start, end },
+    urlParams: { environment, start, end },
     uiFilters,
   } = useUrlParams();
 
@@ -43,6 +43,7 @@ export function ServiceOverviewInstancesChartAndTable({
             serviceName,
           },
           query: {
+            environment,
             start,
             end,
             transactionType,
@@ -52,7 +53,7 @@ export function ServiceOverviewInstancesChartAndTable({
         },
       });
     },
-    [start, end, serviceName, transactionType, uiFilters]
+    [environment, start, end, serviceName, transactionType, uiFilters]
   );
 
   return (

x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx

@@ -30,7 +30,7 @@ export function ServiceOverviewThroughputChart({
   const { serviceName } = useParams<{ serviceName?: string }>();
   const { urlParams, uiFilters } = useUrlParams();
   const { transactionType } = useApmServiceContext();
-  const { start, end } = urlParams;
+  const { environment, start, end } = urlParams;
 
   const { data = INITIAL_STATE, status } = useFetcher(
     (callApmApi) => {
@@ -42,6 +42,7 @@ export function ServiceOverviewThroughputChart({
               serviceName,
             },
             query: {
+              environment,
               start,
               end,
               transactionType,
@@ -51,7 +52,7 @@ export function ServiceOverviewThroughputChart({
         });
       }
     },
-    [serviceName, start, end, uiFilters, transactionType]
+    [environment, serviceName, start, end, uiFilters, transactionType]
   );
 
   return (

x-pack/plugins/apm/public/components/app/service_overview/service_overview_transactions_table/index.tsx

@@ -58,7 +58,7 @@ export function ServiceOverviewTransactionsTable({ serviceName }: Props) {
   const { transactionType } = useApmServiceContext();
   const {
     uiFilters,
-    urlParams: { start, end, latencyAggregationType },
+    urlParams: { environment, start, end, latencyAggregationType },
   } = useUrlParams();
 
   const { data = INITIAL_STATE, status } = useFetcher(
@@ -72,6 +72,7 @@ export function ServiceOverviewTransactionsTable({ serviceName }: Props) {
         params: {
           path: { serviceName },
           query: {
+            environment,
             start,
             end,
             uiFilters: JSON.stringify(uiFilters),
@@ -87,6 +88,7 @@ export function ServiceOverviewTransactionsTable({ serviceName }: Props) {
       });
     },
     [
+      environment,
       serviceName,
       start,
       end,
@@ -125,6 +127,7 @@ export function ServiceOverviewTransactionsTable({ serviceName }: Props) {
           params: {
             path: { serviceName },
             query: {
+              environment,
               start,
               end,
               uiFilters: JSON.stringify(uiFilters),

x-pack/plugins/apm/public/components/app/trace_overview/index.tsx

@@ -23,14 +23,15 @@ const DEFAULT_RESPONSE: TracesAPIResponse = {
 
 export function TraceOverview() {
   const { urlParams, uiFilters } = useUrlParams();
-  const { start, end } = urlParams;
+  const { environment, start, end } = urlParams;
   const { status, data = DEFAULT_RESPONSE } = useFetcher(
     (callApmApi) => {
       if (start && end) {
         return callApmApi({
           endpoint: 'GET /api/apm/traces',
           params: {
             query: {
+              environment,
               start,
               end,
               uiFilters: JSON.stringify(uiFilters),
@@ -39,7 +40,7 @@ export function TraceOverview() {
         });
       }
     },
-    [start, end, uiFilters]
+    [environment, start, end, uiFilters]
   );
 
   useTrackPageview({ app: 'apm', path: 'traces_overview' });