Browse Source

modification gestion smtpTLS et correctif chemin invalide

Vincent Febvre 11 months ago
parent
commit
b4ff9a35fd
2 changed files with 6 additions and 6 deletions
  1. 5
    5
      tmpl/alertmanager.yml
  2. 1
    1
      tmpl/prometheus.yml

+ 5
- 5
tmpl/alertmanager.yml View File

@@ -4,11 +4,11 @@ global:
4 4
   %if %%tls_smtp == "non"
5 5
   smtp_smarthost: '%%exim_relay_smtp:25'
6 6
   %elif %%tls_smtp == "port 25"
7
-  smtp_smarthost: '%%exim_relay_smtp:25'
8
-  smtp_require_tls: true
9
-  %else
10
-  smtp_smarthost: '%%exim_relay_smtp:465'
11
-  smtp_require_tls: true
7
+    smtp_smarthost: '%%exim_relay_smtp:25'
8
+    smtp_require_tls: true
9
+    %else
10
+    smtp_smarthost: '%%exim_relay_smtp:465'
11
+    smtp_require_tls: true
12 12
   %end if
13 13
   smtp_from: '%%system_mail_from'
14 14
 %else

+ 1
- 1
tmpl/prometheus.yml View File

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