do not rely on init_default_field_props to set the doc_values property

scampi · Nov 21, 2016 · 19e2104 · 19e2104
1 parent b465438
commit 19e2104
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 196 deletions.
diff --git a/src/core_plugins/kibana/server/lib/__tests__/init_default_field_props.js b/src/core_plugins/kibana/server/lib/__tests__/init_default_field_props.js
diff --git a/src/core_plugins/kibana/server/lib/init_default_field_props.js b/src/core_plugins/kibana/server/lib/init_default_field_props.js
diff --git a/src/core_plugins/kibana/server/lib/mapping_overrides.js b/src/core_plugins/kibana/server/lib/mapping_overrides.js
diff --git a/src/fixtures/logstash_fields.js b/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, doc_values: 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,  { doc_values: 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 {
+      doc_values = false,
       count = 0,
       script,
       lang = script ? 'expression' : undefined,
@@ -50,6 +52,7 @@ function stubbedLogstashFields() {
     return {
       name,
       type,
+      doc_values,
       indexed,
       analyzed,
       aggregatable,

diff --git a/src/test_utils/stub_index_pattern.js b/src/test_utils/stub_index_pattern.js
@@ -8,7 +8,6 @@ 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';
-import initDefaultFieldProps from '../core_plugins/kibana/server/lib/init_default_field_props';
 
 export default function (Private) {
   let fieldFormats = Private(RegistryFieldFormatsProvider);
@@ -44,7 +43,7 @@ export default function (Private) {
       this.fields = new IndexedArray({
         index: ['name'],
         group: ['type'],
-        initialSet: initDefaultFieldProps(fields).map(function (field) {
+        initialSet: fields.map(function (field) {
           return new Field(this, field);
         }, this)
       });

diff --git a/src/ui/public/agg_types/__tests__/metrics/top_hit.js b/src/ui/public/agg_types/__tests__/metrics/top_hit.js
@@ -173,17 +173,18 @@ describe('Top hit metric', function () {
             hits: [
               {
                 _source: {
+                  'machine.os': 'linux'
                 },
                 fields: {
-                  'machine.os': [ 'linux' ]
+                  'machine.os.raw': [ 'linux' ]
                 }
               }
             ]
           }
         }
       };
 
-      init({ field: 'machine.os' });
+      init({ field: 'machine.os.raw' });
       expect(topHitMetric.getValue(aggConfig, bucket)).to.be('linux');
     });
 
@@ -194,18 +195,18 @@ describe('Top hit metric', function () {
             hits: [
               {
                 _source: {
-                  nope: 'aaa'
+                  bytes: 12345
                 },
                 fields: {
-                  nope: [ 'aaa' ]
+                  bytes: 12345
                 }
               }
             ]
           }
         }
       };
 
-      init({ field: 'machine.os' });
+      init({ field: 'machine.os.raw' });
       expect(topHitMetric.getValue(aggConfig, bucket)).to.be(null);
     });
   });