From e273c10b5fd20021001423eadc37357de7e72960 Mon Sep 17 00:00:00 2001 From: Mikko Viitanen Date: Wed, 31 Jan 2024 17:01:01 +0200 Subject: [PATCH 1/2] 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. --- .env | 13 ++++++++++++- docker-compose.minimal.yml | 14 +++++++------- docker-compose.yml | 18 +++++++++--------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.env b/.env index 8d53b699e3..9c3fa04d8b 100644 --- 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/docker-compose.minimal.yml b/docker-compose.minimal.yml index a79f6a1119..5b2fd80d58 100644 --- 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 index 9e6de5731e..96f9a63cb3 100644 --- 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 From 734dc2022efdc3ffb6ce40e6b9fd48d8e4780bb9 Mon Sep 17 00:00:00 2001 From: Mikko Viitanen Date: Wed, 31 Jan 2024 17:08:04 +0200 Subject: [PATCH 2/2] Add CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4772718ded..d53974caac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ release. ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) * [frauddetectionservice] added group and anonymous read permission to opentelemetry-javaagent.jar ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) +* Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc. + ([#1354](https://github.com/open-telemetry/opentelemetry-demo/pull/1354)) ## 1.7.2