From 27c0d8e66b495ffdb4f1360262c3403d8584db32 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Mon, 20 Apr 2020 13:43:44 -0700
Subject: [PATCH] [Metrics UI] Remove remaining field filtering (#63398)
 (#63985)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/metrics_explorer/group_by.tsx      | 15 +--------------
 .../components/metrics_explorer/kuery_bar.tsx     |  3 +--
 .../components/metrics_explorer/metrics.tsx       |  5 +----
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/group_by.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/group_by.tsx
index 750894fd0188bc..3246a2aa4a7310 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/group_by.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/group_by.tsx
@@ -10,7 +10,6 @@ import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
 import { IFieldType } from 'src/plugins/data/public';
 import { MetricsExplorerOptions } from '../../containers/metrics_explorer/use_metrics_explorer_options';
-import { isDisplayable } from '../../utils/is_displayable';
 
 interface Props {
   options: MetricsExplorerOptions;
@@ -27,18 +26,6 @@ export const MetricsExplorerGroupBy = ({ options, onChange, fields }: Props) =>
     [onChange]
   );
 
-  const metricPrefixes = options.metrics
-    .map(
-      metric =>
-        (metric.field &&
-          metric.field
-            .split(/\./)
-            .slice(0, 2)
-            .join('.')) ||
-        null
-    )
-    .filter(metric => metric) as string[];
-
   return (
     <EuiComboBox
       placeholder={i18n.translate('xpack.infra.metricsExplorer.groupByLabel', {
@@ -51,7 +38,7 @@ export const MetricsExplorerGroupBy = ({ options, onChange, fields }: Props) =>
       singleSelection={true}
       selectedOptions={(options.groupBy && [{ label: options.groupBy }]) || []}
       options={fields
-        .filter(f => isDisplayable(f, metricPrefixes) && f.aggregatable && f.type === 'string')
+        .filter(f => f.aggregatable && f.type === 'string')
         .map(f => ({ label: f.name }))}
       onChange={handleChange}
       isClearable={true}
diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx
index dcc160d05b6ad9..7c3e0444dbeea6 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx
@@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
 import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion';
 import { AutocompleteField } from '../autocomplete_field';
-import { isDisplayable } from '../../utils/is_displayable';
 import { esKuery, IIndexPattern } from '../../../../../../src/plugins/data/public';
 
 interface Props {
@@ -51,7 +50,7 @@ export const MetricsExplorerKueryBar = ({
 
   const filteredDerivedIndexPattern = {
     ...derivedIndexPattern,
-    fields: derivedIndexPattern.fields.filter(field => isDisplayable(field)),
+    fields: derivedIndexPattern.fields,
   };
 
   const defaultPlaceholder = i18n.translate(
diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/metrics.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/metrics.tsx
index 79d4122733c551..a49e42c9cac0e2 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/metrics.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/metrics.tsx
@@ -12,7 +12,6 @@ import { IFieldType } from 'src/plugins/data/public';
 import { colorTransformer, MetricsExplorerColor } from '../../../common/color_palette';
 import { MetricsExplorerMetric } from '../../../common/http_api/metrics_explorer';
 import { MetricsExplorerOptions } from '../../containers/metrics_explorer/use_metrics_explorer_options';
-import { isDisplayable } from '../../utils/is_displayable';
 
 interface Props {
   autoFocus?: boolean;
@@ -54,9 +53,7 @@ export const MetricsExplorerMetrics = ({ options, onChange, fields, autoFocus =
     [onChange, options.aggregation, colors]
   );
 
-  const comboOptions = fields
-    .filter(field => isDisplayable(field))
-    .map(field => ({ label: field.name, value: field.name }));
+  const comboOptions = fields.map(field => ({ label: field.name, value: field.name }));
   const selectedOptions = options.metrics
     .filter(m => m.aggregation !== 'count')
     .map(metric => ({