diff --git a/ansible/roles/prometheus/files/prometheus/docker-compose.yml b/ansible/roles/prometheus/files/prometheus/docker-compose.yml index db39ce9..4114f8f 100644 --- a/ansible/roles/prometheus/files/prometheus/docker-compose.yml +++ b/ansible/roles/prometheus/files/prometheus/docker-compose.yml @@ -1,12 +1,5 @@ version: "2.3" -x-blackbox: &blackbox - image: prom/blackbox-exporter:latest - restart: unless-stopped - user: "{{ docker_user.id }}" - volumes: - - ./blackbox.yml:/etc/blackbox_exporter/config.yml:ro - services: prometheus: image: prom/prometheus:latest @@ -23,14 +16,11 @@ services: - "{{ pve_hosts.forrest.ip }}:9090:9090" blackbox: - <<: *blackbox - - blackbox-external: - <<: *blackbox - # Don't use my internal DNS servers - dns: - - 9.9.9.9 - - 149.112.112.112 + image: prom/blackbox-exporter:latest + restart: unless-stopped + user: "{{ docker_user.id }}" + volumes: + - ./blackbox.yml:/etc/blackbox_exporter/config.yml:ro alertmanager: image: prom/alertmanager:latest diff --git a/ansible/roles/prometheus/files/prometheus/prometheus.yml b/ansible/roles/prometheus/files/prometheus/prometheus.yml index eedfe51..05696dd 100644 --- a/ansible/roles/prometheus/files/prometheus/prometheus.yml +++ b/ansible/roles/prometheus/files/prometheus/prometheus.yml @@ -41,48 +41,6 @@ scrape_configs: static_configs: - targets: ["{{ pve_hosts.homeassistant.ip }}:8123"] - - job_name: blackbox_http_external - scrape_interval: 1m - metrics_path: /probe - params: - module: [http] - static_configs: - - targets: - - https://0rng.one - - https://auth.jakehoward.tech/-/health/ready/ - - https://bin.theorangeone.net - - https://git.theorangeone.net/api/healthz - - https://grafana.jakehoward.tech/api/health - - https://headscale.jakehoward.tech/health - - https://homeassistant.jakehoward.tech - - https://intersect.jakehoward.tech - - https://mastodon.theorangeone.net/health - - https://matrix.jakehoward.tech:8448/_matrix/federation/v1/version - - https://matrix.jakehoward.tech/_matrix/federation/v1/version - - https://media.jakehoward.tech - - https://minio.jakehoward.tech/minio/health/live - - https://notes.theorangeone.net - - https://ntfy.jakehoward.tech/v1/health - - https://plausible.theorangeone.net - - https://recipes.jakehoward.tech - - https://s3.jakehoward.tech/minio/health/live - - https://tasks.jakehoward.tech/health - - https://theorangeone.net - - https://tt-rss.jakehoward.tech - - https://vaultwarden.jakehoward.tech/alive - - https://whoami-cdn.theorangeone.net - - https://whoami.theorangeone.net - relabel_configs: - - source_labels: [__address__] - target_label: __param_target - - source_labels: [__param_target] - target_label: instance - - target_label: __address__ - replacement: blackbox-external:9115 - - source_labels: [instance] - regex: https?://([^/]+)/?.* - target_label: hostname - - job_name: blackbox_icmp scrape_interval: 10m metrics_path: /probe @@ -115,7 +73,7 @@ scrape_configs: - source_labels: [__param_target] target_label: instance - target_label: __address__ - replacement: blackbox-external:9115 + replacement: blackbox:9115 - job_name: blackbox_healthcheck scrape_interval: 10m