From 0a0128ee2a00fa5d649bcdbef529c4f30953dc59 Mon Sep 17 00:00:00 2001
From: Mathieu Martin <mathieu.martin@elastic.co>
Date: Thu, 10 Dec 2020 16:19:49 -0500
Subject: [PATCH] Move _meta section back inside mappings, in legacy templates.
 (#1186)

This fixes an issue introduced by #1156, discovered in #1180. Composable templates support `_meta` at the template's root, but legacy templates don't. So we're just putting it back inside the mappings for legacy templates.

This also fixes missing updates to the component template, after the introduction of wildcard in #1098.
---
 CHANGELOG.next.md                                   |  4 ++--
 .../generated/elasticsearch/7/template.json         |  6 +++---
 generated/elasticsearch/6/template.json             |  6 +++---
 generated/elasticsearch/7/template.json             |  6 +++---
 scripts/generators/es_template.py                   | 13 +++++++++----
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
index ce5be6eab8..8ca8f9e915 100644
--- a/CHANGELOG.next.md
+++ b/CHANGELOG.next.md
@@ -46,13 +46,13 @@ Thanks, you're awesome :-) -->
 * Added support in the generated Go source go for `wildcard`, `version`, and `constant_keyword` data types. #1050
 * Added support for marking fields, field sets, or field reuse as beta in the documentation. #1051
 * Added support for `constant_keyword`'s optional parameter `value`. #1112
-* Added component templates for ECS field sets. #1156
+* Added component templates for ECS field sets. #1156, #1186
 
 #### Improvements
 
 * Added a notice highlighting that the `tracing` fields are not nested under the
   namespace `tracing.` #1162
-* ES 6.x template data types will fallback to supported types. #1171, #1176
+* ES 6.x template data types will fallback to supported types. #1171, #1176, #1186
 
 #### Deprecated
 
diff --git a/experimental/generated/elasticsearch/7/template.json b/experimental/generated/elasticsearch/7/template.json
index dfa18031da..1ae21ee498 100644
--- a/experimental/generated/elasticsearch/7/template.json
+++ b/experimental/generated/elasticsearch/7/template.json
@@ -1,11 +1,11 @@
 {
-  "_meta": {
-    "version": "1.8.0-dev+exp"
-  },
   "index_patterns": [
     "try-ecs-*"
   ],
   "mappings": {
+    "_meta": {
+      "version": "1.8.0-dev+exp"
+    },
     "date_detection": false,
     "dynamic_templates": [
       {
diff --git a/generated/elasticsearch/6/template.json b/generated/elasticsearch/6/template.json
index fa8b315edc..bf81034aec 100644
--- a/generated/elasticsearch/6/template.json
+++ b/generated/elasticsearch/6/template.json
@@ -1,12 +1,12 @@
 {
-  "_meta": {
-    "version": "1.8.0-dev"
-  },
   "index_patterns": [
     "try-ecs-*"
   ],
   "mappings": {
     "_doc": {
+      "_meta": {
+        "version": "1.8.0-dev"
+      },
       "date_detection": false,
       "dynamic_templates": [
         {
diff --git a/generated/elasticsearch/7/template.json b/generated/elasticsearch/7/template.json
index 2de32c5500..4b94205762 100644
--- a/generated/elasticsearch/7/template.json
+++ b/generated/elasticsearch/7/template.json
@@ -1,11 +1,11 @@
 {
-  "_meta": {
-    "version": "1.8.0-dev"
-  },
   "index_patterns": [
     "try-ecs-*"
   ],
   "mappings": {
+    "_meta": {
+      "version": "1.8.0-dev"
+    },
     "date_detection": false,
     "dynamic_templates": [
       {
diff --git a/scripts/generators/es_template.py b/scripts/generators/es_template.py
index 2b7f6e6f58..fb45800dce 100644
--- a/scripts/generators/es_template.py
+++ b/scripts/generators/es_template.py
@@ -192,19 +192,24 @@ def template_settings(es_version, ecs_version, mappings_section, template_settin
             template = json.load(f)
     else:
         template = default_template_settings(ecs_version)
+
     if es_version == 6:
-        es6_mappings_section = copy.deepcopy(mappings_section)
-        es6_type_fallback(es6_mappings_section['properties'])
+        mappings_section = copy.deepcopy(mappings_section)
+        es6_type_fallback(mappings_section['properties'])
 
         # error.stack_trace needs special handling to set
         # index: false and doc_values: false
-        error_stack_trace_mappings = es6_mappings_section['properties']['error']['properties']['stack_trace']
+        error_stack_trace_mappings = mappings_section['properties']['error']['properties']['stack_trace']
         error_stack_trace_mappings.setdefault('index', False)
         error_stack_trace_mappings.setdefault('doc_values', False)
 
-        template['mappings'] = {'_doc': es6_mappings_section}
+        template['mappings'] = {'_doc': mappings_section}
     else:
         template['mappings'] = mappings_section
+
+    # _meta can't be at template root in legacy templates, so moving back to mappings section
+    mappings_section['_meta'] = template.pop('_meta')
+
     return template