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

[Fleet] Fix merge config with APM change #3508

Merged
merged 3 commits into from
May 1, 2024
Merged

[Fleet] Fix merge config with APM change #3508

merged 3 commits into from
May 1, 2024

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented May 1, 2024 •
edited by juliaElastic
Loading

Description

Closes #3328

It seems we introduced a bug in #3277 where the APM instrumentation is replacing the whole input config.

That PR should fix that by changing the merge strategy.

I also added the policy id to the test to be sure we do not replace it by mistake.

Details

It seems particularly linked to that line

fleet-server/internal/pkg/server/agent.go

Line 436 in e9faff0

err = cfgData.Merge(obj, config.DefaultOptions...)
as merging default options replace the inputs ucfg.FieldReplaceValues("inputs")

@nchaulet nchaulet requested a review from a team as a code owner May 1, 2024 11:26
@nchaulet nchaulet marked this pull request as draft May 1, 2024 11:32
@nchaulet nchaulet force-pushed the test-config-change branch from b57fa3b to 528e4ae Compare May 1, 2024 11:36
@nchaulet nchaulet mentioned this pull request May 1, 2024
Closed
@nchaulet nchaulet force-pushed the test-config-change branch from 528e4ae to e9faff0 Compare May 1, 2024 12:06
@juliaElastic juliaElastic added the backport-v8.14.0 Automated backport with mergify label May 1, 2024
@nchaulet nchaulet changed the title [Fleet] Add test config change policy ID [Fleet] Fix merge config with APM change May 1, 2024
@juliaElastic juliaElastic marked this pull request as ready for review May 1, 2024 13:08
@nchaulet nchaulet self-assigned this May 1, 2024
@nchaulet nchaulet added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels May 1, 2024
@nchaulet nchaulet requested a review from michel-laterman May 1, 2024 13:29
@nchaulet nchaulet enabled auto-merge (squash) May 1, 2024 14:01
@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@nchaulet nchaulet merged commit 3fbba14 into main May 1, 2024
8 checks passed
@nchaulet nchaulet deleted the test-config-change branch May 1, 2024 14:36
mergify bot pushed a commit that referenced this pull request May 1, 2024
@nchaulet @mergify
[Fleet] Fix merge config with APM change (#3508)
cda0499 
(cherry picked from commit 3fbba14)
@mergify mergify bot mentioned this pull request May 1, 2024
Merged
juliaElastic pushed a commit that referenced this pull request May 1, 2024
@mergify @nchaulet
[Fleet] Fix merge config with APM change (#3508) (#3509)
2d4a1bc 
(cherry picked from commit 3fbba14)

Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
@cmacknz cmacknz mentioned this pull request May 2, 2024
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliaElastic juliaElastic juliaElastic approved these changes

@michel-laterman michel-laterman michel-laterman approved these changes

Assignees

@nchaulet nchaulet

Labels
backport-v8.14.0 Automated backport with mergify bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fleet-Server not starting up on 8.14-SNAPSHOT on cloud (intermittent)
3 participants
@nchaulet @michel-laterman @juliaElastic