From 24f4c05028b7ff956aa32b87e4d189aeaa4c7bfc Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Tue, 21 Jan 2020 23:55:16 +0100
Subject: [PATCH] [ML] use actual field name for agg filtering instead of
 safeFieldName

---
 .../models/data_visualizer/data_visualizer.js | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/x-pack/legacy/plugins/ml/server/models/data_visualizer/data_visualizer.js b/x-pack/legacy/plugins/ml/server/models/data_visualizer/data_visualizer.js
index 9e743aaf20298a..f4ee032ee2dbbe 100644
--- a/x-pack/legacy/plugins/ml/server/models/data_visualizer/data_visualizer.js
+++ b/x-pack/legacy/plugins/ml/server/models/data_visualizer/data_visualizer.js
@@ -261,11 +261,7 @@ export class DataVisualizer {
     aggregatableFields.forEach((field, i) => {
       const safeFieldName = getSafeAggregationName(field, i);
       aggs[`${safeFieldName}_count`] = {
-        filter: {
-          exists: {
-            field: safeFieldName,
-          },
-        },
+        filter: { exists: { field } },
       };
       aggs[`${safeFieldName}_cardinality`] = {
         cardinality: { field },
@@ -437,11 +433,7 @@ export class DataVisualizer {
     fields.forEach((field, i) => {
       const safeFieldName = getSafeAggregationName(field.fieldName, i);
       aggs[`${safeFieldName}_field_stats`] = {
-        filter: {
-          exists: {
-            field: safeFieldName,
-          },
-        },
+        filter: { exists: { field: field.fieldName } },
         aggs: {
           actual_stats: {
             stats: { field: field.fieldName },
@@ -654,11 +646,7 @@ export class DataVisualizer {
     fields.forEach((field, i) => {
       const safeFieldName = getSafeAggregationName(field.fieldName, i);
       aggs[`${safeFieldName}_field_stats`] = {
-        filter: {
-          exists: {
-            field: safeFieldName,
-          },
-        },
+        filter: { exists: { field: field.fieldName } },
         aggs: {
           actual_stats: {
             stats: { field: field.fieldName },
@@ -720,11 +708,7 @@ export class DataVisualizer {
     fields.forEach((field, i) => {
       const safeFieldName = getSafeAggregationName(field.fieldName, i);
       aggs[`${safeFieldName}_value_count`] = {
-        filter: {
-          exists: {
-            field: safeFieldName,
-          },
-        },
+        filter: { exists: { field: field.fieldName } },
       };
       aggs[`${safeFieldName}_values`] = {
         terms: {