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

Add additional config remapping for "api_key" and "secret_token" for libbeat instrumentation wrapper #13691

Merged
merged 6 commits into from
Jul 15, 2024

Conversation

1pkg
Copy link
Member

@1pkg 1pkg commented Jul 12, 2024

Motivation/summary

This PR addresses the issue by updating existing wrapper around libbeat instrumentation to additionally propagate erased tracer config keys "api_key" and "secret_token" from elastic agent via environmental variables.

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Follow instructions in Building an Elastic Agent container image with a locally built APM Server and Running an Elastic Agent container with a locally built APM Server section in TESTING.md, update the relevant agent.monitoring section with "api_key" or "secret_token" in elastic-agent.yml to verify that tracing authentication works correctly.

Related issues

#13690
#13597

@1pkg 1pkg added the backport-8.15 Automated backport with mergify label Jul 12, 2024
@1pkg 1pkg self-assigned this Jul 12, 2024
@1pkg 1pkg requested a review from a team as a code owner July 12, 2024 18:43
Copy link
Contributor

@marclop marclop left a comment

Choose a reason for hiding this comment

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

Thanks!

@1pkg 1pkg merged commit 17fab5c into main Jul 15, 2024
14 checks passed
@1pkg 1pkg deleted the fix-auth-apm-tracer-config-from-elastic-agent branch July 15, 2024 16:31
mergify bot pushed a commit that referenced this pull request Jul 15, 2024
… for libbeat instrumentation wrapper (#13691)

Add additional config remapping for "api_key" and "secret_token" for libbeat instrumentation wrapper.

(cherry picked from commit 17fab5c)
mergify bot added a commit that referenced this pull request Jul 15, 2024
… for libbeat instrumentation wrapper (#13691) (#13699)

Add additional config remapping for "api_key" and "secret_token" for libbeat instrumentation wrapper.

(cherry picked from commit 17fab5c)

Co-authored-by: Kostiantyn Masliuk <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@1pkg 1pkg mentioned this pull request Jul 15, 2024
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.15 Automated backport with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants