Update examples and configs OTLP ports (#1294)

* Update examples and configs OTLP ports OTLP listening port was changed from 55680/55681 to 4317/4318. * Update kube-manifests * Add changelog entry
grafana · Feb 21, 2022 · 81f1898 · 81f1898
1 parent 3a530e1
commit 81f1898
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * [ENHANCEMENT] Add new scaling alerts to the tempo-mixin [#1292](https://github.com/grafana/tempo/pull/1292) (@mapno)
 * [BUGFIX]: Remove unnecessary PersistentVolumeClaim [#1245](https://github.com/grafana/tempo/issues/1245)
 * [BUGFIX] Fixed issue when query-frontend doesn't log request details when request is cancelled [#1136](https://github.com/grafana/tempo/issues/1136) (@adityapwr)
+* [BUGFIX] Update OTLP port in examples (docker-compose & kubernetes) from legacy ports (55680/55681) to new ports (4317/4318) [#1294](https://github.com/grafana/tempo/pull/1294) (@mapno)
 
 ## v1.3.1 / 2022-02-02
 * [BUGFIX] Fixed panic when using etcd as ring's kvstore [#1260](https://github.com/grafana/tempo/pull/1260) (@mapno)

diff --git a/example/docker-compose/agent/agent.yaml b/example/docker-compose/agent/agent.yaml
@@ -9,7 +9,7 @@ tempo:
         protocols:
           thrift_http:
     remote_write:
-      - endpoint: tempo:55680
+      - endpoint: tempo:4317
         insecure: true
     batch:
       timeout: 5s

diff --git a/example/docker-compose/agent/docker-compose.yaml b/example/docker-compose/agent/docker-compose.yaml
@@ -27,8 +27,8 @@ services:
     ports:
       - "14268"  # jaeger ingest
       - "3200"   # tempo
-      - "55680"  # otlp grpc
-      - "55681"  # otlp http
+      - "4317"  # otlp grpc
+      - "4318"  # otlp http
       - "9411"   # zipkin
 
   prometheus:

diff --git a/example/docker-compose/local/docker-compose.yaml b/example/docker-compose/local/docker-compose.yaml
@@ -10,8 +10,8 @@ services:
     ports:
       - "14268"  # jaeger ingest
       - "3200"   # tempo
-      - "55680"  # otlp grpc
-      - "55681"  # otlp http
+      - "4317"  # otlp grpc
+      - "4318"  # otlp http
       - "9411"   # zipkin
 
   synthetic-load-generator:

diff --git a/example/docker-compose/otel-collector-multitenant/docker-compose.yaml b/example/docker-compose/otel-collector-multitenant/docker-compose.yaml
@@ -27,8 +27,8 @@ services:
     ports:
       - "14268"  # jaeger ingest
       - "3200"   # tempo
-      - "55680"  # otlp grpc
-      - "55681"  # otlp http
+      - "4317"  # otlp grpc
+      - "4318"  # otlp http
       - "9411"   # zipkin
 
   prometheus:

diff --git a/example/docker-compose/otel-collector/docker-compose.yaml b/example/docker-compose/otel-collector/docker-compose.yaml
@@ -27,8 +27,8 @@ services:
     ports:
       - "14268"  # jaeger ingest
       - "3200"   # tempo
-      - "55680"  # otlp grpc
-      - "55681"  # otlp http
+      - "4317"  # otlp grpc
+      - "4318"  # otlp http
       - "9411"   # zipkin
 
   prometheus:

diff --git a/example/docker-compose/otel-collector/readme.md b/example/docker-compose/otel-collector/readme.md
@@ -19,7 +19,7 @@ otel-collector_grafana_1                    /run.sh                          Up
 otel-collector_otel-collector_1             /otelcol --config=/etc/ote ...   Up      55678/tcp, 55679/tcp
 otel-collector_synthetic-load-generator_1   ./start.sh                       Up
 otel-collector_tempo_1                      /tempo -config.file=/etc/t ...   Up      0.0.0.0:59538->14268/tcp, 0.0.0.0:59540->3200/tcp,
-                                                                                    0.0.0.0:59537->55680/tcp, 0.0.0.0:59536->55681/tcp,
+                                                                                    0.0.0.0:59537->4317/tcp, 0.0.0.0:59536->4318/tcp,
                                                                                     0.0.0.0:59539->9411/tcp
 ```
 

diff --git a/operations/kube-manifests/ConfigMap-tempo-distributor.yaml b/operations/kube-manifests/ConfigMap-tempo-distributor.yaml
@@ -11,7 +11,7 @@ data:
             otlp:
                 protocols:
                     grpc:
-                        endpoint: 0.0.0.0:55680
+                        endpoint: 0.0.0.0:4317
     http_api_prefix: ""
     ingester:
         lifecycler:

diff --git a/operations/kube-manifests/Deployment-distributor.yaml b/operations/kube-manifests/Deployment-distributor.yaml
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       annotations:
-        config_hash: 06c3e6109f628a0f5a41db2a4ebd73a8
+        config_hash: 1d576bcfcaa599ba1cac6892924b561a
       labels:
         app: distributor
         name: distributor

diff --git a/operations/kube-manifests/util/example/main.jsonnet b/operations/kube-manifests/util/example/main.jsonnet
@@ -38,7 +38,7 @@ tempo {
         otlp: {
           protocols: {
             grpc: {
-              endpoint: '0.0.0.0:55680',
+              endpoint: '0.0.0.0:4317',
             },
           },
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ tempo { @@
             otlp: {
               protocols: {
                 grpc: {
-                  endpoint: '0.0.0.0:55680',
+                  endpoint: '0.0.0.0:4317',
                 },
               },
             },
@@ Expand Down @@