From b4ff9a35fd1a3024f5f4633b9152281eb7f156ed Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 26 Jun 2018 12:06:05 +0200 Subject: [PATCH] modification gestion smtpTLS et correctif chemin invalide --- tmpl/alertmanager.yml | 10 +++++----- tmpl/prometheus.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tmpl/alertmanager.yml b/tmpl/alertmanager.yml index 9e6917e..10332c5 100644 --- a/tmpl/alertmanager.yml +++ b/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 diff --git a/tmpl/prometheus.yml b/tmpl/prometheus.yml index 87a0b79..f305d20 100644 --- a/tmpl/prometheus.yml +++ b/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