[Monitoring] Added deprecated tag to the advanced settings for xPack:defaultAdminEmail #70280
Conversation
igoristic
added
enhancement
|
Pinging @elastic/stack-monitoring (Team:Monitoring) |
There was a problem hiding this comment.
Nice work, thanks for the quick turnaround here.
The other thing this PR needs to do is add back in the functionality lost in the 7.7 NP migration PR, specifically the logic in https://github.com/elastic/kibana/blob/7.5/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js#L21. It's been changed in 7.7: https://github.com/elastic/kibana/blob/7.7/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts#L15 in a breaking way (which was my bad there) and that needs to go back to the way it was.
There was a problem hiding this comment.
I think we also need to make changes to monitoring/deprecations.ts so the specific deprecation block looks like:
(config, fromPath, logger) => {
const clusterAlertsEnabled = get(config, 'monitoring.cluster_alerts.enabled', true);
const emailNotificationsEnabled =
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."`
);
}
return config;
},
x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
Outdated
Show resolved
Hide resolved
x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
Outdated
Show resolved
Hide resolved
| 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."` |
There was a problem hiding this comment.
We should update this to 8.0 too
|
@elasticmachine merge upstream |
💚 Build SucceededBuild metrics
History
To update your PR or re-run it, just comment with: |
…defaultAdminEmail (#70280) (#71013) * Added deprecated tag to the advanced settings * Addressed code feedback * Code feedback * Code feedback * Fixed version Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
|
Backport: |
Fixes: #25439
This PR adds deprecation tag to the Advanced Settings config option, and also indicates the change in the docs