From 46b6235199aeef64e9cb494717f30cfbe2019a4a Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Date: Mon, 21 Feb 2022 11:39:51 +0100 Subject: [PATCH 1/3] Update examples and configs OTLP ports OTLP listening port was changed from 55680/55681 to 4317/4318. --- example/docker-compose/agent/agent.yaml | 2 +- example/docker-compose/agent/docker-compose.yaml | 4 ++-- example/docker-compose/local/docker-compose.yaml | 4 ++-- .../otel-collector-multitenant/docker-compose.yaml | 4 ++-- example/docker-compose/otel-collector/docker-compose.yaml | 4 ++-- example/docker-compose/otel-collector/readme.md | 2 +- operations/kube-manifests/ConfigMap-tempo-distributor.yaml | 2 +- operations/kube-manifests/util/example/main.jsonnet | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/example/docker-compose/agent/agent.yaml b/example/docker-compose/agent/agent.yaml index f680b9836a9..6ff16a0c853 100644 --- 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 index c9e5c4d2bbd..071623802cb 100644 --- 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 index f1d42033f22..5907c26caae 100644 --- 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 index f62c484d052..ebf36e3a1e7 100644 --- 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 index c39e20b3860..7027c92f5ba 100644 --- 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 index 44d72e3e9fb..9f626a9c793 100644 --- 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 index 39467bf0c7a..13f99376c85 100644 --- 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/util/example/main.jsonnet b/operations/kube-manifests/util/example/main.jsonnet index 9574c8b1e6f..daa4c5f4a90 100644 --- 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', }, }, }, From dbbdef9af40d3ff1d303f7275ee17034c4f123e9 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Date: Mon, 21 Feb 2022 11:48:22 +0100 Subject: [PATCH 2/3] Update kube-manifests --- operations/kube-manifests/Deployment-distributor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operations/kube-manifests/Deployment-distributor.yaml b/operations/kube-manifests/Deployment-distributor.yaml index a1f93afe5a7..bce30a305ce 100644 --- 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 From 98fdadb1083a5e9bb73f785ee189dba5f802b086 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Date: Mon, 21 Feb 2022 13:01:14 +0100 Subject: [PATCH 3/3] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcc869640c9..8e6b39fda13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * [ENHACEMENT] Enterprise jsonnet: add config to create tokengen job explicitly [#1256](https://github.com/grafana/tempo/pull/1256) (@kvrhdn) * [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)