Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(7.0) Use environment settings instead of state settings for Watcher config #41157

Merged
merged 1 commit into from
Apr 12, 2019

Conversation

dakrone
Copy link
Member

@dakrone dakrone commented Apr 12, 2019

Backport of (#41087)

  • Use environment settings instead of state settings for Watcher config

Prior to this we used the settings from cluster state to see whether ILM was
enabled of disabled, however, these settings don't accurately reflect the
xpack.ilm.enabled setting in elasticsearch.yml.

This commit changes to using the Environment settings, which correctly reflect
the ILM enabled setting.

Resolves #41042

…elastic#41087)

* Use environment settings instead of state settings for Watcher config

Prior to this we used the settings from cluster state to see whether ILM was
enabled of disabled, however, these settings don't accurately reflect the
`xpack.ilm.enabled` setting in `elasticsearch.yml`.

This commit changes to using the `Environment` settings, which correctly reflect
the ILM enabled setting.

Resolves elastic#41042

* Rename settings object to nodeSettings

* Use correct template list in WatcherRestIT

* Use correct template list in other tests
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-features

@dakrone dakrone merged commit f2c13d7 into elastic:7.0 Apr 12, 2019
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.

2 participants