Skip to content

[Monitoring] Change all configs to monitoring.*#54919

Merged
chrisronline merged 14 commits intoelastic:masterfrom
chrisronline:monitoring/config_changes
Jan 28, 2020
Merged

[Monitoring] Change all configs to monitoring.*#54919
chrisronline merged 14 commits intoelastic:masterfrom
chrisronline:monitoring/config_changes

Conversation

@chrisronline
Copy link
Contributor

@chrisronline chrisronline commented Jan 15, 2020

Relates to #52639

This PR is the first step in supporting the new monitoring.* config settings, which will allow users to ship monitoring data directly to the monitoring cluster.

Due to limitations in the platform, the monitoring plugin can only support a single configPrefix, which currently is xpack.monitoring.*. If we want to support monitoring.* config settings in Kibana, we need to change the configPrefix for monitoring to monitoring.*, but we need to also migrate all the existing configs to use this new configPrefix.

This PR does that and also changes some of the hierarchy for the configs.

Below is a table of the changes:

Current New
xpack.monitoring.ui.enabled monitoring.ui.enabled
xpack.monitoring.max_bucket_size monitoring.ui.max_bucket_size
xpack.monitoring.min_interval_seconds monitoring.ui.min_interval_seconds
xpack.monitoring.show_license_expiration monitoring.ui.show_license_expiration
xpack.monitoring.ui.container.elasticsearch.enabled monitoring.ui.container.elasticsearch.enabled
xpack.monitoring.ui.container.logstash.enabled monitoring.ui.container.logstash.enabled
xpack.monitoring.elasticsearch.hosts monitoring.ui.elasticsearch.hosts
xpack.monitoring.elasticsearch.username monitoring.ui.elasticsearch.username
xpack.monitoring.elasticsearch.password monitoring.ui.elasticsearch.password
xpack.monitoring.ccs.enabled monitoring.ui.ccs.enabled
xpack.monitoring.elasticsearch.logFetchCount monitoring.ui.elasticsearch.logFetchCount
xpack.monitoring.kibana.collection.enabled monitoring.kibana.collection.enabled
xpack.monitoring.kibana.collection.interval monitoring.kibana.collection.interval
xpack.monitoring.xpack_api_polling_frequency_millis monitoring.xpack_api_polling_frequency_millis
xpack.monitoring.cluster_alerts.email_notifications.enabled monitoring.cluster_alerts.email_notifications.enabled
xpack.monitoring.cluster_alerts.email_notifications.email_address monitoring.cluster_alerts.email_notifications.email_address
xpack.monitoring.tests.cloud_detector.enabled monitoring.tests.cloud_detector.enabled

Note that both sets of configs will work after this PR - there is no breaking change here

@chrisronline chrisronline changed the title [Monitoring] monitoring.* configs for shipping directly to the monitoring cluster [Monitoring] Change all configs to monitoring.* Jan 15, 2020
@chrisronline
Copy link
Contributor Author

@elasticmachine merge upstream

@elasticmachine
Copy link
Contributor

user doesn't have permission to update head repository

@chrisronline chrisronline marked this pull request as ready for review January 16, 2020 18:21
@chrisronline chrisronline requested a review from a team as a code owner January 16, 2020 18:21
@chrisronline chrisronline self-assigned this Jan 16, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/stack-monitoring (Team:Monitoring)

@chrisronline
Copy link
Contributor Author

cc @pickypg @ycombinator This is safe to release in a minor (as there is not a breaking change) but just want to validate the name changes if either of you have a chance to check it out

@pickypg
Copy link
Member

pickypg commented Jan 16, 2020

@chrisronline I wonder if maybe stackMonitoring is better now, but it's also so long and awkward to type.

@chrisronline
Copy link
Contributor Author

@pickypg That change would need to be consistent across the other stack products too, and it would mean changing the current beats config names (which have been available since 7.2 I think). I'm not necessarily opposed, but I'm not sure there is enough value.

@pickypg
Copy link
Member

pickypg commented Jan 17, 2020

Sold on your reasoning.

@chrisronline
Copy link
Contributor Author

@elasticmachine merge upstream

@elasticmachine
Copy link
Contributor

user doesn't have permission to update head repository

Copy link
Contributor

@igoristic igoristic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! 👍

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@chrisronline chrisronline merged commit 04ad88c into elastic:master Jan 28, 2020
@chrisronline chrisronline deleted the monitoring/config_changes branch January 28, 2020 16:38
chrisronline added a commit to chrisronline/kibana that referenced this pull request Jan 28, 2020
chrisronline added a commit that referenced this pull request Jan 28, 2020
@chrisronline
Copy link
Contributor Author

Backport:

7.x: aa2cb48

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants