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

Consume APMConfig from input units in agent mode #3277

Merged
merged 4 commits into from
Feb 14, 2024

Conversation

michel-laterman
Copy link
Contributor

What is the problem this PR solves?

elastic-agent-client is now able to send APMConfig settings separately from expected config (similar to how the log level can be separated), but fleet-server is unable to use these settings.

How does this PR solve the problem?

Consume and prefer APMConfig from the expected input component while operating in agent mode over config in inputs[0].server.instrumentation.

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

Consume and prefer APMConfig from the expected input component while
operating in agent mode over config in inputs[0].server.instrumentation.
@michel-laterman michel-laterman requested a review from a team as a code owner February 13, 2024 19:49
@michel-laterman michel-laterman added enhancement New feature or request Team:Fleet Label for the Fleet team labels Feb 13, 2024
Copy link
Contributor

@juliaElastic juliaElastic left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@michel-laterman michel-laterman merged commit d16a665 into elastic:main Feb 14, 2024
8 checks passed
@michel-laterman michel-laterman deleted the prefer-protocol-apm branch February 14, 2024 21:27
jlind23 added a commit that referenced this pull request Feb 21, 2024
…SNAPSHOT (#3285)

* Consume APMConfig from input units in agent mode (#3277)

* Consume APMConfig from input units in agent mode

Consume and prefer APMConfig from the expected input component while
operating in agent mode over config in inputs[0].server.instrumentation.

---------

Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>

* [Release] update version (#3280)

Co-authored-by: Julien Lind <julien.lind@elastic.co>

* chore: Update snapshot.yml

Made with ❤️️ by updatecli

---------

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Julien Lind <julien.lind@elastic.co>
Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Team:Fleet Label for the Fleet team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consume APM configuration over the control protocol
2 participants