Merge branch 'master' into dist/eole/2.6.2/master

tmpl/alertmanager.yml

@@ -4,11 +4,11 @@ global:
   %if %%tls_smtp == "non"
   smtp_smarthost: '%%exim_relay_smtp:25'
   %elif %%tls_smtp == "port 25"
-  smtp_smarthost: '%%exim_relay_smtp:25'
-  smtp_require_tls: true
-  %else
-  smtp_smarthost: '%%exim_relay_smtp:465'
-  smtp_require_tls: true
+    smtp_smarthost: '%%exim_relay_smtp:25'
+    smtp_require_tls: true
+    %else
+    smtp_smarthost: '%%exim_relay_smtp:465'
+    smtp_require_tls: true
   %end if
   smtp_from: '%%system_mail_from'
 %else

tmpl/prometheus.yml

@@ -22,7 +22,7 @@ scrape_configs:
 
   - job_name: '%%job_name_node'
     file_sd_configs:
-      - files: [ "%%job_file_config/*.yml" ]
+#      - files: [ "%%job_file_config/*.yml" ]
 %if %%getVar('addTargetPrometheus','non') == 'oui'
     static_configs:
         - targets: [ "%%adresse_ip_eth0:9100"%slurp