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

This commit is contained in:
Philippe Caseiro 2018-06-11 15:45:40 +02:00
commit 24332a98c8
1 changed files with 10 additions and 2 deletions

View File

@ -44,12 +44,20 @@ scrape_configs:
scrape_interval: %%{job.scrpInterval}s scrape_interval: %%{job.scrpInterval}s
scrape_timeout: %%{job.scrpTimeout}s scrape_timeout: %%{job.scrpTimeout}s
scheme: %%job.scrpScheme scheme: %%job.scrpScheme
%for %%target in %%getVar('prOpenTarg',[]) %set first = True
static_configs: static_configs:
- targets: [ %slurp
%for %%target in %%getVar('prOpenTarg',[])
%if %%target.prOpenTargJob == %%job %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 if
%end for %end for
]
%end for %end for
%if %%getVar('activerAlertmanager','non') == 'oui' %if %%getVar('activerAlertmanager','non') == 'oui'