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 dependent services - Collector, Grafana, Jaeger, Prometheus, etc. #1354

Merged
merged 3 commits into from
Feb 1, 2024
Merged

Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc. #1354

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
e273c10
Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc.
mviitane Jan 31, 2024
734dc20
Add CHANGELOG
mviitane Jan 31, 2024
a42813b
Merge branch 'main' into update_dependent_images
julianocosta89 Feb 1, 2024
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
13 changes: 12 additions & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@


# Images
# Demo App version
IMAGE_VERSION=1.7.2
IMAGE_NAME=ghcr.io/open-telemetry/demo

# Dependent images
COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.93.0
DATAPREPPER_IMAGE=opensearchproject/data-prepper:latest
GRAFANA_IMAGE=grafana/grafana:10.3.1
JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.53
OPENSEARCH_IMAGE=opensearchproject/opensearch:latest
POSTGRES_IMAGE=postgres:16.1
PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.49.1
REDIS_IMAGE=redis:7.2-alpine
TRACETEST_IMAGE_VERSION=v0.14.5
TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}

# Demo Platform
ENV_PLATFORM=local
Expand Down
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 @@ -40,6 +40,8 @@ the release.
([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352))
* Align env variables for OTLP ports
([#1353](https://github.com/open-telemetry/opentelemetry-demo/pull/1353))
* Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc.
([#1354](https://github.com/open-telemetry/opentelemetry-demo/pull/1354))

## 1.7.2

Expand Down
14 changes: 7 additions & 7 deletions docker-compose.minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ services:
# ******************
# Redis used by Cart service
redis-cart:
image: redis:7.2-alpine
image: ${REDIS_IMAGE}
container_name: redis-cart
user: redis
deploy:
Expand All @@ -464,7 +464,7 @@ services:
# ********************
# Jaeger
jaeger:
image: jaegertracing/all-in-one:1.52
image: ${JAEGERTRACING_IMAGE}
container_name: jaeger
command:
- "--memory.max-traces=8000"
Expand All @@ -486,7 +486,7 @@ services:

# Grafana
grafana:
image: grafana/grafana:10.2.0
image: ${GRAFANA_IMAGE}
container_name: grafana
deploy:
resources:
Expand All @@ -503,7 +503,7 @@ services:

# OpenTelemetry Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.91.0
image: ${COLLECTOR_CONTRIB_IMAGE}
container_name: otel-col
deploy:
resources:
Expand All @@ -525,7 +525,7 @@ services:

# Prometheus
prometheus:
image: quay.io/prometheus/prometheus:v2.48.1
image: ${PROMETHEUS_IMAGE}
container_name: prometheus
command:
- --web.console.templates=/etc/prometheus/consoles
Expand All @@ -548,7 +548,7 @@ services:
logging: *logging

opensearch:
image: opensearchproject/opensearch:latest
image: ${OPENSEARCH_IMAGE}
container_name: opensearch
environment:
- cluster.name=demo-cluster
Expand All @@ -570,7 +570,7 @@ services:
logging: *logging

dataprepper:
image: opensearchproject/data-prepper:latest
image: ${DATAPREPPER_IMAGE}
volumes:
- ./src/opensearch/pipelines.yaml:/usr/share/data-prepper/pipelines/pipelines.yaml
- ./src/opensearch/data-prepper-config.yaml:/usr/share/data-prepper/config/data-prepper-config.yaml
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ services:

# Redis used by Cart service
redis-cart:
image: redis:7.2-alpine
image: ${REDIS_IMAGE}
container_name: redis-cart
user: redis
deploy:
Expand All @@ -617,7 +617,7 @@ services:
# ********************
# Jaeger
jaeger:
image: jaegertracing/all-in-one:1.52
image: ${JAEGERTRACING_IMAGE}
container_name: jaeger
command:
- "--memory.max-traces=8000"
Expand All @@ -639,7 +639,7 @@ services:

# Grafana
grafana:
image: grafana/grafana:10.2.3
image: ${GRAFANA_IMAGE}
container_name: grafana
deploy:
resources:
Expand All @@ -656,7 +656,7 @@ services:

# OpenTelemetry Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.91.0
image: ${COLLECTOR_CONTRIB_IMAGE}
container_name: otel-col
deploy:
resources:
Expand All @@ -678,7 +678,7 @@ services:

# Prometheus
prometheus:
image: quay.io/prometheus/prometheus:v2.48.1
image: ${PROMETHEUS_IMAGE}
container_name: prometheus
command:
- --web.console.templates=/etc/prometheus/consoles
Expand All @@ -701,7 +701,7 @@ services:
logging: *logging

opensearch:
image: opensearchproject/opensearch:latest
image: ${OPENSEARCH_IMAGE}
container_name: opensearch
environment:
- cluster.name=demo-cluster
Expand All @@ -723,7 +723,7 @@ services:
logging: *logging

dataprepper:
image: opensearchproject/data-prepper:latest
image: ${DATAPREPPER_IMAGE}
volumes:
- ./src/opensearch/pipelines.yaml:/usr/share/data-prepper/pipelines/pipelines.yaml
- ./src/opensearch/data-prepper-config.yaml:/usr/share/data-prepper/config/data-prepper-config.yaml
Expand Down Expand Up @@ -844,7 +844,7 @@ services:
condition: service_started

tracetest-server:
image: kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
image: ${TRACETEST_IMAGE}
platform: linux/amd64
container_name: tracetest-server
profiles:
Expand Down Expand Up @@ -874,7 +874,7 @@ services:
retries: 60

tracetest-postgres:
image: postgres:16.0
image: ${POSTGRES_IMAGE}
container_name: tracetest-postgres
profiles:
- tests
Expand Down
Loading