Cherry-pick #20026 to 7.x: [Elastic Agent] Fix merging of fleet.yml. Add --staging to enroll cmd.#20031
Merged
blakerouse merged 1 commit intoelastic:7.xfrom Jul 17, 2020
Merged
Conversation
elastic#20026) * Fix usage of merged elastic-agent.yml and fleet.yml. Add --staging command line option to enroll. * Add to docs. * Add changelog. * Fix import sorting. (cherry picked from commit cfbd81b)
Contributor
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
kaiyan-sheng
approved these changes
Jul 17, 2020
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 #20026 to 7.x branch. Original message:
What does this PR do?
Fixes an issue where the
elastic-agent.ymlandfleet.ymlconfigurations where being merged, but the merged config was not being used in theUnpackcall.Adds a
--staging f32a4a89option to./elastic-agent enroll. This allows users that are testing staging builds to be able to pull artifacts from that staging build.Why is it important?
So
elastic-agent.ymlandfleet.ymlare merged and used correctly. To simplify testing of staging builds.Checklist
[ ] 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.How to test this PR locally
Related issues