Reduce deprecation logging severity for settings that are not removed in 8.0 (#79665)

This commit lowers the severity for all settings from critical to warning
for all settings that are still present in 8.0.0.

releated #79107

Author: jakelandis

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationKeys.java

@@ -57,7 +57,7 @@ public class SslConfigurationKeys {
     public static final String TRUSTSTORE_SECURE_PASSWORD = "truststore.secure_password";
     /**
      * The password for the file configured in {@link #TRUSTSTORE_PATH}, as a non-secure setting.
-     * The use of this setting {@link #isDeprecated(String) is deprecated}.
+     * The use of this setting {@link #isDeprecatedWarning(String) is deprecated}.
      */
     public static final String TRUSTSTORE_LEGACY_PASSWORD = "truststore.password";
     /**
@@ -82,7 +82,7 @@ public class SslConfigurationKeys {
     public static final String KEYSTORE_SECURE_PASSWORD = "keystore.secure_password";
     /**
      * The password for the file configured in {@link #KEYSTORE_PATH}, as a non-secure setting.
-     * The use of this setting {@link #isDeprecated(String) is deprecated}.
+     * The use of this setting {@link #isDeprecatedWarning(String) is deprecated}.
      */
     public static final String KEYSTORE_LEGACY_PASSWORD = "keystore.password";
     /**
@@ -92,7 +92,7 @@ public class SslConfigurationKeys {
     public static final String KEYSTORE_SECURE_KEY_PASSWORD = "keystore.secure_key_password";
     /**
      * The password for the key within the {@link #KEYSTORE_PATH configured keystore}, as a non-secure setting.
-     * The use of this setting {@link #isDeprecated(String) is deprecated}.
+     * The use of this setting {@link #isDeprecatedWarning(String) is deprecated}.
      * If no key password is specified, it will default to the keystore password.
      */
     public static final String KEYSTORE_LEGACY_KEY_PASSWORD = "keystore.key_password";
@@ -121,11 +121,14 @@ public class SslConfigurationKeys {
     public static final String KEY_SECURE_PASSPHRASE = "secure_key_passphrase";
     /**
      * The password to read the configured {@link #KEY}, as a non-secure setting.
-     * The use of this setting {@link #isDeprecated(String) is deprecated}.
+     * The use of this setting {@link #isDeprecatedWarning(String) is deprecated}.
      */
     public static final String KEY_LEGACY_PASSPHRASE = "key_passphrase";
 
-    private static final Set<String> DEPRECATED_KEYS = new HashSet<>(
+    /**
+     * Warning severity deprecated keys
+     */
+    private static final Set<String> DEPRECATED_WARNING_KEYS = new HashSet<>(
         Arrays.asList(TRUSTSTORE_LEGACY_PASSWORD, KEYSTORE_LEGACY_PASSWORD, KEYSTORE_LEGACY_KEY_PASSWORD, KEY_LEGACY_PASSPHRASE)
     );
 
@@ -161,10 +164,10 @@ public static List<String> getSecureStringKeys() {
     }
 
     /**
-     * @return {@code true} if the provided key is a deprecated setting
+     * @return {@code true} if the provided key is a deprecated setting at warning severity
      */
-    public static boolean isDeprecated(String key) {
-        return DEPRECATED_KEYS.contains(key);
+    public static boolean isDeprecatedWarning(String key) {
+        return DEPRECATED_WARNING_KEYS.contains(key);
     }
 
 }

modules/reindex/src/main/java/org/elasticsearch/reindex/ReindexSslConfig.java

@@ -50,16 +50,16 @@ public class ReindexSslConfig {
 
     static {
         Setting.Property[] defaultProperties = new Setting.Property[] { Setting.Property.NodeScope, Setting.Property.Filtered };
-        Setting.Property[] deprecatedProperties = new Setting.Property[] { Setting.Property.Deprecated, Setting.Property.NodeScope,
+        Setting.Property[] deprecatedProperties = new Setting.Property[] { Setting.Property.DeprecatedWarning, Setting.Property.NodeScope,
             Setting.Property.Filtered };
         for (String key : SslConfigurationKeys.getStringKeys()) {
             String settingName = "reindex.ssl." + key;
-            final Setting.Property[] properties = SslConfigurationKeys.isDeprecated(key) ? deprecatedProperties : defaultProperties;
+            final Setting.Property[] properties = SslConfigurationKeys.isDeprecatedWarning(key) ? deprecatedProperties : defaultProperties;
             SETTINGS.put(settingName, simpleString(settingName, properties));
         }
         for (String key : SslConfigurationKeys.getListKeys()) {
             String settingName = "reindex.ssl." + key;
-            final Setting.Property[] properties = SslConfigurationKeys.isDeprecated(key) ? deprecatedProperties : defaultProperties;
+            final Setting.Property[] properties = SslConfigurationKeys.isDeprecatedWarning(key) ? deprecatedProperties : defaultProperties;
             SETTINGS.put(settingName, listSetting(settingName, Collections.emptyList(), Function.identity(), properties));
         }
         for (String key : SslConfigurationKeys.getSecureStringKeys()) {

server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java

@@ -23,7 +23,7 @@ private BootstrapSettings() {
     public static final Setting<Boolean> MEMORY_LOCK_SETTING =
         Setting.boolSetting("bootstrap.memory_lock", false, Property.NodeScope);
     public static final Setting<Boolean> SYSTEM_CALL_FILTER_SETTING =
-        Setting.boolSetting("bootstrap.system_call_filter", true, Property.Deprecated, Property.NodeScope);
+        Setting.boolSetting("bootstrap.system_call_filter", true, Property.DeprecatedWarning, Property.NodeScope);
     public static final Setting<Boolean> CTRLHANDLER_SETTING =
         Setting.boolSetting("bootstrap.ctrlhandler", true, Property.NodeScope);
 

server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java

@@ -287,7 +287,7 @@ public static APIBlock readFrom(StreamInput input) throws IOException {
     public static final String SETTING_HISTORY_UUID = "index.history.uuid";
     public static final String SETTING_DATA_PATH = "index.data_path";
     public static final Setting<String> INDEX_DATA_PATH_SETTING =
-        new Setting<>(SETTING_DATA_PATH, "", Function.identity(), Property.IndexScope, Property.Deprecated);
+        new Setting<>(SETTING_DATA_PATH, "", Function.identity(), Property.IndexScope, Property.DeprecatedWarning);
     public static final String INDEX_UUID_NA_VALUE = "_na_";
 
     public static final String INDEX_ROUTING_REQUIRE_GROUP_PREFIX = "index.routing.allocation.require";

server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java

@@ -26,7 +26,8 @@ public abstract class SecureSetting<T> extends Setting<T> {
     /** Determines whether legacy settings with sensitive values should be allowed. */
     private static final boolean ALLOW_INSECURE_SETTINGS = Booleans.parseBoolean(System.getProperty("es.allow_insecure_settings", "false"));
 
-    private static final Set<Property> ALLOWED_PROPERTIES = EnumSet.of(Property.Deprecated, Property.Consistent);
+    private static final Set<Property> ALLOWED_PROPERTIES = EnumSet.of(Property.Deprecated, Property.DeprecatedWarning,
+        Property.Consistent);
 
     private static final Property[] FIXED_PROPERTIES = {
         Property.NodeScope

server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java

@@ -221,7 +221,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp
     public static final Setting<Boolean> CACHE_REPOSITORY_DATA = Setting.boolSetting(
         "cache_repository_data",
         true,
-        Setting.Property.Deprecated
+        Setting.Property.DeprecatedWarning
     );
 
     /**

server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java

@@ -8,6 +8,7 @@
 
 package org.elasticsearch.bootstrap;
 
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.util.Constants;
 import org.elasticsearch.cluster.coordination.ClusterBootstrapService;
@@ -438,15 +439,15 @@ boolean isSystemCallFilterInstalled() {
             containsString("system call filters failed to install; " +
                 "check the logs and fix your configuration or disable system call filters at your own risk"));
         if (useBootstrapSystemCallFilter) {
-            assertWarnings("[bootstrap.system_call_filter] setting was deprecated in Elasticsearch " +
+            assertWarnings(Level.WARN, "[bootstrap.system_call_filter] setting was deprecated in Elasticsearch " +
                 "and will be removed in a future release!" +
                 " See the breaking changes documentation for the next major version.");
         }
 
         isSystemCallFilterInstalled.set(true);
         BootstrapChecks.check(context, true, Collections.singletonList(systemCallFilterEnabledCheck));
         if (useBootstrapSystemCallFilter) {
-            assertWarnings("[bootstrap.system_call_filter] setting was deprecated in Elasticsearch " +
+            assertWarnings(Level.WARN, "[bootstrap.system_call_filter] setting was deprecated in Elasticsearch " +
                 "and will be removed in a future release!" +
                 " See the breaking changes documentation for the next major version.");
         }
@@ -460,11 +461,13 @@ boolean isSystemCallFilterInstalled() {
         };
         isSystemCallFilterInstalled.set(false);
         BootstrapChecks.check(context_1, true, Collections.singletonList(systemCallFilterNotEnabledCheck));
-        assertWarnings("[bootstrap.system_call_filter] setting was deprecated in Elasticsearch and will be removed in a future release!" +
+        assertWarnings(Level.WARN, "[bootstrap.system_call_filter] setting was deprecated in Elasticsearch and will be removed in a " +
+            "future release!" +
                 " See the breaking changes documentation for the next major version.");
         isSystemCallFilterInstalled.set(true);
         BootstrapChecks.check(context_1, true, Collections.singletonList(systemCallFilterNotEnabledCheck));
-        assertWarnings("[bootstrap.system_call_filter] setting was deprecated in Elasticsearch and will be removed in a future release!" +
+        assertWarnings(Level.WARN, "[bootstrap.system_call_filter] setting was deprecated in Elasticsearch and will be removed in a " +
+            "future release!" +
                 " See the breaking changes documentation for the next major version.");
     }
 

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

@@ -468,6 +468,15 @@ protected final void assertSettingDeprecationsAndWarnings(final Setting<?>[] set
                 .toArray(DeprecationWarning[]::new));
     }
 
+    /**
+     * Convenience method to assert warnings at a specific level for settings deprecations and general deprecation warnings.
+     * @param expectedWarnings expected general deprecation warnings.
+     */
+    protected final void assertWarnings(Level level, String... expectedWarnings) {
+        assertWarnings(true, Arrays.stream(expectedWarnings).map(expectedWarning -> new DeprecationWarning(level,
+            expectedWarning)).toArray(DeprecationWarning[]::new));
+    }
+
     /**
      * Convenience method to assert warnings for settings deprecations and general deprecation warnings. All warnings passed to this method
      * are assumed to be at DeprecationLogger.CRITICAL level.

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/monitoring/collector/ccr/StatsCollectorTests.java

@@ -6,6 +6,7 @@
  */
 package org.elasticsearch.xpack.monitoring.collector.ccr;
 
+import org.apache.logging.log4j.Level;
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.service.ClusterService;
@@ -150,8 +151,8 @@ public void testDoCollect() throws Exception {
         assertThat(document.getId(), nullValue());
         assertThat(document.stats(), is(autoFollowStats));
 
-        assertWarnings("[xpack.monitoring.collection.ccr.stats.timeout] setting was deprecated in Elasticsearch and will be removed in " +
-            "a future release! See the breaking changes documentation for the next major version.");
+        assertWarnings(Level.WARN, "[xpack.monitoring.collection.ccr.stats.timeout] setting was deprecated in Elasticsearch and will " +
+            "be removed in a future release! See the breaking changes documentation for the next major version.");
     }
 
     private List<FollowStatsAction.StatsResponse> mockStatuses() {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecycleSettings.java

@@ -49,7 +49,7 @@ public class LifecycleSettings {
         true, Setting.Property.NodeScope);
     public static final Setting<TimeValue> LIFECYCLE_STEP_MASTER_TIMEOUT_SETTING =
         Setting.positiveTimeSetting(LIFECYCLE_STEP_MASTER_TIMEOUT, TimeValue.timeValueSeconds(30), Setting.Property.Dynamic,
-            Setting.Property.NodeScope, Setting.Property.Deprecated);
+            Setting.Property.NodeScope, Setting.Property.DeprecatedWarning);
     // This setting configures how much time since step_time should ILM wait for a condition to be met. After the threshold wait time has
     // elapsed ILM will likely stop waiting and go to the next step.
     // Also see {@link org.elasticsearch.xpack.core.ilm.ClusterStateWaitUntilThresholdStep}