Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Monitoring] Update monitoring template versions #69317

Merged
merged 3 commits into from
Feb 26, 2021
Merged

[Monitoring] Update monitoring template versions #69317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6dfefa
[Monitoring] Update monitoring template versions
axw Feb 22, 2021
13de8b0
Change template versions to 7.12.0
axw Feb 25, 2021
3cfe2b7
Merge branch 'master' into bump-monitoring-template-version
elasticmachine Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...c/main/java/org/elasticsearch/xpack/core/monitoring/exporter/MonitoringTemplateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ public final class MonitoringTemplateUtils {
* The last version of X-Pack that updated the templates and pipelines.
* <p>
* 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).
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/core/src/main/resources/monitoring-alerts-7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ],
"version": 7000099,
"version": 7120099,
"settings": {
"index": {
"number_of_shards": 1,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/core/src/main/resources/monitoring-beats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"index.number_of_replicas": 0,
"index.number_of_shards": 1
},
"version": 7000099,
"version": 7120099,
"mappings": {
"_doc": {
"dynamic": false,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/core/src/main/resources/monitoring-es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/core/src/main/resources/monitoring-kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/core/src/main/resources/monitoring-logstash.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down