From 6241b7063241ceb1c39ec8333b94ac1fb49f1efd Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 15 Aug 2024 15:39:11 -0600 Subject: [PATCH] add tempo (tracing) to the stack --- .gitignore | 2 ++ Caddy/Caddyfile | 2 +- Caddy/docker-compose.yml | 23 +++++++++++++++-------- Caddy/grafana.yaml | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 08c3750..d08f2f3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /qBittorrent/config/ /qBittorrent/qbit-config/ +/Caddy/tempo-storage +/Caddy/grafana-storage diff --git a/Caddy/Caddyfile b/Caddy/Caddyfile index 66401f7..2bd2f52 100644 --- a/Caddy/Caddyfile +++ b/Caddy/Caddyfile @@ -6,7 +6,7 @@ metrics } - servers :80 { + servers :3000 { name grafana metrics } diff --git a/Caddy/docker-compose.yml b/Caddy/docker-compose.yml index d54e9e2..9b4b59b 100644 --- a/Caddy/docker-compose.yml +++ b/Caddy/docker-compose.yml @@ -4,26 +4,34 @@ services: image: caddy:latest restart: unless-stopped ports: - - '80:80' - - '443:443' + - 80:80 + - 443:443 - '443:443/udp' volumes: - - './Caddyfile:/etc/caddy/Caddyfile' + - ./Caddyfile:/etc/caddy/Caddyfile # log collector prometheus: image: prom/prometheus:latest volumes: - - './prometheus.yaml:/etc/prometheus/prometheus.yml' + - ./prometheus.yaml:/etc/prometheus/prometheus.yml depends_on: - caddy + # trace collector + tempo: + image: grafana/tempo:latest + command: [ "-config.file=/opt/tempo.yaml" ] + volumes: + - ./tempo.yaml:/opt/tempo.yaml + - ./tempo-storage/:/var/tempo + # log viewer grafana: image: grafana/grafana:latest volumes: - - './grafana.yaml:/etc/grafana/provisioning/datasources/datasources.yaml' - - './grafana-storage/:/var/lib/grafana' + - ./grafana.yaml:/etc/grafana/provisioning/datasources/datasources.yaml + - ./grafana-storage/:/var/lib/grafana environment: - GF_AUTH_ANONYMOUS_ENABLED=true - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin @@ -31,6 +39,5 @@ services: - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor depends_on: - prometheus + - tempo -volumes: - grafana-storage: {} diff --git a/Caddy/grafana.yaml b/Caddy/grafana.yaml index 434b278..34bef58 100644 --- a/Caddy/grafana.yaml +++ b/Caddy/grafana.yaml @@ -13,3 +13,17 @@ datasources: editable: false jsonData: httpMethod: GET +- name: Tempo + type: tempo + uid: tempo + access: proxy + orgId: 1 + url: http://tempo:3200 + basicAuth: false + isDefault: false + version: 1 + editable: false + jsonData: + httpMethod: GET + serviceMap: + datasourceUid: 'prometheus'