Update dependent services - Collector, Grafana, Jaeger, Prometheus, e…

…tc. (open-telemetry#1354) * Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc. Move those external service image paths and versions to .env file to make it easier to update them in the future for multiple docker compose files. * Add CHANGELOG --------- Co-authored-by: Juliano Costa <[email protected]>
julianocosta89 · Feb 1, 2024 · 26b1710 · 26b1710
1 parent cbea332
commit 26b1710
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 17 deletions.
diff --git a/.env b/.env
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -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:
@@ -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"
@@ -486,7 +486,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:10.2.0
+    image: ${GRAFANA_IMAGE}
     container_name: grafana
     deploy:
       resources:
@@ -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:
@@ -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
@@ -548,7 +548,7 @@ services:
     logging: *logging
 
   opensearch:
-    image: opensearchproject/opensearch:latest
+    image: ${OPENSEARCH_IMAGE}
     container_name: opensearch
     environment:
       - cluster.name=demo-cluster
@@ -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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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:
@@ -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"
@@ -639,7 +639,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:10.2.3
+    image: ${GRAFANA_IMAGE}
     container_name: grafana
     deploy:
       resources:
@@ -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:
@@ -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
@@ -701,7 +701,7 @@ services:
     logging: *logging
 
   opensearch:
-    image: opensearchproject/opensearch:latest
+    image: ${OPENSEARCH_IMAGE}
     container_name: opensearch
     environment:
       - cluster.name=demo-cluster
@@ -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
@@ -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:
@@ -874,7 +874,7 @@ services:
       retries: 60
 
   tracetest-postgres:
-    image: postgres:16.0
+    image: ${POSTGRES_IMAGE}
     container_name: tracetest-postgres
     profiles:
       - tests