update traces

Signed-off-by: Weifeng Wang <[email protected]>

docker-compose/common/compose-include/loki.yaml

@@ -0,0 +1,26 @@
+services:
+  loki:
+    labels:
+      - logs.agent.grafana.com/log-format=json
+    depends_on:
+      minio:
+        condition: service_healthy
+    image: ${LOKI_IMAGE:-docker.io/grafana/loki:2.9.6}
+    volumes:
+      - ../config/loki:/etc/loki
+    command:
+      - -config.file=/etc/loki/monolithic-mode-logs.yaml
+      - -target=all
+      - -config.expand-env=true
+    healthcheck:
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1" ]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+    # expose 33100 port so we can directly access loki inside container
+    ports:
+      - "33100:3100"
+    networks:
+      default:
+        aliases:
+          - loki-memberlist

docker-compose/microservices-mode/traces/compose.yaml

@@ -10,6 +10,7 @@ include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
   - path: ../../common/compose-include/mimir.yaml
+  - path: ../../common/compose-include/loki.yaml
   - path: ../../common/compose-include/grafana-agent.yaml
   - path: ../../common/compose-include/grafana.yaml
 
@@ -34,6 +35,7 @@ services:
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
       - ../../common/config/tempo/gateway_tempo.conf:/etc/nginx/templates/gateway_tempo.conf.template
       - ../../common/config/mimir/gateway_mimir.conf:/etc/nginx/templates/gateway_mimir.conf.template
+      - ../../common/config/loki/gateway_loki.conf:/etc/nginx/templates/gateway_loki.conf.template
     environment:
       - TEMPO_DISTRIBUTOR_HOST=distributor
       - TEMPO_INGESTER_HOST=ingester

docker-compose/monolithic-mode/traces/compose.yaml

@@ -10,6 +10,7 @@ include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
   - path: ../../common/compose-include/mimir.yaml
+  - path: ../../common/compose-include/loki.yaml
   - path: ../../common/compose-include/grafana.yaml
 
 x-environment: &jaeger-environment
@@ -72,6 +73,7 @@ services:
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
       - ../../common/config/tempo/gateway_tempo.conf:/etc/nginx/templates/gateway_tempo.conf.template
       - ../../common/config/mimir/gateway_mimir.conf:/etc/nginx/templates/gateway_mimir.conf.template
+      - ../../common/config/loki/gateway_loki.conf:/etc/nginx/templates/gateway_loki.conf.template
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3200/ || exit 1" ]
       interval: 10s