From 2faa3ee2f58f6e3e2ee839022184c3b52b94b407 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 4 Mar 2016 15:48:14 -0500
Subject: [PATCH] Remove outdated mapping options that were copied over from
 logstash template

---
 .../kibana/server/lib/create_mappings_from_pattern_fields.js    | 2 --
 src/plugins/kibana/server/routes/api/ingest/register_post.js    | 2 --
 .../scenarios/logstashFunctional/makelogsIndexDefinition.js     | 1 -
 test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js     | 1 -
 4 files changed, 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
index db8891fb98ecec..d05e650991613c 100644
--- 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
index 82972768c64811..b36b778232fddf 100644
--- 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
index 67ecf94ca30135..95b416ea852f02 100644
--- 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
index 67ecf94ca30135..95b416ea852f02 100644
--- 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',