Skip to content

Commit

Permalink
Jaeger-SPM-Config (open-telemetry#655)
Browse files Browse the repository at this point in the history
* prometheus.server-url parameter

--prometheus.server-url parameter and environment variable METRICS_STORAGE_TYPE=prometheus added to make Jaeger SPM page working.

* prometheus.server-url

prometheus.server-url parameter and environment variable

* Update docker-compose.yml

commited to test in local. will be resolving once it works.

Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

* lint typo correctin

* Update CHANGELOG.md

* Add Jaeger-SPM-Config
([open-telemetry#655](open-telemetry#655))

* remove extra blank space

Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
  • Loading branch information
devrimdemiroz and puckpuck committed Dec 25, 2022
1 parent 55dd49d commit b9b5cd9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,4 @@ JAEGER_SERVICE_HOST=jaeger
# Prometheus
PROMETHEUS_SERVICE_PORT=9090
PROMETHEUS_SERVICE_HOST=prometheus
PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#651](https://github.com/open-telemetry/opentelemetry-demo/pull/651))
* Add resource detectors to frontend service
([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648))
* Add Jaeger-SPM-Config
([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
9 changes: 8 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,13 @@ services:
jaeger:
image: jaegertracing/all-in-one
container_name: jaeger
command: ["--memory.max-traces", "10000", "--query.base-path", "/jaeger/ui"]
command:
- "--memory.max-traces"
- "10000"
- "--query.base-path"
- "/jaeger/ui"
- "--prometheus.server-url"
- "http://${PROMETHEUS_ADDR}"
deploy:
resources:
limits:
Expand All @@ -586,6 +592,7 @@ services:
- "4317" # OTLP gRPC default port
environment:
- COLLECTOR_OTLP_ENABLED=true
- METRICS_STORAGE_TYPE=prometheus
logging: *logging

# Grafana
Expand Down

0 comments on commit b9b5cd9

Please sign in to comment.