simplifie la conf prometheus

dockers/grafana/docker-compose.yml

@@ -10,24 +10,24 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     command:
-      - "--web.route-prefix=/"
-      - "--web.external-url=https://prometheus.${domain}"
+#      - "--web.route-prefix=/"
+#      - "--web.external-url=https://prometheus.${domain}"
       - "--config.file=/etc/prometheus/prometheus.yml"
       - "--storage.tsdb.path=/prometheus"
       - "--web.console.libraries=/usr/share/prometheus/console_libraries"
       - "--web.console.templates=/usr/share/prometheus/consoles"
     networks:
       - traefikNet
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.prometheus-secure.entrypoints=websecure"
-      - "traefik.http.middlewares.prometheus-stripprefix.stripprefix.prefixes=/prometheus"
-      - "traefik.http.routers.prometheus-secure.rule=Host(`prometheus.${domain}`)"
-      # - "traefik.http.routers.prometheus-secure.tls=true"
-      - "traefik.http.routers.prometheus-secure.middlewares=prometheus-stripprefix,test-adminiallowlist@file,traefik-auth"
-      - "traefik.http.routers.prometheus-secure.service=prometheus"
-      - "traefik.http.services.prometheus.loadbalancer.server.port=9090"
-      - "traefik.docker.network=traefikNet"
+#    labels:
+#      - "traefik.enable=true"
+#      - "traefik.http.routers.prometheus-secure.entrypoints=websecure"
+#      - "traefik.http.middlewares.prometheus-stripprefix.stripprefix.prefixes=/prometheus"
+#      - "traefik.http.routers.prometheus-secure.rule=Host(`prometheus.${domain}`)"
+#      # - "traefik.http.routers.prometheus-secure.tls=true"
+#      - "traefik.http.routers.prometheus-secure.middlewares=prometheus-stripprefix,test-adminiallowlist@file,traefik-auth"
+#      - "traefik.http.routers.prometheus-secure.service=prometheus"
+#      - "traefik.http.services.prometheus.loadbalancer.server.port=9090"
+#      - "traefik.docker.network=traefikNet"
 
   grafana:
     image: grafana/grafana:11.6.0

dockers/grafana/prometheus/prometheus.yml

@@ -13,15 +13,37 @@ scrape_configs:
   #    - targets: ['reverse-proxy:8080']
 
   - job_name: prometheus
-     static_configs:
-       - targets: ["prometheus:9090"]
+    static_configs:
+      - targets: ["prometheus:9090"]
 
   - job_name: cadvisor
     scrape_interval: 30s
     scheme: "https"
     static_configs:
-      - targets: ['cadvisor.kazkouil.fr:443', "cadvisor-prod1.kaz.bzh:443","cadvisor-prod2.kaz.bzh:443","cadvisor-kazoulet.kaz.bzh:443","cadvisor-tykaz.kaz.bzh:443","cadvisor-kazguel.kaz.bzh:443"]
+      - targets: ["cadvisor-prod1.kaz.bzh:443"]
+        labels: 
+          host: 'prod1'
+          
+      - targets: ["cadvisor-prod2.kaz.bzh:443"]
+        labels: 
+          host: 'prod2'
+          
+      - targets: ["cadvisor-kazoulet.kaz.bzh:443"]
+        labels: 
+          host: 'kazoulet'
+          
+      - targets: ["cadvisor-tykaz.kaz.bzh:443"]
+        labels: 
+          host: 'tykaz'
+          
+      - targets: ["cadvisor-kazguel.kaz.bzh:443"]
+        labels: 
+          host: 'kazguel'
+          
+      - targets: ["cadvisor.kazkouil.fr:443"]
+        labels: 
+          host: 'kazkouil'
           
   - job_name: node-exporter
     static_configs:
-      - targets: [ 'kazkouil.fr:9100',"prod1.kaz.bzh:9100","prod2.kaz.bzh:9100","kazoulet.kaz.bzh:9100","tykaz.kaz.bzh:9100","kazguel.kaz.bzh:9100" ]
+      - targets: ["prod1.kaz.bzh:9100","prod2.kaz.bzh:9100","kazoulet.kaz.bzh:9100","tykaz.kaz.bzh:9100","kazguel.kaz.bzh:9100","kazkouil.fr:9100"]