Bring back the _all field in 5.x

This is a temporary solution for elastic#3368, to avoid a breaking change in 5.x.
tsg · Feb 7, 2017 · f56ad2c · f56ad2c
1 parent 61ef81c
commit f56ad2c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/filebeat/filebeat.template.json b/filebeat/filebeat.template.json
@@ -1,6 +1,9 @@
 {
   "mappings": {
     "_default_": {
+      "_all": {
+        "norms": false
+      },
       "_meta": {
         "version": "5.3.0"
       },

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

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

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

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

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