add top_hit metric

src/core_plugins/kbn_vislib_vis_types/public/heatmap.js

@@ -65,7 +65,7 @@ export default function HeatmapVisType(Private) {
         title: 'Value',
         min: 1,
         max: 1,
-        aggFilter: ['count', 'avg', 'median', 'sum', 'min', 'max', 'cardinality', 'std_dev'],
+        aggFilter: ['count', 'avg', 'median', 'sum', 'min', 'max', 'cardinality', 'std_dev', 'top_hits'],
         defaults: [
           { schema: 'metric', type: 'count' }
         ]

src/core_plugins/kbn_vislib_vis_types/public/line.js

@@ -70,7 +70,7 @@ export default function HistogramVisType(Private) {
         title: 'Dot Size',
         min: 0,
         max: 1,
-        aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality']
+        aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality', 'top_hits']
       },
       {
         group: 'buckets',

src/core_plugins/kbn_vislib_vis_types/public/pie.js

@@ -44,7 +44,7 @@ export default function HistogramVisType(Private) {
         title: 'Slice Size',
         min: 1,
         max: 1,
-        aggFilter: ['sum', 'count', 'cardinality'],
+        aggFilter: ['sum', 'count', 'cardinality', 'top_hits'],
         defaults: [
           { schema: 'metric', type: 'count' }
         ]

src/core_plugins/kbn_vislib_vis_types/public/tile_map.js

@@ -89,7 +89,7 @@ export default function TileMapVisType(Private, getAppState, courier, config) {
         title: 'Value',
         min: 1,
         max: 1,
-        aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality'],
+        aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality', 'top_hits'],
         defaults: [
           { schema: 'metric', type: 'count' }
         ]

src/core_plugins/kibana/public/visualize/editor/agg_params.js

@@ -82,11 +82,18 @@ uiModules
         // build collection of agg params html
         type.params.forEach(function (param, i) {
           let aggParam;
+          let fields;
+          // if field param exists, compute allowed fields
+          if (param.name === 'field') {
+            fields = $aggParamEditorsScope.indexedFields;
+          } else if (param.type === 'field') {
+            fields = $aggParamEditorsScope[`${param.name}Options`] = param.getFieldOptions($scope.agg);
+          }
 
-          if ($aggParamEditorsScope.indexedFields) {
-            const hasIndexedFields = $aggParamEditorsScope.indexedFields.length > 0;
+          if (fields) {
+            const hasIndexedFields = fields.length > 0;
             const isExtraParam = i > 0;
-            if (!hasIndexedFields && isExtraParam) { // don't draw the rest of the options if their are no indexed fields.
+            if (!hasIndexedFields && isExtraParam) { // don't draw the rest of the options if there are no indexed fields.
               return;
             }
           }

src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js

@@ -21,14 +21,7 @@ describe('metric vis', function () {
     $scope.processTableGroups({
       tables: [{
         columns: [{ title: 'Count' }],
-        rows: [[4301021]],
-        aggConfig: function () {
-          return {
-            fieldFormatter: function () {
-              return formatter;
-            }
-          };
-        }
+        rows: [[ { toString: () => formatter(4301021) } ]]
       }]
     });
 
@@ -44,14 +37,7 @@ describe('metric vis', function () {
           { title: '1st percentile of bytes' },
           { title: '99th percentile of bytes' }
         ],
-        rows: [[182, 445842.4634666484]],
-        aggConfig: function () {
-          return {
-            fieldFormatter: function () {
-              return formatter;
-            }
-          };
-        }
+        rows: [[ { toString: () => formatter(182) }, { toString: () => formatter(445842.4634666484) } ]]
       }]
     });
 

src/core_plugins/metric_vis/public/metric_vis_controller.js

@@ -17,23 +17,24 @@ module.controller('KbnMetricVisController', function ($scope, $element, Private)
   $scope.processTableGroups = function (tableGroups) {
     tableGroups.tables.forEach(function (table) {
       table.columns.forEach(function (column, i) {
-        const fieldFormatter = table.aggConfig(column).fieldFormatter();
-        let value = table.rows[0][i];
-
-        value = isInvalid(value) ? '?' : fieldFormatter(value);
+        const value = table.rows[0][i];
 
         metrics.push({
           label: column.title,
-          value: value
+          value: value.toString('html')
         });
       });
     });
   };
 
   $scope.$watch('esResponse', function (resp) {
     if (resp) {
+      const options = {
+        asAggConfigResults: true
+      };
+
       metrics.length = 0;
-      $scope.processTableGroups(tabifyAggResponse($scope.vis, resp));
+      $scope.processTableGroups(tabifyAggResponse($scope.vis, resp, options));
       $element.trigger('renderComplete');
     }
   });

src/fixtures/logstash_fields.js

@@ -5,7 +5,7 @@ function stubbedLogstashFields() {
     //                                  |      |      |aggregatable
     //                                  |      |      |      |searchable
     // name                type         |      |      |      |     |metadata
-    ['bytes',             'number',     true,  true,  true,  true,  { count: 10 } ],
+    ['bytes',             'number',     true,  true,  true,  true,  { count: 10, docValues: true } ],
     ['ssl',               'boolean',    true,  true,  true,  true,  { count: 20 } ],
     ['@timestamp',        'date',       true,  true,  true,  true,  { count: 30 } ],
     ['time',              'date',       true,  true,  true,  true,  { count: 30 } ],
@@ -20,6 +20,7 @@ function stubbedLogstashFields() {
     ['geo.coordinates',   'geo_point',  true,  true,  true,  true ],
     ['extension',         'string',     true,  true,  true,  true ],
     ['machine.os',        'string',     true,  true,  true,  true ],
+    ['machine.os.raw',    'string',     true,  false, true,  true,  { docValues: true } ],
     ['geo.src',           'string',     true,  true,  true,  true ],
     ['_id',               'string',     false, false, true,  true ],
     ['_type',             'string',     false, false, true,  true ],
@@ -41,6 +42,7 @@ function stubbedLogstashFields() {
     ] = row;
 
     const {
+      docValues = false,
       count = 0,
       script,
       lang = script ? 'expression' : undefined,
@@ -50,6 +52,7 @@ function stubbedLogstashFields() {
     return {
       name,
       type,
+      doc_values: docValues,
       indexed,
       analyzed,
       aggregatable,

src/test_utils/stub_index_pattern.js

@@ -8,6 +8,7 @@ import getComputedFields from 'ui/index_patterns/_get_computed_fields';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit';
 import IndexPatternsFieldProvider from 'ui/index_patterns/_field';
+
 export default function (Private) {
   const fieldFormats = Private(RegistryFieldFormatsProvider);
   const flattenHit = Private(IndexPatternsFlattenHitProvider);

src/ui/public/agg_types/__tests__/buckets/terms.js

@@ -0,0 +1,156 @@
+import expect from 'expect.js';
+import ngMock from 'ng_mock';
+import AggTypesIndexProvider from 'ui/agg_types/index';
+
+describe('Terms Agg', function () {
+  describe('order agg editor UI', function () {
+
+    let $rootScope;
+
+    function init({ responseValueAggs = [] }) {
+      ngMock.module('kibana');
+      ngMock.inject(function (Private, $controller, _$rootScope_) {
+        const terms = Private(AggTypesIndexProvider).byName.terms;
+        const orderAggController = terms.params.byName.orderAgg.controller;
+
+        $rootScope = _$rootScope_;
+        $rootScope.agg = {
+          id: 'test',
+          params: {},
+          type: terms,
+          vis: {
+            aggs: []
+          }
+        };
+        $rootScope.responseValueAggs = responseValueAggs;
+        $controller(orderAggController, { $scope: $rootScope });
+        $rootScope.$digest();
+      });
+    }
+
+    it('defaults to the first metric agg', function () {
+      init({
+        responseValueAggs: [
+          {
+            id: 'agg1',
+            type: {
+              name: 'count'
+            }
+          },
+          {
+            id: 'agg2',
+            type: {
+              name: 'count'
+            }
+          }
+        ]
+      });
+      expect($rootScope.agg.params.orderBy).to.be('agg1');
+    });
+
+    it('defaults to the first metric agg that is compatible with the terms bucket', function () {
+      init({
+        responseValueAggs: [
+          {
+            id: 'agg1',
+            type: {
+              name: 'top_hits'
+            }
+          },
+          {
+            id: 'agg2',
+            type: {
+              name: 'percentiles'
+            }
+          },
+          {
+            id: 'agg3',
+            type: {
+              name: 'median'
+            }
+          },
+          {
+            id: 'agg4',
+            type: {
+              name: 'std_dev'
+            }
+          },
+          {
+            id: 'agg5',
+            type: {
+              name: 'count'
+            }
+          }
+        ]
+      });
+      expect($rootScope.agg.params.orderBy).to.be('agg5');
+    });
+
+    it('defaults to the _term metric if no agg is compatible', function () {
+      init({
+        responseValueAggs: [
+          {
+            id: 'agg1',
+            type: {
+              name: 'top_hits'
+            }
+          }
+        ]
+      });
+      expect($rootScope.agg.params.orderBy).to.be('_term');
+    });
+
+    it('selects _term if there are no metric aggs', function () {
+      init({});
+      expect($rootScope.agg.params.orderBy).to.be('_term');
+    });
+
+    it('selects _term if the selected metric becomes incompatible', function () {
+      init({
+        responseValueAggs: [
+          {
+            id: 'agg1',
+            type: {
+              name: 'count'
+            }
+          }
+        ]
+      });
+      expect($rootScope.agg.params.orderBy).to.be('agg1');
+      $rootScope.responseValueAggs = [
+        {
+          id: 'agg1',
+          type: {
+            name: 'top_hits'
+          }
+        }
+      ];
+      $rootScope.$digest();
+      expect($rootScope.agg.params.orderBy).to.be('_term');
+    });
+
+    it('selects _term if the selected metric is removed', function () {
+      init({
+        responseValueAggs: [
+          {
+            id: 'agg1',
+            type: {
+              name: 'count'
+            }
+          }
+        ]
+      });
+      expect($rootScope.agg.params.orderBy).to.be('agg1');
+      $rootScope.responseValueAggs = [];
+      $rootScope.$digest();
+      expect($rootScope.agg.params.orderBy).to.be('_term');
+    });
+
+    it('adds "custom metric" option');
+    it('lists all metric agg responses');
+    it('lists individual values of a multi-value metric');
+    it('displays a metric editor if "custom metric" is selected');
+    it('saves the "custom metric" to state and refreshes from it');
+    it('invalidates the form if the metric agg form is not complete');
+  });
+});