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

tmpl/prometheus.yml

@@ -44,12 +44,20 @@ scrape_configs:
     scrape_interval: %%{job.scrpInterval}s
     scrape_timeout: %%{job.scrpTimeout}s
     scheme: %%job.scrpScheme
-  %for %%target in %%getVar('prOpenTarg',[])
+  %set first = True
     static_configs:
+      - targets: [ %slurp
+  %for %%target in %%getVar('prOpenTarg',[])
     %if %%target.prOpenTargJob == %%job
-      - targets: [ "%%target.prOpenTargIP:%%target.prOpenTargPort" ]
+       %if %%first
+"%%target.prOpenTargIP:%%target.prOpenTargPort"%slurp
+          %set first = False
+       %else
+, "%%target.prOpenTargIP:%%target.prOpenTargPort"%slurp
+       %end if
     %end if
   %end for
+ ]
 %end for
 
 %if %%getVar('activerAlertmanager','non') == 'oui'