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 Telemetry Components #1085

Merged
merged 4 commits into from
Aug 31, 2023
Merged

Update Telemetry Components #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a314c76
Update Telemetry Components
Aug 31, 2023
a85c338
changelog
Aug 31, 2023
3676867
Merge branch 'main' into Update-Telemetry-Components
cartersocha Aug 31, 2023
83b74f9
Merge branch 'main' into Update-Telemetry-Components
julianocosta89 Aug 31, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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