From 6ee6c87141856225f1470eba19e011cdf1e9f0b7 Mon Sep 17 00:00:00 2001 From: James Baiera Date: Wed, 6 Oct 2021 17:58:06 -0400 Subject: [PATCH 1/7] Add deprecation info API entries for recently deprecated monitoring settings --- .../migration/migrate_8_0/monitoring.asciidoc | 5 +- .../MonitoringDeprecatedSettings.java | 2 +- .../xpack/deprecation/DeprecationChecks.java | 5 +- .../deprecation/NodeDeprecationChecks.java | 49 +++++++++++++++++ .../NodeDeprecationChecksTests.java | 55 +++++++++++++++++++ .../xpack/monitoring/Monitoring.java | 1 + 6 files changed, 113 insertions(+), 4 deletions(-) rename x-pack/plugin/{monitoring/src/main/java/org/elasticsearch/xpack => core/src/main/java/org/elasticsearch/xpack/core}/monitoring/MonitoringDeprecatedSettings.java (97%) diff --git a/docs/reference/migration/migrate_8_0/monitoring.asciidoc b/docs/reference/migration/migrate_8_0/monitoring.asciidoc index cdedfe29982c5..3c40b80dd0f03 100644 --- a/docs/reference/migration/migrate_8_0/monitoring.asciidoc +++ b/docs/reference/migration/migrate_8_0/monitoring.asciidoc @@ -12,7 +12,8 @@ *Details* + The `xpack.monitoring.exporters.*.use_ingest` property was deprecated in 7.16.0 and has been removed. This parameter controlled the creation of pipelines for monitoring -indices that previously had no function. +indices. Those pipelines for monitoring indices previously +had no function and are now removed. This setting will be removed in a future release. *Impact* + Discontinue the use of the `xpack.monitoring.exporters.*.use_ingest` setting. @@ -25,7 +26,7 @@ Discontinue the use of the `xpack.monitoring.exporters.*.use_ingest` setting. The `xpack.monitoring.exporters.*.index.pipeline.master_timeout` property was deprecated in 7.16.0. This parameter set the timeout when waiting for the remote Monitoring cluster to create pipelines. Those pipelines for monitoring indices previously -had no function and are now removed in 8.0.0. +had no function and are now removed. This setting will be removed in a future release. *Impact* + Discontinue the use of the `xpack.monitoring.exporters.*.index.pipeline.master_timeout` setting. diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringDeprecatedSettings.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringDeprecatedSettings.java similarity index 97% rename from x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringDeprecatedSettings.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringDeprecatedSettings.java index 3b6a5370a5151..1a467a404cf01 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringDeprecatedSettings.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringDeprecatedSettings.java @@ -5,7 +5,7 @@ * 2.0. */ -package org.elasticsearch.xpack.monitoring; +package org.elasticsearch.xpack.core.monitoring; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java index d98be7bbbb97d..c4bfdfd0bb3d6 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java @@ -34,7 +34,10 @@ private DeprecationChecks() { static List> NODE_SETTINGS_CHECKS = List.of( NodeDeprecationChecks::checkSharedDataPathSetting, NodeDeprecationChecks::checkReservedPrefixedRealmNames, - NodeDeprecationChecks::checkSingleDataNodeWatermarkSetting + NodeDeprecationChecks::checkSingleDataNodeWatermarkSetting, + NodeDeprecationChecks::checkExporterUseIngestPipelineSettings, + NodeDeprecationChecks::checkExporterPipelineMasterTimeoutSetting, + NodeDeprecationChecks::checkExporterCreateLegacyTemplateSetting ); static List> INDEX_SETTINGS_CHECKS = List.of( diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java index 6d06a61908154..86f878e62f362 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java @@ -8,21 +8,26 @@ package org.elasticsearch.xpack.deprecation; import org.elasticsearch.action.admin.cluster.node.info.PluginsAndModules; +import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; +import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.xpack.core.deprecation.DeprecationIssue; +import org.elasticsearch.xpack.core.monitoring.MonitoringDeprecatedSettings; import org.elasticsearch.xpack.core.security.authc.RealmConfig; import org.elasticsearch.xpack.core.security.authc.RealmSettings; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; import static org.elasticsearch.xpack.core.security.authc.RealmSettings.RESERVED_REALM_NAME_PREFIX; +import static org.elasticsearch.xpack.core.security.authc.saml.SamlRealmSettings.PRINCIPAL_ATTRIBUTE; public class NodeDeprecationChecks { @@ -93,4 +98,48 @@ static DeprecationIssue checkSingleDataNodeWatermarkSetting(final Settings setti return null; } + + private static DeprecationIssue deprecatedAffixSetting(Setting.AffixSetting deprecatedAffixSetting, String detailPattern, + String url, DeprecationIssue.Level warningLevel, Settings settings) { + List> deprecatedConcreteSettings = deprecatedAffixSetting.getAllConcreteSettings(settings) + .sorted(Comparator.comparing(Setting::getKey)).collect(Collectors.toList()); + + if (deprecatedConcreteSettings.isEmpty()) { + return null; + } + + final String concatSettingNames = deprecatedConcreteSettings.stream().map(Setting::getKey).collect(Collectors.joining(",")); + final String message = String.format( + Locale.ROOT, + "settings [%s] are deprecated and will be removed in a future release", + concatSettingNames + ); + final String details = String.format(Locale.ROOT, detailPattern, concatSettingNames); + + return new DeprecationIssue(warningLevel, message, url, details, false, null); + } + + static DeprecationIssue checkExporterUseIngestPipelineSettings(final Settings settings, final PluginsAndModules pluginsAndModules) { + return deprecatedAffixSetting(MonitoringDeprecatedSettings.USE_INGEST_PIPELINE_SETTING, + "Remove usage of the following properties: [%s]", + "https://ela.st/es-deprecation-7-monitoring-exporter-use-ingest-setting", + DeprecationIssue.Level.WARNING, + settings); + } + + static DeprecationIssue checkExporterPipelineMasterTimeoutSetting(final Settings settings, final PluginsAndModules pluginsAndModules) { + return deprecatedAffixSetting(MonitoringDeprecatedSettings.PIPELINE_CHECK_TIMEOUT_SETTING, + "Remove usage of the following properties: [%s]", + "https://ela.st/es-deprecation-7-monitoring-exporter-pipeline-timeout-setting", + DeprecationIssue.Level.WARNING, + settings); + } + + static DeprecationIssue checkExporterCreateLegacyTemplateSetting(final Settings settings, final PluginsAndModules pluginsAndModules) { + return deprecatedAffixSetting(MonitoringDeprecatedSettings.TEMPLATE_CREATE_LEGACY_VERSIONS_SETTING, + "Remove usage of the following properties: [%s]", + "https://ela.st/es-deprecation-7-monitoring-exporter-create-legacy-template-setting", + DeprecationIssue.Level.WARNING, + settings); + } } diff --git a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java index 83f2689abf177..991d1f50853b5 100644 --- a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java +++ b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java @@ -11,6 +11,7 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.core.TimeValue; import org.elasticsearch.env.Environment; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.core.deprecation.DeprecationIssue; @@ -138,4 +139,58 @@ public void testSingleDataNodeWatermarkSetting() { " Discontinue use of this setting.", false, null))); } + + public void testExporterUseIngestPipelineSettings() { + Settings settings = Settings.builder() + .put("xpack.monitoring.exporters.test.use_ingest", true) + .build(); + + List issues = DeprecationChecks.filterChecks(NODE_SETTINGS_CHECKS, c -> c.apply(settings, null)); + + final String expectedUrl = + "https://ela.st/es-deprecation-7-monitoring-exporter-use-ingest-setting"; + assertThat(issues, hasItem( + new DeprecationIssue(DeprecationIssue.Level.WARNING, + "settings [xpack.monitoring.exporters.test.use_ingest] are deprecated and" + + " will be removed in a future release", + expectedUrl, + "Remove usage of the following properties: [xpack.monitoring.exporters.test.use_ingest]", + false, null))); + } + + public void testExporterPipelineMasterTimeoutSetting() { + Settings settings = Settings.builder() + .put("xpack.monitoring.exporters.test.index.pipeline.master_timeout", TimeValue.timeValueSeconds(10)) + .build(); + + List issues = DeprecationChecks.filterChecks(NODE_SETTINGS_CHECKS, c -> c.apply(settings, null)); + + final String expectedUrl = + "https://ela.st/es-deprecation-7-monitoring-exporter-pipeline-timeout-setting"; + assertThat(issues, hasItem( + new DeprecationIssue(DeprecationIssue.Level.WARNING, + "settings [xpack.monitoring.exporters.test.index.pipeline.master_timeout] are deprecated and" + + " will be removed in a future release", + expectedUrl, + "Remove usage of the following properties: [xpack.monitoring.exporters.test.index.pipeline.master_timeout]", + false, null))); + } + + public void testExporterCreateLegacyTemplateSetting() { + Settings settings = Settings.builder() + .put("xpack.monitoring.exporters.test.index.template.create_legacy_templates", true) + .build(); + + List issues = DeprecationChecks.filterChecks(NODE_SETTINGS_CHECKS, c -> c.apply(settings, null)); + + final String expectedUrl = + "https://ela.st/es-deprecation-7-monitoring-exporter-create-legacy-template-setting"; + assertThat(issues, hasItem( + new DeprecationIssue(DeprecationIssue.Level.WARNING, + "settings [xpack.monitoring.exporters.test.index.template.create_legacy_templates] are deprecated and" + + " will be removed in a future release", + expectedUrl, + "Remove usage of the following properties: [xpack.monitoring.exporters.test.index.template.create_legacy_templates]", + false, null))); + } } diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java index 17efb21fb23d2..4ec2e7f9cbe52 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java @@ -35,6 +35,7 @@ import org.elasticsearch.xpack.core.XPackPlugin; import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction; import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction; +import org.elasticsearch.xpack.core.monitoring.MonitoringDeprecatedSettings; import org.elasticsearch.xpack.core.monitoring.MonitoringField; import org.elasticsearch.xpack.core.monitoring.action.MonitoringBulkAction; import org.elasticsearch.xpack.core.monitoring.action.MonitoringMigrateAlertsAction; From 1ffe262844210bb803e69c72ecc76e2f7b28e969 Mon Sep 17 00:00:00 2001 From: James Baiera Date: Wed, 6 Oct 2021 18:15:08 -0400 Subject: [PATCH 2/7] Appease the precommit beast --- .../elasticsearch/xpack/deprecation/NodeDeprecationChecks.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java index 86f878e62f362..26706c1728823 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java @@ -8,12 +8,10 @@ package org.elasticsearch.xpack.deprecation; import org.elasticsearch.action.admin.cluster.node.info.PluginsAndModules; -import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.xpack.core.deprecation.DeprecationIssue; import org.elasticsearch.xpack.core.monitoring.MonitoringDeprecatedSettings; import org.elasticsearch.xpack.core.security.authc.RealmConfig; @@ -27,7 +25,6 @@ import java.util.stream.Collectors; import static org.elasticsearch.xpack.core.security.authc.RealmSettings.RESERVED_REALM_NAME_PREFIX; -import static org.elasticsearch.xpack.core.security.authc.saml.SamlRealmSettings.PRINCIPAL_ATTRIBUTE; public class NodeDeprecationChecks { From 32606610e079728026682458b4552993d1f7e89c Mon Sep 17 00:00:00 2001 From: James Baiera Date: Thu, 7 Oct 2021 15:29:20 -0400 Subject: [PATCH 3/7] Some docs changes on PR feedback --- .../migration/migrate_8_0/monitoring.asciidoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/reference/migration/migrate_8_0/monitoring.asciidoc b/docs/reference/migration/migrate_8_0/monitoring.asciidoc index 3c40b80dd0f03..506d4f95e4e52 100644 --- a/docs/reference/migration/migrate_8_0/monitoring.asciidoc +++ b/docs/reference/migration/migrate_8_0/monitoring.asciidoc @@ -10,10 +10,10 @@ [%collapsible] ==== *Details* + -The `xpack.monitoring.exporters.*.use_ingest` property was deprecated in 7.16.0 and -has been removed. This parameter controlled the creation of pipelines for monitoring -indices. Those pipelines for monitoring indices previously -had no function and are now removed. This setting will be removed in a future release. +The `xpack.monitoring.exporters.*.use_ingest` property was deprecated in 7.16.0. This +parameter controlled the creation of pipelines for monitoring indices. Those pipelines +for monitoring indices previously had no function and are now removed. This setting will +be removed in a future release. *Impact* + Discontinue the use of the `xpack.monitoring.exporters.*.use_ingest` setting. @@ -26,7 +26,7 @@ Discontinue the use of the `xpack.monitoring.exporters.*.use_ingest` setting. The `xpack.monitoring.exporters.*.index.pipeline.master_timeout` property was deprecated in 7.16.0. This parameter set the timeout when waiting for the remote Monitoring cluster to create pipelines. Those pipelines for monitoring indices previously -had no function and are now removed. This setting will be removed in a future release. +had no function and are no longer created. This setting will be removed in a future release. *Impact* + Discontinue the use of the `xpack.monitoring.exporters.*.index.pipeline.master_timeout` setting. From a09926fc451c67f794bb48e1cee1647f43c8f802 Mon Sep 17 00:00:00 2001 From: James Baiera Date: Mon, 18 Oct 2021 15:42:27 -0400 Subject: [PATCH 4/7] Fix conflicting header sentences. --- docs/reference/migration/migrate_8_0/monitoring.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/migration/migrate_8_0/monitoring.asciidoc b/docs/reference/migration/migrate_8_0/monitoring.asciidoc index 506d4f95e4e52..d69483c292760 100644 --- a/docs/reference/migration/migrate_8_0/monitoring.asciidoc +++ b/docs/reference/migration/migrate_8_0/monitoring.asciidoc @@ -6,7 +6,7 @@ //Installation and Upgrade Guide //tag::notable-breaking-changes[] -.The `use_ingest` setting on Monitoring exporter configurations has been removed. +.The `use_ingest` setting on Monitoring exporter configurations is deprecated. [%collapsible] ==== *Details* + @@ -19,7 +19,7 @@ be removed in a future release. Discontinue the use of the `xpack.monitoring.exporters.*.use_ingest` setting. ==== -.The `index.pipeline.master_timeout` setting on Monitoring HTTP exporter configurations has been removed. +.The `index.pipeline.master_timeout` setting on Monitoring HTTP exporter configurations is deprecated. [%collapsible] ==== *Details* + @@ -32,7 +32,7 @@ had no function and are no longer created. This setting will be removed in a fut Discontinue the use of the `xpack.monitoring.exporters.*.index.pipeline.master_timeout` setting. ==== -.The `index.template.create_legacy_templates` setting on Monitoring HTTP exporter configurations has been removed. +.The `index.template.create_legacy_templates` setting on Monitoring HTTP exporter configurations is deprecated. [%collapsible] ==== *Details* + From ac9e4ad7b26e4b2d053580bc86cbcd685afb282d Mon Sep 17 00:00:00 2001 From: James Baiera Date: Mon, 18 Oct 2021 15:42:47 -0400 Subject: [PATCH 5/7] Update remediation language. --- .../xpack/deprecation/NodeDeprecationChecks.java | 6 +++--- .../xpack/deprecation/NodeDeprecationChecksTests.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java index 26706c1728823..05b02d8d88092 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java @@ -118,7 +118,7 @@ private static DeprecationIssue deprecatedAffixSetting(Setting.AffixSetting d static DeprecationIssue checkExporterUseIngestPipelineSettings(final Settings settings, final PluginsAndModules pluginsAndModules) { return deprecatedAffixSetting(MonitoringDeprecatedSettings.USE_INGEST_PIPELINE_SETTING, - "Remove usage of the following properties: [%s]", + "Remove the following settings from elasticsearch.yml: [%s]", "https://ela.st/es-deprecation-7-monitoring-exporter-use-ingest-setting", DeprecationIssue.Level.WARNING, settings); @@ -126,7 +126,7 @@ static DeprecationIssue checkExporterUseIngestPipelineSettings(final Settings se static DeprecationIssue checkExporterPipelineMasterTimeoutSetting(final Settings settings, final PluginsAndModules pluginsAndModules) { return deprecatedAffixSetting(MonitoringDeprecatedSettings.PIPELINE_CHECK_TIMEOUT_SETTING, - "Remove usage of the following properties: [%s]", + "Remove the following settings from elasticsearch.yml: [%s]", "https://ela.st/es-deprecation-7-monitoring-exporter-pipeline-timeout-setting", DeprecationIssue.Level.WARNING, settings); @@ -134,7 +134,7 @@ static DeprecationIssue checkExporterPipelineMasterTimeoutSetting(final Settings static DeprecationIssue checkExporterCreateLegacyTemplateSetting(final Settings settings, final PluginsAndModules pluginsAndModules) { return deprecatedAffixSetting(MonitoringDeprecatedSettings.TEMPLATE_CREATE_LEGACY_VERSIONS_SETTING, - "Remove usage of the following properties: [%s]", + "Remove the following settings from elasticsearch.yml: [%s]", "https://ela.st/es-deprecation-7-monitoring-exporter-create-legacy-template-setting", DeprecationIssue.Level.WARNING, settings); diff --git a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java index 991d1f50853b5..2aa5e68db1a8a 100644 --- a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java +++ b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java @@ -154,7 +154,7 @@ public void testExporterUseIngestPipelineSettings() { "settings [xpack.monitoring.exporters.test.use_ingest] are deprecated and" + " will be removed in a future release", expectedUrl, - "Remove usage of the following properties: [xpack.monitoring.exporters.test.use_ingest]", + "Remove the following settings from elasticsearch.yml: [xpack.monitoring.exporters.test.use_ingest]", false, null))); } @@ -172,7 +172,7 @@ public void testExporterPipelineMasterTimeoutSetting() { "settings [xpack.monitoring.exporters.test.index.pipeline.master_timeout] are deprecated and" + " will be removed in a future release", expectedUrl, - "Remove usage of the following properties: [xpack.monitoring.exporters.test.index.pipeline.master_timeout]", + "Remove the following settings from elasticsearch.yml: [xpack.monitoring.exporters.test.index.pipeline.master_timeout]", false, null))); } @@ -190,7 +190,8 @@ public void testExporterCreateLegacyTemplateSetting() { "settings [xpack.monitoring.exporters.test.index.template.create_legacy_templates] are deprecated and" + " will be removed in a future release", expectedUrl, - "Remove usage of the following properties: [xpack.monitoring.exporters.test.index.template.create_legacy_templates]", + "Remove the following settings from elasticsearch.yml: " + + "[xpack.monitoring.exporters.test.index.template.create_legacy_templates]", false, null))); } } From 7391233d6b8e2737f4c2c3795fa252cc82e31752 Mon Sep 17 00:00:00 2001 From: James Baiera Date: Mon, 18 Oct 2021 15:44:50 -0400 Subject: [PATCH 6/7] Update message detail wording --- .../xpack/deprecation/NodeDeprecationChecks.java | 2 +- .../xpack/deprecation/NodeDeprecationChecksTests.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java index 05b02d8d88092..d9fede7274447 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java @@ -108,7 +108,7 @@ private static DeprecationIssue deprecatedAffixSetting(Setting.AffixSetting d final String concatSettingNames = deprecatedConcreteSettings.stream().map(Setting::getKey).collect(Collectors.joining(",")); final String message = String.format( Locale.ROOT, - "settings [%s] are deprecated and will be removed in a future release", + "The [%s] settings are deprecated and will be removed after 8.0", concatSettingNames ); final String details = String.format(Locale.ROOT, detailPattern, concatSettingNames); diff --git a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java index 2aa5e68db1a8a..42088a0ba89c2 100644 --- a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java +++ b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java @@ -151,8 +151,7 @@ public void testExporterUseIngestPipelineSettings() { "https://ela.st/es-deprecation-7-monitoring-exporter-use-ingest-setting"; assertThat(issues, hasItem( new DeprecationIssue(DeprecationIssue.Level.WARNING, - "settings [xpack.monitoring.exporters.test.use_ingest] are deprecated and" + - " will be removed in a future release", + "The [xpack.monitoring.exporters.test.use_ingest] settings are deprecated and will be removed after 8.0", expectedUrl, "Remove the following settings from elasticsearch.yml: [xpack.monitoring.exporters.test.use_ingest]", false, null))); @@ -169,8 +168,7 @@ public void testExporterPipelineMasterTimeoutSetting() { "https://ela.st/es-deprecation-7-monitoring-exporter-pipeline-timeout-setting"; assertThat(issues, hasItem( new DeprecationIssue(DeprecationIssue.Level.WARNING, - "settings [xpack.monitoring.exporters.test.index.pipeline.master_timeout] are deprecated and" + - " will be removed in a future release", + "The [xpack.monitoring.exporters.test.index.pipeline.master_timeout] settings are deprecated and will be removed after 8.0", expectedUrl, "Remove the following settings from elasticsearch.yml: [xpack.monitoring.exporters.test.index.pipeline.master_timeout]", false, null))); @@ -187,8 +185,8 @@ public void testExporterCreateLegacyTemplateSetting() { "https://ela.st/es-deprecation-7-monitoring-exporter-create-legacy-template-setting"; assertThat(issues, hasItem( new DeprecationIssue(DeprecationIssue.Level.WARNING, - "settings [xpack.monitoring.exporters.test.index.template.create_legacy_templates] are deprecated and" + - " will be removed in a future release", + "The [xpack.monitoring.exporters.test.index.template.create_legacy_templates] settings are deprecated and will be " + + "removed after 8.0", expectedUrl, "Remove the following settings from elasticsearch.yml: " + "[xpack.monitoring.exporters.test.index.template.create_legacy_templates]", From 62baf3cf112f3bb3c166ab35c2b1473a1d9a5ad0 Mon Sep 17 00:00:00 2001 From: James Baiera Date: Tue, 19 Oct 2021 10:48:20 -0400 Subject: [PATCH 7/7] Remove the monitoring migration docs. --- docs/reference/migration/migrate_8_0.asciidoc | 2 - .../migration/migrate_8_0/monitoring.asciidoc | 48 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 docs/reference/migration/migrate_8_0/monitoring.asciidoc diff --git a/docs/reference/migration/migrate_8_0.asciidoc b/docs/reference/migration/migrate_8_0.asciidoc index e166a6eb83740..dad7b225b936a 100644 --- a/docs/reference/migration/migrate_8_0.asciidoc +++ b/docs/reference/migration/migrate_8_0.asciidoc @@ -25,7 +25,6 @@ coming[8.0.0] * <> * <> * <> -* <> * <> * <> * <> @@ -128,7 +127,6 @@ include::migrate_8_0/indices.asciidoc[] include::migrate_8_0/ingest.asciidoc[] include::migrate_8_0/java.asciidoc[] include::migrate_8_0/mappings.asciidoc[] -include::migrate_8_0/monitoring.asciidoc[] include::migrate_8_0/network.asciidoc[] include::migrate_8_0/node.asciidoc[] include::migrate_8_0/packaging.asciidoc[] diff --git a/docs/reference/migration/migrate_8_0/monitoring.asciidoc b/docs/reference/migration/migrate_8_0/monitoring.asciidoc deleted file mode 100644 index d69483c292760..0000000000000 --- a/docs/reference/migration/migrate_8_0/monitoring.asciidoc +++ /dev/null @@ -1,48 +0,0 @@ -[discrete] -[[breaking_80_monitoring_changes]] -=== Monitoring changes - -//NOTE: The notable-breaking-changes tagged regions are re-used in the -//Installation and Upgrade Guide - -//tag::notable-breaking-changes[] -.The `use_ingest` setting on Monitoring exporter configurations is deprecated. -[%collapsible] -==== -*Details* + -The `xpack.monitoring.exporters.*.use_ingest` property was deprecated in 7.16.0. This -parameter controlled the creation of pipelines for monitoring indices. Those pipelines -for monitoring indices previously had no function and are now removed. This setting will -be removed in a future release. - -*Impact* + -Discontinue the use of the `xpack.monitoring.exporters.*.use_ingest` setting. -==== - -.The `index.pipeline.master_timeout` setting on Monitoring HTTP exporter configurations is deprecated. -[%collapsible] -==== -*Details* + -The `xpack.monitoring.exporters.*.index.pipeline.master_timeout` property was -deprecated in 7.16.0. This parameter set the timeout when waiting for the remote -Monitoring cluster to create pipelines. Those pipelines for monitoring indices previously -had no function and are no longer created. This setting will be removed in a future release. - -*Impact* + -Discontinue the use of the `xpack.monitoring.exporters.*.index.pipeline.master_timeout` setting. -==== - -.The `index.template.create_legacy_templates` setting on Monitoring HTTP exporter configurations is deprecated. -[%collapsible] -==== -*Details* + -The `xpack.monitoring.exporters.*.index.template.create_legacy_templates` property was -deprecated in 7.16.0. This parameter instructed the exporter to install the previous version -of monitoring templates on the monitoring cluster. These older templates were meant to assist -in transitioning to the current monitoring data format. They are currently empty and are no -longer of any use. - -*Impact* + -Discontinue the use of the `xpack.monitoring.exporters.*.index.template.create_legacy_templates` setting. -==== -//end::notable-breaking-changes[]