Merge branch 'develop' into dist/eole/2.7.0/develop

tmpl/alert-rules.yml

@@ -34,21 +34,11 @@ groups:
   - alert: filesystem_threshold_exceeded
     expr: node_filesystem_avail{job="%%{job_name_node}",mountpoint="/"} / node_filesystem_size{job="%%{job_name_node}"}
       * 100 < 20
-    for: 2m
     annotations:
       description: This device's filesystem usage has exceeded the threshold with
         a value of {{ $value }}.
       summary: Instance {{ $labels.instance }} filesystem usage is dangerously high
 
-  # Heavy "/var" use
-  - alert: var_filesystem_threshold_exceeded
-    expr: node_filesystem_avail{job="node",mountpoint="/var"} / node_filesystem_size{job="node"}
-      * 100 < 20
-    annotations:
-      description: This device's filesystem usage has exceeded the threshold with
-        a value of {{ $value }}.
-      summary: Instance {{ $labels.instance }} filesystem usage is dangerously high
-  
   # Heavy CPU temperature
   - alert: cpu_temp_threshold_exceeded
     expr: avg(node_hwmon_temp_celsius{job="node"}) BY (instance)

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