[7.x] beater: run gmuxed gRPC server by default (#4618)#4784
Merged
axw merged 2 commits intoelastic:7.xfrom Feb 18, 2021
Merged
[7.x] beater: run gmuxed gRPC server by default (#4618)#4784axw merged 2 commits intoelastic:7.xfrom
axw merged 2 commits intoelastic:7.xfrom
Conversation
* beater: run gmuxed gRPC server by default Use gmux to run a gRPC server on the same port as the Elastic APM HTTP server, and register the Jaeger services by default. When auth is enabled, it is necessary to configure Jaeger to send an agent tag called "elastic-apm-auth". This cannot be changed. * systemtest/apmservertest: add TLS support Self-signed certificate and key copied from https://github.com/golang/go/blob/master/src/net/http/internal/testcert.go * systemtest: add test for muxed Jaeger+TLS * beater/jaeger: fix comment * beater/jager: add deprecation notice * Add changelog entry * jaeger config will be removed in 8.0 * Add "Deprecated" changelog entry # Conflicts: # NOTICE.txt # changelogs/head.asciidoc
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪Steps errors
Expand to view the steps failures
|
Codecov Report
@@ Coverage Diff @@
## 7.x #4784 +/- ##
==========================================
- Coverage 75.79% 75.77% -0.02%
==========================================
Files 162 162
Lines 9832 9863 +31
==========================================
+ Hits 7452 7474 +22
- Misses 2380 2389 +9
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backports the following commits to 7.x: