From 0b567d60e88f38c2333b97f6861e304d7979479d Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 26 Feb 2021 08:55:30 +0800 Subject: [PATCH] [Monitoring] Update monitoring template versions (#69317) * [Monitoring] Update monitoring template versions Update monitoring template versions to 7.11.0, to ensure they are replaced on upgrade. * Change template versions to 7.12.0 Co-authored-by: Elastic Machine --- .../core/monitoring/exporter/MonitoringTemplateUtils.java | 5 ++++- .../plugin/core/src/main/resources/monitoring-alerts-7.json | 2 +- x-pack/plugin/core/src/main/resources/monitoring-beats.json | 2 +- x-pack/plugin/core/src/main/resources/monitoring-es.json | 2 +- x-pack/plugin/core/src/main/resources/monitoring-kibana.json | 2 +- .../plugin/core/src/main/resources/monitoring-logstash.json | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) 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 index 7c380135e49bd..9f978cc39a4b7 100644 --- 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,8 +28,11 @@ public final class MonitoringTemplateUtils { * The last version of X-Pack that updated the templates and pipelines. *

* It may be possible for this to diverge between templates and pipelines, but for now they're the same. + * + * 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_0_0.id; + public static final int LAST_UPDATED_VERSION = Version.V_7_12_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 index 5016eca9e92fc..3c5c25a153035 100644 --- 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": 7120099, "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 index 6f89f036fb526..876d58dd45f6d 100644 --- 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": 7120099, "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 index 9517c4a49c88b..50d89921ae88a 100644 --- 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": 7120099, "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 index 1f916625c37f3..9755d57996ee9 100644 --- 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": 7120099, "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 index a3dc60ae803b9..922cb32f2694e 100644 --- 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": 7120099, "settings": { "index.number_of_shards": 1, "index.number_of_replicas": 0,