Skip to content

Commit

Permalink
Update Telemetry Components (open-telemetry#1085)
Browse files Browse the repository at this point in the history
* Update Telemetry Components

* changelog

---------

Co-authored-by: Carter Socha <[email protected]>
  • Loading branch information
julianocosta89 and cartersocha authored Aug 31, 2023
1 parent dcfb733 commit 68edb3a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ release.
([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
* [accountingservice] Upgrade Shopify/sarama to IBM/sarama
([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
* Update Telemetry Components
([#1085](https://github.com/open-telemetry/opentelemetry-demo/pull/1085))

## 1.4.0

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ services:
# ********************
# Jaeger
jaeger:
image: jaegertracing/all-in-one
image: jaegertracing/all-in-one:1.48.0
container_name: jaeger
command:
- "--memory.max-traces"
Expand All @@ -486,7 +486,7 @@ services:

# Grafana
grafana:
image: grafana/grafana:9.5.7
image: grafana/grafana:10.1.0
container_name: grafana
deploy:
resources:
Expand All @@ -501,7 +501,7 @@ services:

# OpenTelemetry Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.82.0
image: otel/opentelemetry-collector-contrib:0.84.0
container_name: otel-col
deploy:
resources:
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ services:
# ********************
# Jaeger
jaeger:
image: jaegertracing/all-in-one
image: jaegertracing/all-in-one:1.48.0
container_name: jaeger
command:
- "--memory.max-traces"
Expand All @@ -621,7 +621,7 @@ services:
memory: 300M
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
- "4317" # OTLP gRPC default port
environment:
- COLLECTOR_OTLP_ENABLED=true
Expand All @@ -630,7 +630,7 @@ services:

# Grafana
grafana:
image: grafana/grafana:9.5.7
image: grafana/grafana:10.1.0
container_name: grafana
deploy:
resources:
Expand All @@ -645,7 +645,7 @@ services:

# OpenTelemetry Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.82.0
image: otel/opentelemetry-collector-contrib:0.84.0
container_name: otel-col
deploy:
resources:
Expand Down

0 comments on commit 68edb3a

Please sign in to comment.