Fixing wavefront

docker-compose-WAVEFRONT.sh

@@ -34,6 +34,17 @@ if [[ "${READY_FOR_TESTS}" == "no" ]] ; then
     exit 1
 fi
 
+READY_FOR_TESTS="no"
+PORT_TO_CHECK=3100
+echo "Run the rest of infra"
+docker-compose -f $dockerComposeFile  up -d zipkin loki prometheus grafana
+netcat_local_port $PORT_TO_CHECK && READY_FOR_TESTS="yes"
+
+if [[ "${READY_FOR_TESTS}" == "no" ]] ; then
+    echo "Loki failed to start..."
+    exit 1
+fi
+
 # Boot config-server
 READY_FOR_TESTS="no"
 PORT_TO_CHECK=8888

docker-compose-WAVEFRONT.yml

@@ -13,15 +13,21 @@ services:
       - "5672:5672"
       - "15672:15672"
 
-  tempo:
-    image: grafana/tempo
+  #  tempo:
+  #    image: grafana/tempo
+  #    extra_hosts: ['host.docker.internal:host-gateway']
+  #    command: [ "-config.file=/etc/tempo.yaml" ]
+  #    volumes:
+  #      - ./docker/tempo/tempo-local.yaml:/etc/tempo.yaml
+  #      - ./tempo-data:/tmp/tempo
+  #    ports:
+  #      - "14268"  # jaeger ingest
+  #      - "9411:9411" # zipkin
+
+  zipkin:
+    image: openzipkin/zipkin
     extra_hosts: [ 'host.docker.internal:host-gateway' ]
-    command: [ "-config.file=/etc/tempo.yaml" ]
-    volumes:
-      - ./docker/tempo/tempo-local.yaml:/etc/tempo.yaml
-      - ./tempo-data:/tmp/tempo
     ports:
-      - "14268"  # jaeger ingest
       - "9411:9411" # zipkin
 
   loki:
@@ -32,7 +38,7 @@ services:
       - "3100:3100"                                   # loki needs to be exposed so it receives logs
     environment:
       - JAEGER_AGENT_HOST=tempo
-      - JAEGER_ENDPOINT=http://tempo:14268/api/traces # send traces to Tempo
+      #      - JAEGER_ENDPOINT=http://tempo:14268/api/traces # send traces to Tempo
       - JAEGER_SAMPLER_TYPE=const
       - JAEGER_SAMPLER_PARAM=1