diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml index 3ee9a9e9c..711730945 100644 --- a/config/deploy.beta.yml +++ b/config/deploy.beta.yml @@ -54,14 +54,3 @@ accessories: - 443:443 volumes: - load-balancer:/home/kamal-proxy/.config/kamal-proxy - - otel_collector-load-balancer: - image: otel/opentelemetry-collector-contrib:0.126.0 - port: 9394 - files: - - config/otel_collector.yml:/etc/otelcol-contrib/config.yaml - volumes: - - /var/run/docker.sock:/var/run/docker.sock - options: - user: 0 - host: fizzy-beta-lb-01 diff --git a/config/deploy.production.yml b/config/deploy.production.yml index 6c171af2d..b21749c26 100644 --- a/config/deploy.production.yml +++ b/config/deploy.production.yml @@ -58,14 +58,3 @@ accessories: - 443:443 volumes: - load-balancer:/home/kamal-proxy/.config/kamal-proxy - - otel_collector-load-balancer: - image: otel/opentelemetry-collector-contrib:0.126.0 - port: 9394 - files: - - config/otel_collector.yml:/etc/otelcol-contrib/config.yaml - volumes: - - /var/run/docker.sock:/var/run/docker.sock - options: - user: 0 - host: fizzy-lb-101 diff --git a/config/deploy.staging.yml b/config/deploy.staging.yml index f4d23c7f6..7335abd97 100644 --- a/config/deploy.staging.yml +++ b/config/deploy.staging.yml @@ -58,14 +58,3 @@ accessories: - 443:443 volumes: - load-balancer:/home/kamal-proxy/.config/kamal-proxy - - otel_collector-load-balancer: - image: otel/opentelemetry-collector-contrib:0.126.0 - port: 9394 - files: - - config/otel_collector.yml:/etc/otelcol-contrib/config.yaml - volumes: - - /var/run/docker.sock:/var/run/docker.sock - options: - user: 0 - host: fizzy-staging-lb-01 diff --git a/config/deploy.yml b/config/deploy.yml index 87c67950a..19e9649ea 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -32,17 +32,3 @@ aliases: console: app exec -i --reuse "bin/rails console" ssh: app exec -i --reuse /bin/bash switch: accessory exec beamer --reuse "beamer switch --primary=<%= ENV["PRIMARY"] %>" - -accessories: - otel_collector: - image: otel/opentelemetry-collector-contrib:0.126.0 - port: 9394 - files: - - config/otel_collector.yml:/etc/otelcol-contrib/config.yaml - volumes: - - /var/run/docker.sock:/var/run/docker.sock - options: - user: 0 - roles: - - web - - jobs diff --git a/config/otel_collector.yml b/config/otel_collector.yml deleted file mode 100644 index 38ad41224..000000000 --- a/config/otel_collector.yml +++ /dev/null @@ -1,51 +0,0 @@ -receivers: - prometheus: - config: - scrape_configs: - - job_name: "kamal-containers" - scrape_interval: 5s - docker_sd_configs: - - host: unix:///var/run/docker.sock - refresh_interval: 10s - relabel_configs: - # Limit scraping to labeled containers with port 9394 or 9000 exposed - - source_labels: [__address__] - regex: .*:(9394|9000) - action: keep - - source_labels: [__meta_docker_container_name] - regex: (/fizzy-(web|jobs)-.*|/fizzy-beamer|/kamal-proxy) - action: keep - - # Pull service and role from Kamal Docker labels - - source_labels: [__meta_docker_container_label_service] - target_label: service - - source_labels: [__meta_docker_container_label_role] - target_label: role - - - source_labels: [__meta_docker_container_name] - regex: ^/(kamal-proxy|fizzy-beamer)$ - target_label: service - replacement: $1 - - - source_labels: [__meta_docker_container_name] - regex: ^/kamal-proxy$ - target_label: role - replacement: proxy - - - source_labels: [__meta_docker_container_name] - regex: ^/fizzy-beamer$ - target_label: role - replacement: beamer - -exporters: - prometheus: - endpoint: 0.0.0.0:9394 - -service: - telemetry: - logs: - level: "info" - pipelines: - metrics: - receivers: [prometheus] - exporters: [prometheus]