Adding back doc to template mappings

Author: ycombinator

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/MonitoringTemplateUtilsTests.java

@@ -59,8 +59,10 @@ public void testLoadTemplate() throws IOException {
         assertTemplate(source, equalTo("{\n" +
                 "  \"index_patterns\": \".monitoring-data-" + TEMPLATE_VERSION + "\",\n" +
                 "  \"mappings\": {\n" +
-                "    \"_meta\": {\n" +
-                "      \"template.version\": \"" + TEMPLATE_VERSION + "\"\n" +
+                "    \"doc\": {\n" +
+                "      \"_meta\": {\n" +
+                "        \"template.version\": \"" + TEMPLATE_VERSION + "\"\n" +
+                "      }\n" +
                 "    }\n" +
                 "  }\n" +
                 "}\n"));

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterResourceIntegTests.java

@@ -81,9 +81,11 @@ private static BytesReference generateTemplateSource(final String name, final In
                 .field("index.number_of_replicas", 0)
             .endObject()
             .startObject("mappings")
-                .field("enabled", false)
-                .startObject("_meta")
-                    .field("test", true)
+                .startObject("doc")
+                    .startObject("_meta")
+                        .field("test", true)
+                    .endObject()
+                    .field("enabled", false)
                 .endObject()
             .endObject();
 
@@ -191,7 +193,7 @@ private void assertTemplateNotUpdated() {
         final String name = MonitoringTemplateUtils.templateName(system.getSystem());
 
         for (IndexTemplateMetaData template : client().admin().indices().prepareGetTemplates(name).get().getIndexTemplates()) {
-            final String docMapping = template.getMappings().toString();
+            final String docMapping = template.getMappings().get("doc").toString();
 
             assertThat(docMapping, notNullValue());
             assertThat(docMapping, containsString("test"));

x-pack/plugin/monitoring/src/test/resources/monitoring-test.json

@@ -1,8 +1,10 @@
 {
   "index_patterns": ".monitoring-data-${monitoring.template.version}",
   "mappings": {
-    "_meta": {
-      "template.version": "${monitoring.template.version}"
+    "doc": {
+      "_meta": {
+        "template.version": "${monitoring.template.version}"
+      }
     }
   }
 }