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.

Sign up for GitHub

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

Jump to bottom

[Elastic Agent] Fix fleet-server.yml spec to not overwrite existing keys #25741

Merged
merged 3 commits into from
May 17, 2021
Merged

[Elastic Agent] Fix fleet-server.yml spec to not overwrite existing keys #25741

merged 3 commits into from
May 17, 2021

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented May 17, 2021 •
edited
Loading

What does this PR do?

Fixes issue where the inputs.0.fleet.server.* would get overwritten and no policy values under fleet.server.* would be pushed to the Fleet Server.

Why is it important?

So configuration values from the policy are actually sent to the Fleet Server process.

Checklist

  • My code follows the style guidelines of this project
  • 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 works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@blakerouse blakerouse added Team:Elastic-Agent Label for the Agent team backport-v7.13.0 Automated backport with mergify backport-v7.14.0 Automated backport with mergify labels May 17, 2021
@blakerouse blakerouse self-assigned this May 17, 2021
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels May 17, 2021
@blakerouse blakerouse marked this pull request as ready for review May 17, 2021 18:04
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 17, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #25741 updated

  • Start Time: 2021-05-17T18:52:52.281+0000

  • Duration: 87 min 41 sec

  • Commit: f98bc50

Test stats 🧪

Test Results
Failed 0
Passed 6908
Skipped 16
Total 6924

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6908
Skipped 16
Total 6924

ruflin
ruflin approved these changes May 17, 2021
View reviewed changes
Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

@blakerouse blakerouse merged commit e1676e7 into elastic:master May 17, 2021
@blakerouse blakerouse deleted the agent-fix-fleet-server-spec branch May 17, 2021 20:21
mergify bot pushed a commit that referenced this pull request May 17, 2021
@blakerouse
[Elastic Agent] Fix fleet-server.yml spec to not overwrite existing k…
c01fb39 
…eys (#25741)

* Fix fleet-server.yml spec to not overwrite exsting keys.

* Add changelog.

* Fix test.

(cherry picked from commit e1676e7)
@mergify mergify bot mentioned this pull request May 17, 2021
Merged
mergify bot pushed a commit that referenced this pull request May 17, 2021
@blakerouse
[Elastic Agent] Fix fleet-server.yml spec to not overwrite existing k…
90e289d 
…eys (#25741)

* Fix fleet-server.yml spec to not overwrite exsting keys.

* Add changelog.

* Fix test.

(cherry picked from commit e1676e7)

# Conflicts:
#	x-pack/elastic-agent/pkg/agent/program/supported.go
@mergify mergify bot mentioned this pull request May 17, 2021
Merged
blakerouse added a commit that referenced this pull request May 18, 2021
@mergify @blakerouse
[Elastic Agent] Fix fleet-server.yml spec to not overwrite existing k…
d335b03 
…eys (#25741) (#25744)

* Fix fleet-server.yml spec to not overwrite exsting keys.

* Add changelog.

* Fix test.

(cherry picked from commit e1676e7)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
ruflin pushed a commit that referenced this pull request May 18, 2021
@mergify
[7.13](backport #25741) [Elastic Agent] Fix fleet-server.yml spec to …
64ec737 
…not overwrite existing keys (#25745)

* Fix fleet-server.yml spec to not overwrite exsting keys.


(cherry picked from commit e1676e7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin approved these changes

Assignees

@blakerouse blakerouse

Labels
backport-v7.13.0 Automated backport with mergify backport-v7.14.0 Automated backport with mergify Team:Elastic-Agent Label for the Agent team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Elastic Agent] Setting fleet-server configs is not propagated properly
3 participants
@blakerouse @elasticmachine @ruflin