Cherry-pick #23973 to 7.x: Fix: select default agent policy if no enrollment token provided#24001
Merged
mtojek merged 2 commits intoelastic:7.xfrom Feb 15, 2021
Merged
Conversation
Contributor
|
Pinging @elastic/agent (Team:Agent) |
Contributor
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
…stic#23973) * Fix: select default agent policy if no enrollment token provided * Update CHANGELOG (cherry picked from commit e3da3be)
9111e3c to
a6e6ce4
Compare
10 tasks
Contributor
Author
|
/test |
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
Contributor
Author
|
/packaging |
1 similar comment
Contributor
Author
|
/packaging |
Contributor
Author
|
/test |
4424b08 to
6810c9d
Compare
michalpristas
approved these changes
Feb 15, 2021
Contributor
michalpristas
left a comment
There was a problem hiding this comment.
backport looks good
Contributor
Author
|
E2E errors don't seem to be related. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #23973 to 7.x branch. Original message:
What does this PR do?
This PR fixes the non-determinism in agent's policy selection. With this bugfix, the agent will always enroll using the default policy unless the custom enrollment token is selected.
Why is it important?
Currently the enrollment script (Docker) selects the newest policy. It may happen that the selected policy is not active or it is not intended to be used.
Checklist
- [ ] I have commented my code, particularly in hard-to-understand areas- [ ] I have made corresponding changes to the documentation- [ ] I have made corresponding change to the default configuration files- [ ] I have added tests that prove my fix is effective or that my feature worksCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Author's Checklist
How to test this PR locally
Expected:
3. Elastic Agent should be started with Default policy, not the newest one (just added).
Related issues
Use cases
Screenshots
Logs