Handle date histogram scaling for table vis and avg_buckets metric

src/ui/public/agg_response/point_series/_init_y_axis.js

@@ -4,7 +4,6 @@ export function PointSeriesInitYAxisProvider() {
 
   return function initYAxis(chart) {
     const y = chart.aspects.y;
-    const x = chart.aspects.x;
 
     if (_.isArray(y)) {
       // TODO: vis option should allow choosing this format
@@ -25,9 +24,5 @@ export function PointSeriesInitYAxisProvider() {
         chart.zAxisLabel = z.col.title;
       }
     }
-
-
-    const xAggOutput = x.agg.write();
-    chart.yScale = xAggOutput.metricScale || null;
   };
 }

src/ui/public/agg_response/tabify/tabify.js

@@ -14,7 +14,7 @@ export function AggResponseTabifyProvider(Private, Notifier) {
       doc_count: esResponse.hits.total
     });
 
-    collectBucket(write, topLevelBucket);
+    collectBucket(write, topLevelBucket, '', 1);
 
     return write.response();
   }
@@ -28,8 +28,10 @@ export function AggResponseTabifyProvider(Private, Notifier) {
    * @param {undefined|string} key - the key where the bucket was found
    * @returns {undefined}
    */
-  function collectBucket(write, bucket, key) {
+  function collectBucket(write, bucket, key, aggScale) {
     const agg = write.aggStack.shift();
+    const aggInfo = agg.write();
+    aggScale *= aggInfo.metricScale || 1;
 
     switch (agg.schema.group) {
       case 'buckets':
@@ -38,12 +40,12 @@ export function AggResponseTabifyProvider(Private, Notifier) {
           const splitting = write.canSplit && agg.schema.name === 'split';
           if (splitting) {
             write.split(agg, buckets, function forEachBucket(subBucket, key) {
-              collectBucket(write, subBucket, agg.getKey(subBucket), key);
+              collectBucket(write, subBucket, agg.getKey(subBucket, key), aggScale);
             });
           } else {
             buckets.forEach(function (subBucket, key) {
               write.cell(agg, agg.getKey(subBucket, key), function () {
-                collectBucket(write, subBucket, agg.getKey(subBucket, key));
+                collectBucket(write, subBucket, agg.getKey(subBucket, key), aggScale);
               });
             });
           }
@@ -52,7 +54,7 @@ export function AggResponseTabifyProvider(Private, Notifier) {
           // level, then pass all the empty buckets and jump back in for
           // the metrics.
           write.aggStack.unshift(agg);
-          passEmptyBuckets(write, bucket, key);
+          passEmptyBuckets(write, bucket, key, aggScale);
           write.aggStack.shift();
         } else {
           // we don't have any buckets, and we don't have isHierarchical
@@ -61,14 +63,19 @@ export function AggResponseTabifyProvider(Private, Notifier) {
         }
         break;
       case 'metrics':
-        const value = agg.getValue(bucket);
+        let value = agg.getValue(bucket);
+        // since the aggregation could be a non integer (such as a max date)
+        // only do the scaling calculation if it is needed.
+        if (aggScale !== 1) {
+          value *= aggScale;
+        }
         write.cell(agg, value, function () {
           if (!write.aggStack.length) {
             // row complete
             write.row();
           } else {
             // process the next agg at this same level
-            collectBucket(write, bucket, key);
+            collectBucket(write, bucket, key, aggScale);
           }
         });
         break;
@@ -79,19 +86,19 @@ export function AggResponseTabifyProvider(Private, Notifier) {
 
   // write empty values for each bucket agg, then write
   // the metrics from the initial bucket using collectBucket()
-  function passEmptyBuckets(write, bucket, key) {
+  function passEmptyBuckets(write, bucket, key, aggScale) {
     const agg = write.aggStack.shift();
 
     switch (agg.schema.group) {
       case 'metrics':
         // pass control back to collectBucket()
         write.aggStack.unshift(agg);
-        collectBucket(write, bucket, key);
+        collectBucket(write, bucket, key, aggScale);
         return;
 
       case 'buckets':
         write.cell(agg, '', function () {
-          passEmptyBuckets(write, bucket, key);
+          passEmptyBuckets(write, bucket, key, aggScale);
         });
     }
 

src/ui/public/agg_types/buckets/date_histogram.js

@@ -116,7 +116,7 @@ export function AggTypesBucketsDateHistogramProvider(timefilter, config, Private
           const scaleMetrics = interval.scaled && interval.scale < 1;
           if (scaleMetrics) {
             const all = _.every(agg.vis.aggs.bySchemaGroup.metrics, function (agg) {
-              return agg.type && (agg.type.name === 'count' || agg.type.name === 'sum');
+              return agg.type && agg.type.isScalable();
             });
             if (all) {
               output.metricScale = interval.scale;

src/ui/public/agg_types/metrics/bucket_avg.js

@@ -1,3 +1,4 @@
+import { get } from 'lodash';
 import { AggTypesMetricsMetricAggTypeProvider } from 'ui/agg_types/metrics/metric_agg_type';
 import { makeNestedLabel } from './lib/make_nested_label';
 import { SiblingPipelineAggHelperProvider } from './lib/sibling_pipeline_agg_helper';
@@ -13,6 +14,17 @@ export function AggTypesMetricsBucketAvgProvider(Private) {
     subtype: siblingPipelineHelper.subtype,
     params: [
       ...siblingPipelineHelper.params()
-    ]
+    ],
+    getValue: function (agg, bucket) {
+      const customMetric = agg.params.customMetric;
+      const scaleMetrics = customMetric.type && customMetric.type.isScalable();
+
+      let value = bucket[agg.id] && bucket[agg.id].value;
+      if (scaleMetrics) {
+        const aggInfo = agg.params.customBucket.write();
+        value *= get(aggInfo, 'bucketInterval.scale', 1);
+      }
+      return value;
+    }
   });
 }

src/ui/public/agg_types/metrics/count.js

@@ -17,6 +17,9 @@ export function AggTypesMetricsCountProvider(Private) {
     },
     getValue: function (agg, bucket) {
       return bucket.doc_count;
+    },
+    isScalable: function () {
+      return true;
     }
   });
 }

src/ui/public/agg_types/metrics/metric_agg_type.js

@@ -48,5 +48,12 @@ export function AggTypesMetricsMetricAggTypeProvider(Private) {
     return field ? field.format : fieldFormats.getDefaultInstance('number');
   };
 
+  /**
+   * Determines if this metric can be scaled
+   */
+  MetricAggType.prototype.isScalable = function () {
+    return false;
+  };
+
   return MetricAggType;
 }

src/ui/public/agg_types/metrics/sum.js

@@ -14,6 +14,9 @@ export function AggTypesMetricsSumProvider(Private) {
         name: 'field',
         filterFieldTypes: 'number'
       }
-    ]
+    ],
+    isScalable: function () {
+      return true;
+    }
   });
 }