Fix tets that rely on ID

alpar-t · alpar-t · commit fa5d007184c2 · 2018-11-02T06:01:38.000+02:00
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": 7000001,
+  "version": 7000099,
   "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": 7000001,
+  "version": 7000099,
   "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": 7000001,
+  "version": 7000099,
   "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": 7000001,
+  "version": 7000099,
   "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": 7000001,
+  "version": 7000099,
   "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": 7000001,
+      "version_created": 7000099,
       "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": 7000001,
+      "version_created": 7000099,
       "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": 7000001,
+      "version_created": 7000099,
       "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": 7000001,
+      "version_created": 7000099,
       "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": 7000001,
+      "version_created": 7000099,
       "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": 7000001,
+      "version_created": 7000099,
       "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": 7000001,`
	`3`	`+ "version": 7000099,`
`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-es-${monitoring.template.version}-*" ],`
`3`		`- "version": 7000001,`
	`3`	`+ "version": 7000099,`
`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": 7000001,`
	`3`	`+ "version": 7000099,`
`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": 7000001,`
	`3`	`+ "version": 7000099,`
`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": 7000001,`
	`10`	`+ "version_created": 7000099,`
`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": 7000001,`
	`10`	`+ "version_created": 7000099,`
`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": 7000001,`
	`10`	`+ "version_created": 7000099,`
`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": 7000001,`
	`10`	`+ "version_created": 7000099,`
`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": 7000001,`
	`10`	`+ "version_created": 7000099,`
`11`	`11`	`"watch": "${monitoring.watch.id}"`
`12`	`12`	`}`
`13`	`13`	`},`