Skip to content

Don't overwrite existing headers when mapping agentInfo headers into elasticsearch output #9199

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
Merged
merged 2 commits into from
Jul 31, 2025
Merged

Don't overwrite existing headers when mapping agentInfo headers into elasticsearch output #9199

merged 2 commits into from
Jul 31, 2025

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Jul 30, 2025 •
edited
Loading

What does this PR do?

Changes the behavior of toIntermediate to only add headers to an output if the output doesn't already have that header defined.

Why is it important?

This allows the use-case where the same header name is used for Fleet and Elasticsearch, but the value of each is different.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test (covered by unit tests)

Disruptive User Impact

None

Related issues
@blakerouse blakerouse self-assigned this Jul 30, 2025
@blakerouse blakerouse added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-9.1 Automated backport to the 9.1 branch labels Jul 30, 2025
@blakerouse blakerouse marked this pull request as ready for review July 30, 2025 20:15
@blakerouse blakerouse requested a review from a team as a code owner July 30, 2025 20:15
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)
ycombinator
ycombinator reviewed Jul 30, 2025
View reviewed changes
@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate passed Quality Gate passed

Issues
1 New issue
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
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @blakerouse
@blakerouse blakerouse merged commit d92a331 into elastic:main Jul 31, 2025
19 checks passed
@blakerouse blakerouse deleted the fix-9197 branch July 31, 2025 17:25
mergify bot pushed a commit that referenced this pull request Jul 31, 2025
@blakerouse @mergify
Don't overwrite existing headers when mapping agentInfo headers into …
84b30b2 
…elasticsearch output (#9199) * Don't overwrite existing headers. * Add changelog. (cherry picked from commit d92a331)
@mergify mergify bot mentioned this pull request Jul 31, 2025
Merged
5 tasks
blakerouse added a commit that referenced this pull request Aug 1, 2025
@mergify @blakerouse
Don't overwrite existing headers when mapping agentInfo headers into …
e0ba042 
…elasticsearch output (#9199) (#9219) * Don't overwrite existing headers. * Add changelog. (cherry picked from commit d92a331) Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-9.1 Automated backport to the 9.1 branch bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

3 participants

@blakerouse @elasticmachine @ycombinator