Percentile Agg

src/kibana/components/agg_response/tabify/_get_columns.js

@@ -4,7 +4,8 @@ define(function (require) {
     var AggConfig = Private(require('components/vis/_agg_config'));
 
     return function getColumns(vis, minimal) {
-      var aggs = vis.aggs.getSorted();
+      var aggs = vis.aggs.getResponseAggs();
+
       if (minimal == null) minimal = !vis.isHierarchical();
 
       if (!vis.aggs.bySchemaGroup.metrics) {

src/kibana/components/agg_response/tabify/tabify.js

@@ -30,11 +30,10 @@ define(function (require) {
      */
     function collectBucket(write, bucket, key) {
       var agg = write.aggStack.shift();
-      var aggResp = bucket[agg.id];
 
       switch (agg.schema.group) {
       case 'buckets':
-        var buckets = new Buckets(aggResp);
+        var buckets = new Buckets(bucket[agg.id]);
         if (buckets.length) {
           var splitting = write.canSplit && agg.schema.name === 'split';
           if (splitting) {
@@ -62,7 +61,7 @@ define(function (require) {
         }
         break;
       case 'metrics':
-        var value = (agg.type.name === 'count') ? bucketCount(bucket) : metricValue(aggResp);
+        var value = agg.getValue(bucket);
         write.cell(agg, value, function () {
           if (!write.aggStack.length) {
             // row complete

src/kibana/components/agg_types/_agg_params.js

@@ -33,14 +33,7 @@ define(function (require) {
         initialSet: params.map(function (config) {
           var type = config.name === 'field' ? config.name : config.type;
           var Class = paramTypeMap[type] || paramTypeMap._default;
-          var param = new Class(config);
-
-          // recursively init sub params
-          if (param.params && !(params.params instanceof AggParams)) {
-            param.params = new AggParams(param.params);
-          }
-
-          return param;
+          return new Class(config);
         })
       });
     }

src/kibana/components/agg_types/_agg_type.js

@@ -90,6 +90,18 @@ define(function (require) {
 
         this.params = new AggParams(this.params);
       }
+
+      /**
+       * Designed for multi-value metric aggs, this method can return a
+       * set of AggConfigs that should replace this aggConfig in result sets
+       * that walk the AggConfig set.
+       *
+       * @method getResponseAggs
+       * @returns {array[AggConfig]|undefined} - an array of aggConfig objects
+       *                                         that should replace this one,
+       *                                         or undefined
+       */
+      this.getResponseAggs = config.getResponseAggs || _.noop;
     }
 
     return AggType;

src/kibana/components/agg_types/buckets/_bucket_agg_type.js

@@ -0,0 +1,13 @@
+define(function (require) {
+  return function BucketAggTypeProvider(Private) {
+    var _ = require('lodash');
+    var AggType = Private(require('components/agg_types/_agg_type'));
+
+    _(BucketAggType).inherits(AggType);
+    function BucketAggType(config) {
+      BucketAggType.Super.call(this, config);
+    }
+
+    return BucketAggType;
+  };
+});

src/kibana/components/agg_types/buckets/_bucket_count_between.js

@@ -14,7 +14,7 @@ define(function (require) {
      * @return {null|number}
      */
     function bucketCountBetween(aggConfigA, aggConfigB) {
-      var aggs = aggConfigA.vis.aggs.getSorted();
+      var aggs = aggConfigA.vis.aggs.getRequestAggs();
 
       var aIndex = aggs.indexOf(aggConfigA);
       var bIndex = aggs.indexOf(aggConfigB);

src/kibana/components/agg_types/buckets/date_histogram.js

@@ -3,7 +3,7 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
     var interval = require('utils/interval');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
     var calculateInterval = Private(require('components/agg_types/param_types/_calculate_interval'));
 
     var createFilter = Private(require('components/agg_types/buckets/create_filter/date_histogram'));
@@ -15,7 +15,7 @@ define(function (require) {
       return interval.calculate(bounds.min, bounds.max, targetBuckets);
     };
 
-    return new AggType({
+    return new BucketAggType({
       name: 'date_histogram',
       title: 'Date Histogram',
       ordered: {

src/kibana/components/agg_types/buckets/filters.js

@@ -1,12 +1,12 @@
 define(function (require) {
   return function FiltersAggDefinition(Private, Notifier) {
     var _ = require('lodash');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
     var createFilter = Private(require('components/agg_types/buckets/create_filter/filters'));
     var decorateQuery = Private(require('components/courier/data_source/_decorate_query'));
     var notif = new Notifier({ location: 'Filters Agg' });
 
-    return new AggType({
+    return new BucketAggType({
       name: 'filters',
       title: 'Filters',
       createFilter: createFilter,

src/kibana/components/agg_types/buckets/geo_hash.js

@@ -2,7 +2,7 @@ define(function (require) {
   return function GeoHashAggDefinition(Private, config) {
     var _ = require('lodash');
     var moment = require('moment');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
     var defaultPrecision = 3;
 
     function getPrecision(precision) {
@@ -21,7 +21,7 @@ define(function (require) {
       return precision;
     }
 
-    return new AggType({
+    return new BucketAggType({
       name: 'geohash_grid',
       title: 'Geohash',
       ordered: {},

src/kibana/components/agg_types/buckets/histogram.js

@@ -2,10 +2,10 @@ define(function (require) {
   return function HistogramAggDefinition(Private) {
     var _ = require('lodash');
     var moment = require('moment');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
     var createFilter = Private(require('components/agg_types/buckets/create_filter/histogram'));
 
-    return new AggType({
+    return new BucketAggType({
       name: 'histogram',
       title: 'Histogram',
       ordered: {},

src/kibana/components/agg_types/buckets/range.js

@@ -3,10 +3,10 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
     var angular = require('angular');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
     var createFilter = Private(require('components/agg_types/buckets/create_filter/range'));
 
-    return new AggType({
+    return new BucketAggType({
       name: 'range',
       title: 'Range',
       createFilter: createFilter,

src/kibana/components/agg_types/buckets/significant_terms.js

@@ -1,10 +1,10 @@
 define(function (require) {
   return function SignificantTermsAggDefinition(Private) {
     var _ = require('lodash');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
     var createFilter = Private(require('components/agg_types/buckets/create_filter/terms'));
 
-    return new AggType({
+    return new BucketAggType({
       name: 'significant_terms',
       title: 'Significant Terms',
       makeLabel: function (aggConfig) {

src/kibana/components/agg_types/buckets/terms.js

@@ -1,11 +1,22 @@
 define(function (require) {
   return function TermsAggDefinition(Private) {
     var _ = require('lodash');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
+    var bucketCountBetween = Private(require('components/agg_types/buckets/_bucket_count_between'));
     var AggConfig = Private(require('components/vis/_agg_config'));
+    var Schemas = Private(require('plugins/vis_types/_schemas'));
     var createFilter = Private(require('components/agg_types/buckets/create_filter/terms'));
 
-    return new AggType({
+    var orderAggSchema = (new Schemas([
+      {
+        group: 'none',
+        name: 'orderAgg',
+        title: 'Order Agg',
+        aggFilter: '!percentiles'
+      }
+    ])).all[0];
+
+    return new BucketAggType({
       name: 'terms',
       title: 'Terms',
       makeLabel: function (agg) {
@@ -56,8 +67,15 @@ define(function (require) {
           serialize: function (orderAgg) {
             return orderAgg.toJSON();
           },
-          deserialize: function (stateJSON, aggConfig) {
-            return new AggConfig(aggConfig.vis, stateJSON);
+          deserialize: function (state, agg) {
+            return this.makeOrderAgg(agg, state);
+          },
+          makeOrderAgg: function (termsAgg, state) {
+            state = state || {};
+            state.schema = orderAggSchema;
+            var orderAgg = new AggConfig(termsAgg.vis, state);
+            orderAgg.id = termsAgg.id + '-orderAgg';
+            return orderAgg;
           },
           controller: function ($scope) {
             $scope.safeMakeLabel = function (agg) {
@@ -68,43 +86,62 @@ define(function (require) {
               }
             };
 
-            $scope.$watch('agg.params.orderBy', function (orderBy, prevOrderBy) {
+            var INIT = {}; // flag to know when prevOrderBy has changed
+            var prevOrderBy = INIT;
+
+            $scope.$watch('responseValueAggs', updateOrderAgg);
+            $scope.$watch('agg.params.orderBy', updateOrderAgg);
+
+            function updateOrderAgg() {
               var agg = $scope.agg;
               var aggs = agg.vis.aggs;
               var params = agg.params;
+              var orderBy = params.orderBy;
+              var paramDef = agg.type.params.byName.orderAgg;
 
-              if (orderBy === prevOrderBy && !orderBy) {
-                params.orderBy = (_.first(aggs.bySchemaGroup.metrics) || { id: 'custom' }).id;
+              // setup the initial value of orderBy
+              if (!orderBy && prevOrderBy === INIT) {
+                // abort until we get the responseValueAggs
+                if (!$scope.responseValueAggs) return;
+                params.orderBy = (_.first($scope.responseValueAggs) || { id: 'custom' }).id;
                 return;
               }
 
-              if (!orderBy) return;
-              if (orderBy !== 'custom') {
+              // track the previous value
+              prevOrderBy = orderBy;
+
+              // we aren't creating a custom aggConfig
+              if (!orderBy || orderBy !== 'custom') {
                 params.orderAgg = null;
+                // ensure that orderBy is set to a valid agg
+                if (!_.find($scope.responseValueAggs, { id: orderBy })) {
+                  params.orderBy = null;
+                }
                 return;
               }
-              if (params.orderAgg) return;
 
-              params.orderAgg = new AggConfig(agg.vis, {
-                schema: _.first(agg.vis.type.schemas.metrics)
-              });
-            });
+              params.orderAgg = params.orderAgg || paramDef.makeOrderAgg(agg);
+            }
           },
           write: function (agg, output) {
+            var vis = agg.vis;
             var dir = agg.params.order.val;
             var order = output.params.order = {};
 
-            var orderAgg = agg.params.orderAgg;
-            if (!orderAgg) {
-              orderAgg = agg.vis.aggs.byId[agg.params.orderBy];
-            }
+            var orderAgg = agg.params.orderAgg || vis.aggs.getResponseAggById(agg.params.orderBy);
 
-            if (orderAgg.type.name === 'count') {
+            if (!orderAgg || orderAgg.type.name === 'count') {
               order._count = dir;
-            } else {
-              output.subAggs = (output.subAggs || []).concat(orderAgg);
-              order[orderAgg.id] = dir;
+              return;
             }
+
+            var orderAggId = orderAgg.id;
+            if (orderAgg.parentId) {
+              orderAgg = vis.aggs.byId[orderAgg.parentId];
+            }
+
+            output.subAggs = (output.subAggs || []).concat(orderAgg);
+            order[orderAggId] = dir;
           }
         }
       ]