Code feedback

elastic · Jul 6, 2020 · 78cd7c4 · 78cd7c4
1 parent 84628e5
commit 78cd7c4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/x-pack/plugins/monitoring/server/deprecations.ts b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -44,10 +44,13 @@ export const deprecations = ({
     ),
     renameFromRoot('xpack.monitoring', 'monitoring'),
     (config, fromPath, logger) => {
-      const clusterAlertsEnabled = get(config, 'cluster_alerts.enabled');
+      const clusterAlertsEnabled = get(config, 'monitoring.cluster_alerts.enabled', true);
       const emailNotificationsEnabled =
-        clusterAlertsEnabled && get(config, 'cluster_alerts.email_notifications.enabled');
-      if (emailNotificationsEnabled && !get(config, CLUSTER_ALERTS_ADDRESS_CONFIG_KEY)) {
+        clusterAlertsEnabled &&
+        get(config, 'monitoring.cluster_alerts.email_notifications.enabled', true);
+      const updatedKey = get(config, `monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`);
+      const legacyKey = get(config, `xpack.monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`);
+      if (emailNotificationsEnabled && !updatedKey && !legacyKey) {
         logger(
           `Config key [${fromPath}.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}] will be required for email notifications to work in 7.0."`
         );