From b409027963d8c63ef41629268615009f041e138d Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Mon, 18 Oct 2021 09:26:11 -0400
Subject: [PATCH] Add deprecation levels for other config deprecations

Note: I skipped `xpack.security.enabled`, `xpack.spaces.enabled`, and
the legacy audit logger because those are being removed in 8.0 / they
have their own 7.x-specific PRs to make those changes.
---
 .../security/server/config_deprecations.ts    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index 538bbc3d63118..0c76840819b3d 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -13,22 +13,23 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   renameFromRoot,
   unused,
 }) => [
-  rename('sessionTimeout', 'session.idleTimeout'),
-  rename('authProviders', 'authc.providers'),
+  rename('sessionTimeout', 'session.idleTimeout', { level: 'warning' }),
+  rename('authProviders', 'authc.providers', { level: 'warning' }),
 
-  rename('audit.appender.kind', 'audit.appender.type'),
-  rename('audit.appender.layout.kind', 'audit.appender.layout.type'),
-  rename('audit.appender.policy.kind', 'audit.appender.policy.type'),
-  rename('audit.appender.strategy.kind', 'audit.appender.strategy.type'),
-  rename('audit.appender.path', 'audit.appender.fileName'),
+  rename('audit.appender.kind', 'audit.appender.type', { level: 'warning' }),
+  rename('audit.appender.layout.kind', 'audit.appender.layout.type', { level: 'warning' }),
+  rename('audit.appender.policy.kind', 'audit.appender.policy.type', { level: 'warning' }),
+  rename('audit.appender.strategy.kind', 'audit.appender.strategy.type', { level: 'warning' }),
+  rename('audit.appender.path', 'audit.appender.fileName', { level: 'warning' }),
 
   renameFromRoot(
     'security.showInsecureClusterWarning',
-    'xpack.security.showInsecureClusterWarning'
+    'xpack.security.showInsecureClusterWarning',
+    { level: 'warning' }
   ),
 
-  unused('authorization.legacyFallback.enabled'),
-  unused('authc.saml.maxRedirectURLSize'),
+  unused('authorization.legacyFallback.enabled', { level: 'warning' }),
+  unused('authc.saml.maxRedirectURLSize', { level: 'warning' }),
   // Deprecation warning for the legacy audit logger.
   (settings, fromPath, addDeprecation, { branch }) => {
     const auditLoggingEnabled = settings?.xpack?.security?.audit?.enabled ?? false;