[7.x] [Monitoring] Add usage mapping for monitoring-kibana index (…

…#40899) (#41601) Backports the usage change to 7.x. A separate backport is needed to change the version for 6.7, which will complete this backport.
elastic · Apr 26, 2019 · 858e7f4 · 858e7f4
1 parent 22f3b53
commit 858e7f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/...c/main/java/org/elasticsearch/xpack/core/monitoring/exporter/MonitoringTemplateUtils.java b/...c/main/java/org/elasticsearch/xpack/core/monitoring/exporter/MonitoringTemplateUtils.java
@@ -29,7 +29,7 @@ public final class MonitoringTemplateUtils {
      * <p>
      * It may be possible for this to diverge between templates and pipelines, but for now they're the same.
      */
-    public static final int LAST_UPDATED_VERSION = Version.V_7_0_0.id;
+    public static final int LAST_UPDATED_VERSION = Version.V_7_0_1.id;
 
     /**
      * Current version of templates used in their name to differentiate from breaking changes (separate from product version).

diff --git a/x-pack/plugin/core/src/main/resources/monitoring-alerts-7.json b/x-pack/plugin/core/src/main/resources/monitoring-alerts-7.json
@@ -1,6 +1,6 @@
 {
   "index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ],
-  "version": 7000099,
+  "version": 7000199,
   "settings": {
     "index": {
       "number_of_shards": 1,

diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json
@@ -9,7 +9,7 @@
     "index.number_of_replicas": 0,
     "index.number_of_shards": 1
   },
-  "version": 7000099,
+  "version": 7000199,
   "mappings": {
     "_doc": {
       "dynamic": false,

diff --git a/x-pack/plugin/core/src/main/resources/monitoring-es.json b/x-pack/plugin/core/src/main/resources/monitoring-es.json
@@ -1,6 +1,6 @@
 {
   "index_patterns": [ ".monitoring-es-${monitoring.template.version}-*" ],
-  "version": 7000099,
+  "version": 7000199,
   "settings": {
     "index.number_of_shards": 1,
     "index.number_of_replicas": 0,

diff --git a/x-pack/plugin/core/src/main/resources/monitoring-kibana.json b/x-pack/plugin/core/src/main/resources/monitoring-kibana.json
@@ -1,6 +1,6 @@
 {
   "index_patterns": [ ".monitoring-kibana-${monitoring.template.version}-*" ],
-  "version": 7000099,
+  "version": 7000199,
   "settings": {
     "index.number_of_shards": 1,
     "index.number_of_replicas": 0,
@@ -50,6 +50,13 @@
         },
         "kibana_stats": {
           "properties": {
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
+            },
             "kibana": {
               "properties": {
                 "uuid": {

diff --git a/x-pack/plugin/core/src/main/resources/monitoring-logstash.json b/x-pack/plugin/core/src/main/resources/monitoring-logstash.json
@@ -1,6 +1,6 @@
 {
   "index_patterns": [ ".monitoring-logstash-${monitoring.template.version}-*" ],
-  "version": 7000099,
+  "version": 7000199,
   "settings": {
     "index.number_of_shards": 1,
     "index.number_of_replicas": 0,