Use the customMetric's formatter for pipeline aggregations (elastic#1…

…1933) This is a manual backport and required edits.
thomasneirynck · Jul 20, 2017 · 2c65103 · 2c65103
1 parent 483db04
commit 2c65103
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 8 deletions.
diff --git a/src/ui/public/agg_types/__tests__/metrics/parent_pipeline.js b/src/ui/public/agg_types/__tests__/metrics/parent_pipeline.js
@@ -27,6 +27,7 @@ describe('parent pipeline aggs', function () {
         ngMock.inject(function (Private) {
           const Vis = Private(VisProvider);
           const indexPattern = Private(StubbedIndexPattern);
+          indexPattern.stubSetFieldFormat('bytes', 'bytes');
           metricAgg = Private(metric.provider);
 
           const params = settings || {
@@ -52,6 +53,12 @@ describe('parent pipeline aggs', function () {
                 type: metric.name,
                 schema: 'metric',
                 params
+              },
+              {
+                id: '3',
+                type: 'max',
+                params: { field: '@timestamp' },
+                schema: 'metric'
               }
             ],
             listeners: {}
@@ -137,6 +144,33 @@ describe('parent pipeline aggs', function () {
         expect(aggDsl.parentAggs['2-metric'][metric.name].buckets_path).to.be('2-metric-metric');
       });
 
+      it('should have correct formatter', function () {
+        init({
+          metricAgg: '3'
+        });
+        expect(metricAgg.getFormat(aggConfig).type.id).to.be('date');
+      });
+
+      it('should have correct customMetric nested formatter', function () {
+        init({
+          metricAgg: 'custom',
+          customMetric: {
+            id:'2-metric',
+            type: metric.name,
+            params: {
+              buckets_path: 'custom',
+              customMetric: {
+                id:'2-metric-metric',
+                type: 'max',
+                params: { field: 'bytes' },
+                schema: 'orderAgg'
+              }
+            },
+            schema: 'orderAgg'
+          }
+        });
+        expect(metricAgg.getFormat(aggConfig).type.id).to.be('bytes');
+      });
     });
   });
 

diff --git a/src/ui/public/agg_types/__tests__/metrics/sibling_pipeline.js b/src/ui/public/agg_types/__tests__/metrics/sibling_pipeline.js
@@ -27,6 +27,7 @@ describe('sibling pipeline aggs', function () {
         ngMock.inject(function (Private) {
           const Vis = Private(VisProvider);
           const indexPattern = Private(StubbedIndexPattern);
+          indexPattern.stubSetFieldFormat('bytes', 'bytes');
           metricAgg = Private(metric.provider);
 
           const params = settings || {
@@ -103,6 +104,24 @@ describe('sibling pipeline aggs', function () {
         expect(aggDsl.parentAggs['2-bucket'].aggs['2-metric'].avg.field).to.equal('bytes');
       });
 
+      it('should have correct formatter', function () {
+        init({
+          customMetric: {
+            id: '5',
+            type: 'avg',
+            schema: 'metric',
+            params: { field: 'bytes' },
+          },
+          customBucket: {
+            id: '6',
+            type: 'date_histogram',
+            schema: 'bucket',
+            params: { field: '@timestamp' },
+          }
+        });
+        expect(metricAgg.getFormat(aggConfig).type.id).to.be('bytes');
+      });
+
     });
   });
 

diff --git a/src/ui/public/agg_types/metrics/bucket_avg.js b/src/ui/public/agg_types/metrics/bucket_avg.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsBucketAvgProvider(Private) {
     subtype: siblingPipelineHelper.subtype,
     params: [
       ...siblingPipelineHelper.params()
-    ]
+    ],
+    getFormat: siblingPipelineHelper.getFormat
   });
 }
diff --git a/src/ui/public/agg_types/metrics/bucket_max.js b/src/ui/public/agg_types/metrics/bucket_max.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsBucketMaxProvider(Private) {
     subtype: siblingPipelineHelper.subtype,
     params: [
       ...siblingPipelineHelper.params()
-    ]
+    ],
+    getFormat: siblingPipelineHelper.getFormat
   });
 }
diff --git a/src/ui/public/agg_types/metrics/bucket_min.js b/src/ui/public/agg_types/metrics/bucket_min.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsBucketMinProvider(Private) {
     subtype: siblingPipelineHelper.subtype,
     params: [
       ...siblingPipelineHelper.params()
-    ]
+    ],
+    getFormat: siblingPipelineHelper.getFormat
   });
 }
diff --git a/src/ui/public/agg_types/metrics/bucket_sum.js b/src/ui/public/agg_types/metrics/bucket_sum.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsBucketSumProvider(Private) {
     subtype: siblingPipelineHelper.subtype,
     params: [
       ...siblingPipelineHelper.params()
-    ]
+    ],
+    getFormat: siblingPipelineHelper.getFormat
   });
 }
diff --git a/src/ui/public/agg_types/metrics/cumulative_sum.js b/src/ui/public/agg_types/metrics/cumulative_sum.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsCumulativeSumProvider(Private) {
     makeLabel: agg => makeNestedLabel(agg, 'cumulative sum'),
     params: [
       ...parentPipelineAggHelper.params()
-    ]
+    ],
+    getFormat: parentPipelineAggHelper.getFormat
   });
 }
diff --git a/src/ui/public/agg_types/metrics/derivative.js b/src/ui/public/agg_types/metrics/derivative.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsDerivativeProvider(Private) {
     makeLabel: agg => makeNestedLabel(agg, 'derivative'),
     params: [
       ...parentPipelineAggHelper.params()
-    ]
+    ],
+    getFormat: parentPipelineAggHelper.getFormat
   });
 }
diff --git a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
@@ -56,6 +56,15 @@ export const ParentPipelineAggHelperProvider = function (Private) {
           write: parentPipelineAggWritter
         }
       ];
+    },
+    getFormat: function (agg) {
+      let subAgg;
+      if (agg.params.customMetric) {
+        subAgg = agg.params.customMetric;
+      } else {
+        subAgg = agg.vis.aggs.byId[agg.params.metricAgg];
+      }
+      return subAgg.type.getFormat(subAgg);
     }
   };
 };
diff --git a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
@@ -83,6 +83,9 @@ export const SiblingPipelineAggHelperProvider = function (Private) {
           write: siblingPipelineAggWritter
         }
       ];
+    },
+    getFormat: function (agg) {
+      return agg.params.customMetric.type.getFormat(agg.params.customMetric);
     }
   };
 

diff --git a/src/ui/public/agg_types/metrics/moving_avg.js b/src/ui/public/agg_types/metrics/moving_avg.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsMovingAvgProvider(Private) {
     makeLabel: agg => makeNestedLabel(agg, 'moving avg'),
     params: [
       ...parentPipelineAggHelper.params()
-    ]
+    ],
+    getFormat: parentPipelineAggHelper.getFormat
   });
 }
diff --git a/src/ui/public/agg_types/metrics/serial_diff.js b/src/ui/public/agg_types/metrics/serial_diff.js
@@ -13,6 +13,7 @@ export function AggTypesMetricsSerialDiffProvider(Private) {
     makeLabel: agg => makeNestedLabel(agg, 'serial diff'),
     params: [
       ...parentPipelineAggHelper.params()
-    ]
+    ],
+    getFormat: parentPipelineAggHelper.getFormat
   });
 }