Remove the _all settings from the 5.x template (5.6 branch)

Part of elastic#4901. The removal of the `norms: false` costs one byte per doc, but makes the upgrade experience a bit more smooth.
tsg · Aug 18, 2017 · 269b92a · 269b92a
1 parent b95280e
commit 269b92a
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 22 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -14,6 +14,10 @@ https://github.com/elastic/beats/compare/v5.4.1...master[Check the HEAD diff]
 
 *Affecting all Beats*
 
+- The _all.norms setting in the Elasticsearch template is no longer disabled.
+  This increases the storage size with one byte per document, but allows for a
+  better upgrade experience to 6.0. {issue}4901[4901]
+
 *Filebeat*
 
 *Heartbeat*

diff --git a/filebeat/filebeat.template.json b/filebeat/filebeat.template.json
@@ -1,9 +1,6 @@
 {
   "mappings": {
     "_default_": {
-      "_all": {
-        "norms": false
-      },
       "_meta": {
         "version": "5.6.0"
       },

diff --git a/heartbeat/heartbeat.template.json b/heartbeat/heartbeat.template.json
@@ -1,9 +1,6 @@
 {
   "mappings": {
     "_default_": {
-      "_all": {
-        "norms": false
-      },
       "_meta": {
         "version": "5.6.0"
       },

diff --git a/libbeat/scripts/generate_template.py b/libbeat/scripts/generate_template.py
@@ -72,13 +72,6 @@ def fields_to_es_template(args, input, output, index, version):
         # limit shouldn't be that bad.
         template["settings"]["index.mapping.total_fields.limit"] = 10000
 
-        if not args.es6x:
-            # should be done only for es5x. For es6x, any "_all" setting results
-            # in an error.
-            template["mappings"]["_default_"]["_all"] = {
-                "norms": False
-            }
-
     properties = {}
     dynamic_templates = []
 

diff --git a/metricbeat/metricbeat.template.json b/metricbeat/metricbeat.template.json
@@ -1,9 +1,6 @@
 {
   "mappings": {
     "_default_": {
-      "_all": {
-        "norms": false
-      },
       "_meta": {
         "version": "5.6.0"
       },

diff --git a/packetbeat/packetbeat.template.json b/packetbeat/packetbeat.template.json
@@ -1,9 +1,6 @@
 {
   "mappings": {
     "_default_": {
-      "_all": {
-        "norms": false
-      },
       "_meta": {
         "version": "5.6.0"
       },

diff --git a/winlogbeat/winlogbeat.template.json b/winlogbeat/winlogbeat.template.json
@@ -1,9 +1,6 @@
 {
   "mappings": {
     "_default_": {
-      "_all": {
-        "norms": false
-      },
       "_meta": {
         "version": "5.6.0"
       },