Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update examples and configs OTLP ports #1294

Merged
merged 3 commits into from
Feb 21, 2022
Merged

Update examples and configs OTLP ports #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46b6235
Update examples and configs OTLP ports
mapno Feb 21, 2022
dbbdef9
Update kube-manifests
mapno Feb 21, 2022
98fdadb
Add changelog entry
mapno Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose/agent/agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ tempo:
protocols:
thrift_http:
remote_write:
- endpoint: tempo:55680
- endpoint: tempo:4317
insecure: true
batch:
timeout: 5s
Expand Down
4 changes: 2 additions & 2 deletions example/docker-compose/agent/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions example/docker-compose/local/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions example/docker-compose/otel-collector-multitenant/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions example/docker-compose/otel-collector/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose/otel-collector/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/ConfigMap-tempo-distributor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-distributor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
template:
metadata:
annotations:
config_hash: 06c3e6109f628a0f5a41db2a4ebd73a8
config_hash: 1d576bcfcaa599ba1cac6892924b561a
labels:
app: distributor
name: distributor
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/util/example/main.jsonnet
View file
Open in desktop
Original file line number Diff 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