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.

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

[8.16](backport #4057) Redact APM API key and secret token #4074

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 31, 2024

What is the problem this PR solves?

APM secrets were visible in elastic-agent diagnostics

How does this PR solve the problem?

Included APM API key and secret token to the redactServer() function so that any non-empty values are subtituted by [redacted]

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 added tests that prove my fix is effective or that my feature works

Related issues

How to test this PR

  • Spin up a 8.16.0 ESS deployment
  • Create a diagnostics archive for the agent running Fleet and APM server (the one with the Elastic Cloud policy assigned)
  • Check that in /components/fleet-server-es-containerhost/fleet-server.yml under inputs[0]/instrumentation the secret token is not shown in clear
    This is an automatic backport of pull request Redact APM API key and secret token #4057 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner October 31, 2024 09:24
@mergify mergify bot added the backport label Oct 31, 2024
@mergify mergify bot assigned pchila Oct 31, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Oct 31, 2024
@pchila pchila merged commit 6551225 into 8.16 Oct 31, 2024
8 checks passed
@pchila pchila deleted the mergify/bp/8.16/pr-4057 branch October 31, 2024 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 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.

3 participants