diff --git a/dockers/grafana/docker-compose.yml b/dockers/grafana/docker-compose.yml index 9501315..1756a75 100644 --- a/dockers/grafana/docker-compose.yml +++ b/dockers/grafana/docker-compose.yml @@ -25,15 +25,24 @@ services: networks: - monitoringNet - pflogsumm-exporter: + pflogsumm-exporter-postfix: build: ./pflogsumm-exporter restart: unless-stopped - container_name: pflogsumm-exporter + container_name: pflogsumm-exporter-postfix volumes: - /kaz/dockers/postfix/pflogsumm:/var/lib/pflogsumm:rw networks: - monitoringNet + pflogsumm-exporter-sympa: + build: ./pflogsumm-exporter + restart: unless-stopped + container_name: pflogsumm-exporter-sympa + volumes: + - /kaz/dockers/sympa/pflogsumm:/var/lib/pflogsumm:rw + networks: + - monitoringNet + grafana: image: grafana/grafana:13.2.2 restart: unless-stopped diff --git a/dockers/grafana/prometheus/prometheus.yml b/dockers/grafana/prometheus/prometheus.yml index eb0168d..3f7644b 100644 --- a/dockers/grafana/prometheus/prometheus.yml +++ b/dockers/grafana/prometheus/prometheus.yml @@ -17,7 +17,20 @@ scrape_configs: static_configs: - targets: ["prometheus:9090"] + - job_name: docker-inventaire + static_configs: + - targets: ["docker-inventaire:9911"] + + - job_name: 'pflogsumm-postfix' + static_configs: + - targets: + - pflogsumm-exporter-postfix:9912 + - job_name: 'pflogsumm-sympa' + static_configs: + - targets: + - pflogsumm-exporter-sympa:9912 + - job_name: cadvisor-prod1 scheme: "https" static_configs: @@ -65,6 +78,22 @@ scrape_configs: labels: host: 'kazkouil' portainer_id: 5 + + - job_name: cadvisor-kazimodo + scheme: "https" + static_configs: + - targets: ["cadvisor-kazimodo.kaz.bzh:443"] + labels: + host: 'kazimodo' + portainer_id: 12 + + - job_name: cadvisor-kazier + scheme: "https" + static_configs: + - targets: ["cadvisor-kazier.kaz.bzh:443"] + labels: + host: 'kazier' + portainer_id: 13 - job_name: node-exporter-prod1 static_configs: @@ -102,3 +131,16 @@ scrape_configs: - targets: ["kazkouil.fr:9100"] labels: host: 'kazkouil' + + - job_name: node-exporter-kazimodo + static_configs: + - targets: ["kazimodo.kaz.bzh:9100"] + labels: + host: 'kazimodo' + + - job_name: node-exporter-kazier + static_configs: + - targets: ["kazier.kaz.bzh:9100"] + labels: + host: 'kazier' +