beater/api/mux: fix Fleet agent config enablement #5917
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If Fleet-managed, apm-server should not return 403 Forbidden just because there's no agent config. Add the "kill switch" middleware only if the server is _not_ Fleet-managed, and has no Kibana config. Extend the agent config system test to cover Fleet.
axw
force-pushed
the
thread-server-params
branch
from
a3aabef to
1e2628c
Compare
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
stuartnelson3
approved these changes
Aug 10, 2021
mergify bot
pushed a commit
that referenced
this pull request
Aug 10, 2021
* beater/api/mux: fix Fleet agent config enablement If Fleet-managed, apm-server should not return 403 Forbidden just because there's no agent config. Add the "kill switch" middleware only if the server is _not_ Fleet-managed, and has no Kibana config. Extend the agent config system test to cover Fleet. * systemtest: increase timeout for fleet (cherry picked from commit 44b684b) # Conflicts: # changelogs/head.asciidoc
axw
added a commit
that referenced
this pull request
Aug 11, 2021
…) (#5920) * beater/api/mux: fix Fleet agent config enablement (#5917) * beater/api/mux: fix Fleet agent config enablement If Fleet-managed, apm-server should not return 403 Forbidden just because there's no agent config. Add the "kill switch" middleware only if the server is _not_ Fleet-managed, and has no Kibana config. Extend the agent config system test to cover Fleet. * systemtest: increase timeout for fleet (cherry picked from commit 44b684b) # Conflicts: # changelogs/head.asciidoc * Delete head.asciidoc Co-authored-by: Andrew Wilkins <[email protected]>
|
Confirmed with BC3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
If Fleet-managed, apm-server should not return 403 Forbidden just because there's no agent config. Add the "kill switch" middleware only if the server is not Fleet-managed, and has no Kibana config. Extend the agent config system test to cover Fleet.
There is some light refactoring to inject a common
auth.Authenticatorandmodel.BatchProcessorinto both the HTTP mux and gRPC services.Checklist
- [ ] Documentation has been updatedHow to test these changes
Related issues
None.