diff --git a/dicos/70_prometheus.xml b/dicos/70_prometheus.xml
index b511d1b..4fda90d 100644
--- a/dicos/70_prometheus.xml
+++ b/dicos/70_prometheus.xml
@@ -47,9 +47,19 @@
/etc/prometheus/nodes
+
+ non
+
+
+
+
+
+
+ Node Exporter
+
-
+
oui
@@ -63,19 +73,7 @@
http
-
- non
-
-
-
-
-
-
-
- Node Exporter
-
-
-
+
non
@@ -141,6 +139,7 @@
Services complèmentairse
Configuration du serveur Prometheus
+ Configuration des jobs standards
Configuration SMTP pour l'envois des alertes
Destinatires
Rêgles de distribution simples
@@ -155,6 +154,13 @@
alReceiverEmail
+
+ scrpInterval
+ scrpTimeout
+ honorLabels
+ scrpScheme
+
+
alRouteMatchSource
alRouteMatchValue
@@ -175,7 +181,6 @@
prTargIP
- prTargJob
prTargSonde
@@ -186,7 +191,7 @@
- ['Node Exporter','Port']
+ ['Node Exporter']
diff --git a/tmpl/prometheus.yml b/tmpl/prometheus.yml
index ba8a6a2..edefb87 100644
--- a/tmpl/prometheus.yml
+++ b/tmpl/prometheus.yml
@@ -26,25 +26,23 @@ scrape_configs:
%if %%getVar('addTargetPrometheus','non') == 'oui'
static_configs:
- targets: [ "%%adresse_ip_eth0:9100"%slurp
- %if %%getVar('ajout_client_prometheus','non') == 'oui'
- %for %%cliPr in %%getVar('prCli',[])
- %if %%cliPr.prCliSonde == 'Node Exporter'
-, '%%cliPr.prCliIP:9100'%slurp
+ %for %%cliPr in %%getVar('prTarg',[])
+ %if %%cliPr.prTargSonde == 'Node Exporter'
+, '%%cliPr.prTargIP:9100'%slurp
%end if
%end for
- %end if
]
%end if
-%for %%job in %%getVar['promJobs',[]]
+%for %%job in %%getVar('promJobs', [])
- job_name: '%%job'
%if %%job.honorLabels == 'oui'
honor_labels: true
%else
- honor_labels; false
+ honor_labels: false
%end if
- scrape_interval: %%job.scrpInterval
- scrape_timeout: %%job.scrpTimeout
+ scrape_interval: %%{job.scrpInterval}s
+ scrape_timeout: %%{job.scrpTimeout}s
scheme: %%job.scrpScheme
%for %%target in %%getVar('prOpenTarg',[])
static_configs: