Update monitoring template version to 6040099 (#32088)

ruflin · web-flow · commit 34083c67d4aa · 2018-07-17T09:27:49.000+02:00
This ensures the new monitoring fields are available in 6.4 monitoring templates.
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
@@ -28,7 +28,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_6_2_0.id;
+    public static final int LAST_UPDATED_VERSION = Version.V_6_4_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.json b/x-pack/plugin/core/src/main/resources/monitoring-alerts.json
@@ -1,6 +1,6 @@
 {
   "index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ],
-  "version": 6020099,
+  "version": 6040099,
   "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
@@ -1,6 +1,6 @@
 {
   "index_patterns": [ ".monitoring-beats-${monitoring.template.version}-*" ],
-  "version": 6020099,
+  "version": 6040099,
   "settings": {
     "index.number_of_shards": 1,
     "index.number_of_replicas": 0,
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": 6020099,
+  "version": 6040099,
   "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": 6020099,
+  "version": 6040099,
   "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": 6020099,
+  "version": 6040099,
   "settings": {
     "index.number_of_shards": 1,
     "index.number_of_replicas": 0,
diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json
@@ -7,7 +7,7 @@
       "link": "elasticsearch/indices",
       "severity": 2100,
       "type": "monitoring",
-      "version_created": 6020099,
+      "version_created": 6040099,
       "watch": "${monitoring.watch.id}"
     }
   },
diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_nodes.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_nodes.json
@@ -7,7 +7,7 @@
       "link": "elasticsearch/nodes",
       "severity": 1999,
       "type": "monitoring",
-      "version_created": 6020099,
+      "version_created": 6040099,
       "watch": "${monitoring.watch.id}"
     }
   },
diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json
@@ -7,7 +7,7 @@
       "link": "elasticsearch/nodes",
       "severity": 1000,
       "type": "monitoring",
-      "version_created": 6020099,
+      "version_created": 6040099,
       "watch": "${monitoring.watch.id}"
     }
   },
diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json
@@ -7,7 +7,7 @@
       "link": "kibana/instances",
       "severity": 1000,
       "type": "monitoring",
-      "version_created": 6020099,
+      "version_created": 6040099,
       "watch": "${monitoring.watch.id}"
     }
   },
diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json
@@ -7,7 +7,7 @@
       "link": "logstash/instances",
       "severity": 1000,
       "type": "monitoring",
-      "version_created": 6020099,
+      "version_created": 6040099,
       "watch": "${monitoring.watch.id}"
     }
   },
diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/xpack_license_expiration.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/xpack_license_expiration.json
@@ -8,7 +8,7 @@
       "alert_index": ".monitoring-alerts-6",
       "cluster_uuid": "${monitoring.watch.cluster_uuid}",
       "type": "monitoring",
-      "version_created": 6020099,
+      "version_created": 6040099,
       "watch": "${monitoring.watch.id}"
     }
   },

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": 6020099,`
	`3`	`+ "version": 6040099,`
`4`	`4`	`"settings": {`
`5`	`5`	`"index": {`
`6`	`6`	`"number_of_shards": 1,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"index_patterns": [ ".monitoring-beats-${monitoring.template.version}-*" ],`
`3`		`- "version": 6020099,`
	`3`	`+ "version": 6040099,`
`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-es-${monitoring.template.version}-*" ],`
`3`		`- "version": 6020099,`
	`3`	`+ "version": 6040099,`
`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": 6020099,`
	`3`	`+ "version": 6040099,`
`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": 6020099,`
	`3`	`+ "version": 6040099,`
`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
`@@ -7,7 +7,7 @@`
`7`	`7`	`"link": "elasticsearch/indices",`
`8`	`8`	`"severity": 2100,`
`9`	`9`	`"type": "monitoring",`
`10`		`- "version_created": 6020099,`
	`10`	`+ "version_created": 6040099,`
`11`	`11`	`"watch": "${monitoring.watch.id}"`
`12`	`12`	`}`
`13`	`13`	`},`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"link": "elasticsearch/nodes",`
`8`	`8`	`"severity": 1999,`
`9`	`9`	`"type": "monitoring",`
`10`		`- "version_created": 6020099,`
	`10`	`+ "version_created": 6040099,`
`11`	`11`	`"watch": "${monitoring.watch.id}"`
`12`	`12`	`}`
`13`	`13`	`},`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"link": "elasticsearch/nodes",`
`8`	`8`	`"severity": 1000,`
`9`	`9`	`"type": "monitoring",`
`10`		`- "version_created": 6020099,`
	`10`	`+ "version_created": 6040099,`
`11`	`11`	`"watch": "${monitoring.watch.id}"`
`12`	`12`	`}`
`13`	`13`	`},`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"link": "kibana/instances",`
`8`	`8`	`"severity": 1000,`
`9`	`9`	`"type": "monitoring",`
`10`		`- "version_created": 6020099,`
	`10`	`+ "version_created": 6040099,`
`11`	`11`	`"watch": "${monitoring.watch.id}"`
`12`	`12`	`}`
`13`	`13`	`},`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"link": "logstash/instances",`
`8`	`8`	`"severity": 1000,`
`9`	`9`	`"type": "monitoring",`
`10`		`- "version_created": 6020099,`
	`10`	`+ "version_created": 6040099,`
`11`	`11`	`"watch": "${monitoring.watch.id}"`
`12`	`12`	`}`
`13`	`13`	`},`