Merge pull request opensearch-project#799 from lewijacn/jaeger-fix

chelma · Jul 8, 2024 · 70340cb · 70340cb
2 parents c45b991 + 25f857b
commit 70340cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml b/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   prometheus:
     container_name: prometheus
-    image: prom/prometheus:latest
+    image: prom/prometheus:v2.53.0
     networks:
       - migrations
     volumes:
@@ -16,8 +16,10 @@ services:
       - '--enable-feature=exemplar-storage'
 
   # Jaeger
+  # Found regression with latest tag not being able to connect to port 4317 on docker startup, reverted to '1' tag
+  # until resolved
   jaeger:
-    image: jaegertracing/all-in-one:latest
+    image: jaegertracing/all-in-one:1.58.1
     networks:
       - migrations
     ports:
@@ -79,7 +81,7 @@ services:
     command: /bin/sh -c "/runJavaWithClasspath.sh org.opensearch.migrations.replay.TrafficReplayer --speedup-factor 2 https://opensearchtarget:9200 --auth-header-value Basic\\ YWRtaW46bXlTdHJvbmdQYXNzd29yZDEyMyE= --insecure --kafka-traffic-brokers kafka:9092 --kafka-traffic-topic logging-traffic-topic --kafka-traffic-group-id logging-group-default --otelCollectorEndpoint http://otel-collector:4317"
 
   opensearchtarget:
-    image: 'opensearchproject/opensearch:latest'
+    image: 'opensearchproject/opensearch:2.15.0'
     environment:
       - discovery.type=single-node
       - OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!

diff --git a/TrafficCapture/dockerSolution/src/main/docker/grafana/Dockerfile b/TrafficCapture/dockerSolution/src/main/docker/grafana/Dockerfile
@@ -1,3 +1,3 @@
-FROM grafana/grafana:latest
+FROM grafana/grafana:11.1.0
 
 COPY datasources.yaml /usr/share/grafana/conf/provisioning/datasources/