Merge pull request #6429 from Bargs/fix/removeOldMappingOptions

Remove outdated mapping options from ingest API defaults
elastic · Mar 7, 2016 · 9b25add · 9b25add
2 parents 5d1796b + 2faa3ee
commit 9b25add
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 6 deletions.
diff --git a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
@@ -15,8 +15,6 @@ module.exports = function createMappingsFromPatternFields(fields) {
       mapping = {
         type: 'string',
         index: 'analyzed',
-        omit_norms: true,
-        fielddata: {format: 'disabled'},
         fields: {
           raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256}
         }

diff --git a/src/plugins/kibana/server/routes/api/ingest/register_post.js b/src/plugins/kibana/server/routes/api/ingest/register_post.js
@@ -59,8 +59,6 @@ module.exports = function registerPost(server) {
                       mapping: {
                         type: 'string',
                         index: 'analyzed',
-                        omit_norms: true,
-                        fielddata: {format: 'disabled'},
                         fields: {
                           raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256}
                         }

diff --git a/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js b/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js
@@ -21,7 +21,6 @@ module.exports = {
           'mapping': {
             'type': 'string',
             'index': 'analyzed',
-            'omit_norms': true,
             'fields': {
               'raw': {
                 'index': 'not_analyzed',

diff --git a/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js b/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js
@@ -21,7 +21,6 @@ module.exports = {
           'mapping': {
             'type': 'string',
             'index': 'analyzed',
-            'omit_norms': true,
             'fields': {
               'raw': {
                 'index': 'not_analyzed',