Add experimental flag to Jaeger integration (elastic#3121)

simitt · Jan 14, 2020 · 9e8b11d · 9e8b11d
1 parent a16d9be
commit 9e8b11d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/_meta/beat.yml b/_meta/beat.yml
@@ -397,8 +397,10 @@ apm-server:
 
 
 
-  #---------------------------- APM Server - Open Telemetry Collector integration ----------------------------
+  #---------------------------- APM Server - Experimental Jaeger integration ----------------------------
 
+  # When enabling Jaeger integration, APM Server acts as Jaeger collector. It supports jaeger.thrift over HTTP
+  # and gRPC. This is an experimental feature, use with care.
   #jaeger:
     #grpc:
       # Set to true to enable the Jaeger gRPC collector service.

diff --git a/apm-server.docker.yml b/apm-server.docker.yml
@@ -397,8 +397,10 @@ apm-server:
 
 
 
-  #---------------------------- APM Server - Open Telemetry Collector integration ----------------------------
+  #---------------------------- APM Server - Experimental Jaeger integration ----------------------------
 
+  # When enabling Jaeger integration, APM Server acts as Jaeger collector. It supports jaeger.thrift over HTTP
+  # and gRPC. This is an experimental feature, use with care.
   #jaeger:
     #grpc:
       # Set to true to enable the Jaeger gRPC collector service.

diff --git a/apm-server.yml b/apm-server.yml
@@ -397,8 +397,10 @@ apm-server:
 
 
 
-  #---------------------------- APM Server - Open Telemetry Collector integration ----------------------------
+  #---------------------------- APM Server - Experimental Jaeger integration ----------------------------
 
+  # When enabling Jaeger integration, APM Server acts as Jaeger collector. It supports jaeger.thrift over HTTP
+  # and gRPC. This is an experimental feature, use with care.
   #jaeger:
     #grpc:
       # Set to true to enable the Jaeger gRPC collector service.