From aaca0f94f89fd557027dbff3741883f7c1957175 Mon Sep 17 00:00:00 2001 From: Iurii Tatishchev Date: Thu, 25 Jul 2024 13:16:52 -0700 Subject: [PATCH] monitoring: remove jaeger Possible to add it back with a proper database, but all-in-one keeps everything in memory. --- .../services/monitoring/docker-compose.yml.j2 | 12 ------------ .../provisioning/datasources/alpina.yaml.j2 | 17 ----------------- .../templates/services/traefik/traefik.yml.j2 | 6 ------ 3 files changed, 35 deletions(-) diff --git a/roles/alpina/templates/services/monitoring/docker-compose.yml.j2 b/roles/alpina/templates/services/monitoring/docker-compose.yml.j2 index ed25e16..b44fa9a 100644 --- a/roles/alpina/templates/services/monitoring/docker-compose.yml.j2 +++ b/roles/alpina/templates/services/monitoring/docker-compose.yml.j2 @@ -99,18 +99,6 @@ services: volumes: - {{ base_volume_path }}/monitoring/influxdb:/var/lib/influxdb2 - jaeger: - image: jaegertracing/all-in-one:1 - container_name: jaeger - restart: unless-stopped - environment: - - COLLECTOR_OTLP_ENABLED=true - ports: - - 4317:4317 - - 4318:4318 - volumes: - - {{ base_volume_path }}/monitoring/jaeger:/jaeger - uptime-kuma: image: louislam/uptime-kuma:1 container_name: uptime-kuma diff --git a/roles/alpina/templates/services/monitoring/grafana_config/provisioning/datasources/alpina.yaml.j2 b/roles/alpina/templates/services/monitoring/grafana_config/provisioning/datasources/alpina.yaml.j2 index 44f9f2a..2ce42bf 100644 --- a/roles/alpina/templates/services/monitoring/grafana_config/provisioning/datasources/alpina.yaml.j2 +++ b/roles/alpina/templates/services/monitoring/grafana_config/provisioning/datasources/alpina.yaml.j2 @@ -27,20 +27,3 @@ datasources: secureJsonData: token: {{ influxdb_admin_token }} editable: false - - - name: Jaeger - type: jaeger - access: proxy - uid: jaeger - url: http://jaeger:16686 - editable: false - jsonData: - tracesToLogsV2: - datasourceUid: loki - spanStartTimeShift: 1h - spanEndTimeShift: -1h - tags: [] - filterByTraceID: false - filterBySpanID: false - customQuery: true - query: '{container_name=~".*$${__span.tags["traefik.service.name"]}.*"}' diff --git a/roles/alpina/templates/services/traefik/traefik.yml.j2 b/roles/alpina/templates/services/traefik/traefik.yml.j2 index 396f1d3..6f0b7a0 100644 --- a/roles/alpina/templates/services/traefik/traefik.yml.j2 +++ b/roles/alpina/templates/services/traefik/traefik.yml.j2 @@ -22,12 +22,6 @@ metrics: prometheus: entryPoint: metrics -tracing: - otlp: - grpc: - endpoint: "localhost:4317" - insecure: true - certificatesResolvers: letsencrypt: acme: