Skip to content

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

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

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

Conversation

@chrisronline

@chrisronline chrisronline commented Jan 15, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

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

chrisronline commented Jan 16, 2020

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@elasticmachine

elasticmachine commented Jan 16, 2020

Copy link
Copy Markdown
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

elasticmachine commented Jan 16, 2020

Copy link
Copy Markdown
Contributor

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

@chrisronline

chrisronline commented Jan 16, 2020

Copy link
Copy Markdown
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

pickypg commented Jan 16, 2020

Copy link
Copy Markdown
Member

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

joshdover
joshdover reviewed Jan 16, 2020
View reviewed changes
Comment thread src/core/server/config/deprecation/core_deprecations.ts
@chrisronline

chrisronline commented Jan 17, 2020

Copy link
Copy Markdown
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

pickypg commented Jan 17, 2020

Copy link
Copy Markdown
Member

Sold on your reasoning.

@chrisronline

chrisronline commented Jan 20, 2020

Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@elasticmachine

elasticmachine commented Jan 20, 2020

Copy link
Copy Markdown
Contributor

user doesn't have permission to update head repository

igoristic
igoristic approved these changes Jan 23, 2020
View reviewed changes

@igoristic igoristic left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good! 👍

@kibanamachine

kibanamachine commented Jan 28, 2020

Copy link
Copy Markdown
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
Backport elastic#54919 to 7.x
d0dd622
@chrisronline chrisronline mentioned this pull request Jan 28, 2020
Merged
chrisronline added a commit that referenced this pull request Jan 28, 2020
@chrisronline
Backport #54919 to 7.x (#56188)
aa2cb48
@chrisronline

chrisronline commented Jan 28, 2020

Copy link
Copy Markdown
Contributor Author

Backport:

7.x: aa2cb48

chrisronline added a commit that referenced this pull request Jan 28, 2020
@chrisronline
Revert "[Monitoring] Change all configs to monitoring.* (#54919)"
807e871 
This reverts commit 04ad88c.
This was referenced Jan 28, 2020
Merged
Merged
brianseeders added a commit that referenced this pull request Jan 28, 2020
@brianseeders
Revert "Backport #54919 to 7.x (#56188)"
2d70efd 
This reverts commit aa2cb48.
This was referenced Mar 3, 2020
Closed
Merged
patrykkopycinski pushed a commit to patrykkopycinski/kibana that referenced this pull request May 6, 2026
@chrisronline
[Monitoring] Change all configs to monitoring.* (elastic#54919)
498ca31 
* Initial config renaming - not working

* Tweak config key names and move to core_deprecations

* Remove new ones from this PR

* Fix mocha tests

* Update more configs

* Update config in test

* Add note to move these

* Missed one

* Fix mocha tests

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

Reviewers

2 more reviewers
@joshdover joshdover joshdover approved these changes
@igoristic igoristic igoristic approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@chrisronline chrisronline

Labels

release_note:deprecation review Team:Monitoring Stack Monitoring team v7.7.0 v8.0.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@chrisronline @elasticmachine @pickypg @kibanamachine @joshdover @igoristic