[Monitoring] Monitor beat version (#73932) (#73981)

graphaelli · web-flow · commit fed630b92047 · 2021-06-10T08:15:47.000-04:00
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/exporter/MonitoringTemplateUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/exporter/MonitoringTemplateUtils.java
@@ -32,7 +32,7 @@ public final class MonitoringTemplateUtils {
      * Note that the templates were last updated in 7.11.0, but the versions were not updated, meaning that upgrades
      * to 7.11.0 would not have updated the templates. See https://github.com/elastic/elasticsearch/pull/69317.
      */
-    public static final int LAST_UPDATED_VERSION = Version.V_7_12_0.id;
+    public static final int LAST_UPDATED_VERSION = Version.V_7_14_0.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": 7120099,
+  "version": 7140099,
   "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": 7120099,
+  "version": 7140099,
   "mappings": {
     "_doc": {
       "dynamic": false,
@@ -291,6 +291,9 @@
                               "type": "long"
                             }
                           }
+                        },
+                        "version": {
+                          "type": "keyword"
                         }
                       }
                     },
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": 7120099,
+  "version": 7140099,
   "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": 7120099,
+  "version": 7140099,
   "settings": {
     "index.number_of_shards": 1,
     "index.number_of_replicas": 0,
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": 7120099,
+  "version": 7140099,
   "settings": {
     "index.number_of_shards": 1,
     "index.number_of_replicas": 0,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ],`
`3`		`- "version": 7120099,`
	`3`	`+ "version": 7140099,`
`4`	`4`	`"settings": {`
`5`	`5`	`"index": {`
`6`	`6`	`"number_of_shards": 1,`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"index.number_of_replicas": 0,`
`10`	`10`	`"index.number_of_shards": 1`
`11`	`11`	`},`
`12`		`- "version": 7120099,`
	`12`	`+ "version": 7140099,`
`13`	`13`	`"mappings": {`
`14`	`14`	`"_doc": {`
`15`	`15`	`"dynamic": false,`
`@@ -291,6 +291,9 @@`
`291`	`291`	`"type": "long"`
`292`	`292`	`}`
`293`	`293`	`}`
	`294`	`+ },`
	`295`	`+ "version": {`
	`296`	`+ "type": "keyword"`
`294`	`297`	`}`
`295`	`298`	`}`
`296`	`299`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"index_patterns": [ ".monitoring-es-${monitoring.template.version}-*" ],`
`3`		`- "version": 7120099,`
	`3`	`+ "version": 7140099,`
`4`	`4`	`"settings": {`
`5`	`5`	`"index.number_of_shards": 1,`
`6`	`6`	`"index.number_of_replicas": 0,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"index_patterns": [ ".monitoring-kibana-${monitoring.template.version}-*" ],`
`3`		`- "version": 7120099,`
	`3`	`+ "version": 7140099,`
`4`	`4`	`"settings": {`
`5`	`5`	`"index.number_of_shards": 1,`
`6`	`6`	`"index.number_of_replicas": 0,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"index_patterns": [ ".monitoring-logstash-${monitoring.template.version}-*" ],`
`3`		`- "version": 7120099,`
	`3`	`+ "version": 7140099,`
`4`	`4`	`"settings": {`
`5`	`5`	`"index.number_of_shards": 1,`
`6`	`6`	`"index.number_of_replicas": 0,`