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

Use environment settings instead of state settings for Watcher config #41087

Merged
merged 5 commits into from
Apr 12, 2019

Conversation

dakrone
Copy link
Member

@dakrone dakrone commented Apr 10, 2019

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

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
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-features

Copy link
Contributor

@gwbrown gwbrown left a comment

Choose a reason for hiding this comment

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

Left one comment about variable naming, otherwise LGTM - I also tested manually to make sure it works as intended, and I can confirm that the correct template gets added.

@gwbrown
Copy link
Contributor

gwbrown commented Apr 11, 2019

@elasticmachine run elasticsearch-ci/packaging-sample

Edit: looks like a transient network failure

@dakrone dakrone merged commit 2106c8a into elastic:master Apr 12, 2019
dakrone added a commit to dakrone/elasticsearch that referenced this pull request Apr 12, 2019
…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
dakrone added a commit to dakrone/elasticsearch that referenced this pull request Apr 12, 2019
…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
@dakrone dakrone removed the v6.7.2 label Apr 12, 2019
@dakrone dakrone deleted the use-correct-watcher-settings branch April 12, 2019 15:59
dakrone added a commit that referenced this pull request Apr 12, 2019
…config (#41157)

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
dakrone added a commit that referenced this pull request Apr 12, 2019
…config (#41158)

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
gurkankaymak pushed a commit to gurkankaymak/elasticsearch that referenced this pull request May 27, 2019
…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
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.

Watcher attempts to use ILM when ILM is disabled
4 participants