Skip to content

[9.2](backport #6419) Implement OTEL secrets replacement in parsed policy#6469

Open
mergify[bot] wants to merge 2 commits into9.2from
mergify/bp/9.2/pr-6419
Open

[9.2](backport #6419) Implement OTEL secrets replacement in parsed policy#6469
mergify[bot] wants to merge 2 commits into9.2from
mergify/bp/9.2/pr-6419

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 2, 2026

What is the problem this PR solves?

Added functionality to replace secrets in OTEL sections (receivers, exporters, processors, extensions, connectors) of a policy. Updated the NewParsedPolicy function to process these sections and append identified secret keys. Included a new test case to validate the correct replacement of secrets in the OTEL sections.

How does this PR solve the problem?

Add a call to the existing ProcessMapSecrets method for OTEL keys in the policy.

Design Checklist

  • I have ensured my design is stateless and will work when multiple fleet-server instances are behind a load balancer.
  • I have or intend to scale test my changes, ensuring it will work reliably with 100K+ agents connected.
  • I have included fail safe mechanisms to limit the load on fleet-server: rate limiting, circuit breakers, caching, load shedding, etc.

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 works
  • I have added an entry in ./changelog/fragments using the changelog tool

Related issues


This is an automatic backport of pull request #6419 done by [Mergify](https://mergify.com).

Added functionality to replace secrets in OTEL sections (receivers, exporters,
processors, extensions, connectors) of a policy. Updated the `NewParsedPolicy`
function to process these sections and append identified secret keys. Included a
new test case to validate the correct replacement of secrets in the OTEL
sections.

(cherry picked from commit 9df10d4)

# Conflicts:
#	internal/pkg/policy/parsed_policy.go
#	internal/pkg/policy/parsed_policy_test.go
@mergify mergify bot requested a review from a team as a code owner March 2, 2026 18:59
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 2, 2026
@mergify mergify bot requested review from blakerouse and ycombinator March 2, 2026 18:59
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 2, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Mar 2, 2026

Cherry-pick of 9df10d4 has failed:

On branch mergify/bp/9.2/pr-6419
Your branch is up to date with 'origin/9.2'.

You are currently cherry-picking commit 9df10d4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1771972977-Add-support-for-OTEL-secrets-handling.yaml
	new file:   internal/pkg/policy/testdata/policy_with_otel_secrets.json
	new file:   internal/pkg/server/otel_policy_secrets_integration_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/policy/parsed_policy.go
	both modified:   internal/pkg/policy/parsed_policy_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Mar 2, 2026
@michel-laterman
Copy link
Contributor

@ycombinator I think we need to backport #5852 in order to get support for 9.2.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bug Something isn't working conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant