From 41f4d1784ddc96fb6b27f57215bc16c12d381411 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Thu, 12 Jan 2017 08:57:53 -0700
Subject: [PATCH] Remove `_all` configuration

Since the `_all` field is now disabled by default and no longer allowed to be
configured, these should be removed from the mapping templates.

Relates to https://github.com/elastic/elasticsearch/pull/22144

Original commit: elastic/x-pack-elasticsearch@3b17c2b9c60d3ece4fcd5556997b50e01023e589
---
 elasticsearch/src/main/resources/monitoring-es.json            | 3 ---
 elasticsearch/src/main/resources/monitoring-kibana.json        | 3 ---
 elasticsearch/src/main/resources/monitoring-logstash.json      | 3 ---
 elasticsearch/src/main/resources/security_audit_log.json       | 3 ---
 elasticsearch/src/main/resources/triggered_watches.json        | 3 ---
 elasticsearch/src/main/resources/watch_history.json            | 3 ---
 elasticsearch/src/main/resources/watches.json                  | 3 ---
 .../monitoring/exporter/local/LocalExporterTemplateTests.java  | 3 ---
 8 files changed, 24 deletions(-)

diff --git a/elasticsearch/src/main/resources/monitoring-es.json b/elasticsearch/src/main/resources/monitoring-es.json
index 22b334e4d62..94646f5f235 100644
--- a/elasticsearch/src/main/resources/monitoring-es.json
+++ b/elasticsearch/src/main/resources/monitoring-es.json
@@ -8,9 +8,6 @@
   },
   "mappings": {
     "_default_": {
-      "_all": {
-        "enabled": false
-      },
       "date_detection": false,
       "properties": {
         "cluster_uuid": {
diff --git a/elasticsearch/src/main/resources/monitoring-kibana.json b/elasticsearch/src/main/resources/monitoring-kibana.json
index 2a831788af7..018090c5e28 100644
--- a/elasticsearch/src/main/resources/monitoring-kibana.json
+++ b/elasticsearch/src/main/resources/monitoring-kibana.json
@@ -7,9 +7,6 @@
   },
   "mappings": {
     "_default_": {
-      "_all": {
-        "enabled": false
-      },
       "properties": {
         "cluster_uuid": {
           "type": "keyword"
diff --git a/elasticsearch/src/main/resources/monitoring-logstash.json b/elasticsearch/src/main/resources/monitoring-logstash.json
index 02124ccc3a4..57ebcc5f9b4 100644
--- a/elasticsearch/src/main/resources/monitoring-logstash.json
+++ b/elasticsearch/src/main/resources/monitoring-logstash.json
@@ -7,9 +7,6 @@
   },
   "mappings": {
     "_default_": {
-      "_all": {
-        "enabled": false
-      },
       "properties": {
         "cluster_uuid": {
           "type": "keyword"
diff --git a/elasticsearch/src/main/resources/security_audit_log.json b/elasticsearch/src/main/resources/security_audit_log.json
index 669dce1c648..2614e4e32e2 100644
--- a/elasticsearch/src/main/resources/security_audit_log.json
+++ b/elasticsearch/src/main/resources/security_audit_log.json
@@ -7,9 +7,6 @@
   "mappings": {
     "event": {
       "dynamic" : "strict",
-      "_all" : {
-        "enabled" : false
-      },
       "properties": {
         "@timestamp": {
           "type": "date",
diff --git a/elasticsearch/src/main/resources/triggered_watches.json b/elasticsearch/src/main/resources/triggered_watches.json
index 2911927d83b..98a317267ed 100644
--- a/elasticsearch/src/main/resources/triggered_watches.json
+++ b/elasticsearch/src/main/resources/triggered_watches.json
@@ -10,9 +10,6 @@
   "mappings": {
     "triggered_watch": {
       "dynamic" : "strict",
-      "_all" : {
-        "enabled" : false
-      },
       "properties": {
         "trigger_event": {
           "type": "object",
diff --git a/elasticsearch/src/main/resources/watch_history.json b/elasticsearch/src/main/resources/watch_history.json
index 1e6514c6831..db8f9041b0a 100644
--- a/elasticsearch/src/main/resources/watch_history.json
+++ b/elasticsearch/src/main/resources/watch_history.json
@@ -40,9 +40,6 @@
         }
       ],
       "dynamic": false,
-      "_all": {
-        "enabled": false
-      },
       "properties": {
         "watch_id": {
           "type": "keyword"
diff --git a/elasticsearch/src/main/resources/watches.json b/elasticsearch/src/main/resources/watches.json
index c0533877548..b2029de8da3 100644
--- a/elasticsearch/src/main/resources/watches.json
+++ b/elasticsearch/src/main/resources/watches.json
@@ -9,9 +9,6 @@
   "mappings": {
     "watch": {
       "dynamic" : "strict",
-      "_all" : {
-        "enabled" : false
-      },
       "properties": {
         "_status": {
           "type": "object",
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java
index 96be1c1e5c8..21e0be18fa8 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterTemplateTests.java
@@ -185,9 +185,6 @@ public class LocalExporterTemplateTests extends MonitoringIntegTestCase {
                                 .endObject()
                                 .startObject("mappings")
                                     .startObject("_default_")
-                                        .startObject("_all")
-                                            .field("enabled", false)
-                                        .endObject()
                                         .field("date_detection", false)
                                         .startObject("properties")
                                             .startObject("cluster_uuid")