Cadoles
/
eole-prometheus
10
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

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

This commit is contained in:
vincent 2018-06-26 12:10:26 +02:00
parent eb7b7e48df b4ff9a35fd
commit db20f296ca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tmpl/alertmanager.yml
View File

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

2
tmpl/prometheus.yml
View File

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