diff --git a/Dockerfile b/Dockerfile index ab80643..f60335c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM prom/prometheus -LABEL version="20240623.1.5" +LABEL version="20240623.1.6" LABEL description="prometheus" RUN mkdir -p /etc/prometheus diff --git a/docker-compose.yml b/docker-compose.yml index e6cbd34..ff05823 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: prometheus: build: dockerfile: Dockerfile - image: docker-registry1.in.thelinuxpro.net:5000/tlp/prometheus:240623.1.5 + image: docker-registry1.in.thelinuxpro.net:5000/tlp/prometheus:240623.1.6 container_name: prometheus command: '--config.file=/etc/prometheus/prometheus.yml' restart: unless-stopped diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index d759570..e8a87c9 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -2,6 +2,7 @@ global: scrape_interval: 15s scrape_timeout: 10s evaluation_interval: 15s + alerting: alertmanagers: - static_configs: @@ -9,48 +10,86 @@ alerting: scheme: http timeout: 10s api_version: v1 + scrape_configs: -- job_name: prometheus - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - static_configs: - - targets: - - localhost:9090 -- job_name: docker_hosts - static_configs: - - targets: ['pi501.in.thelinuxpro.net:9100', 'pi502.in.thelinuxpro.net:9100'] -- job_name: unifi - static_configs: - - targets: ['unpoller.in.thelinuxpro.net:9130'] -- job_name: pihole - static_configs: - - targets: ['pihole-exporter.in.thelinuxpro.net:9617'] -- job_name: blackbox - metrics_path: /probe - params: - module: [https_2xx] - static_configs: + - job_name: prometheus + honor_timestamps: true + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + static_configs: - targets: - - thelinux.pro:443 -- job_name: blackbox_http_3xx - metrics_path: /probe - params: - module: [http_301] - static_configs: - - targets: - - thelinux.pro:80 -- job_name: blackbox_dns_thelinux_pro__A - metrics_path: /probe - params: - module: [dns_thelinux_pro__A] - static_configs: - - targets: ['ns1.thelinuxpro.net', 'ns2.thelinuxpro.net'] -- job_name: blackbox_dns_thelinux_pro__SOA - metrics_path: /probe - params: - module: [dns_thelinux_pro__SOA] - static_configs: - - targets: ['ns1.thelinuxpro.net', 'ns2.thelinuxpro.net'] + - localhost:9090 + + - job_name: docker_hosts + static_configs: + - targets: ['pi501.in.thelinuxpro.net:9100', 'pi502.in.thelinuxpro.net:9100'] + + - job_name: unifi + static_configs: + - targets: ['unpoller.in.thelinuxpro.net:9130'] + + - job_name: pihole + static_configs: + - targets: ['pihole-exporter.in.thelinuxpro.net:9617'] + + - job_name: blackbox_https_2xx + metrics_path: /probe + params: + module: [https_2xx] + static_configs: + - targets: + - https://thelinux.pro + - https://kameronkenny.com + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: blackbox-exporter.in.thelinuxpro.net:9115 + + - job_name: blackbox_http_3xx + metrics_path: /probe + params: + module: [http_301] + static_configs: + - targets: + - https://thelinux.pro + - https://kameronkenny.com + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: blackbox-exporter.in.thelinuxpro.net:9115 + + - job_name: blackbox_dns_thelinux_pro__A + metrics_path: blackbox-exporter.in.thelinuxpro.net/probe + params: + module: [dns_thelinux_pro__A] + static_configs: + - targets: ['ns1.thelinuxpro.net', 'ns2.thelinuxpro.net'] + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: blackbox-exporter.in.thelinuxpro.net:9115 + + - job_name: blackbox_dns_thelinux_pro__SOA + metrics_path: /probe + params: + module: [dns_thelinux_pro__SOA] + static_configs: + - targets: ['ns1.thelinuxpro.net', 'ns2.thelinuxpro.net'] + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: blackbox-exporter.in.thelinuxpro.net:9115