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

Makefile

@@ -1,9 +1,9 @@
 ################################
-# Makefile pour eole-prometheus
+# Makefile pour XXX-XXX
 ################################
 
 SOURCE=eole-prometheus
-VERSION=0.0.1
+VERSION=0.1
 EOLE_VERSION=2.7
 EOLE_RELEASE=2.7.0
 PKGAPPS=non

tmpl/alert-rules.yml

@@ -39,12 +39,3 @@ groups:
         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)
-      > 50
-    annotations:
-      description: This device's cpu temperature has exceeded the threshold with a value
-        of {{ $value }}.
-      summary: Instance {{ $labels.instance }} CPU temperature is dangerously high
-

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
@@ -81,7 +81,6 @@ route:
     - match:
         %%{sroute.alSubRouteMatchSource}: %%alSubRouteMatchValue
       receiver: %%alSubRouteMatchReceiver
-      continue: true
       %end if
     %end for
   %end if
@@ -90,16 +89,14 @@ route:
   - match:
       %%{rt.alRouteMatchSource}: %%{rt.alRouteMatchValue}
     receiver: %%rt.alRouteMatchReceiver
-    continue: true
 
   %if not %%is_empty('alSubRoute')
+    routes:
     %for sroute in %%getVar('alSubRoute',[])
       %if %%sroute == %%rt
-    routes:
     - match:
         %%{sroute.alSubRouteMatchSource}: %%{sroute.alSubRouteMatchValue}
       receiver: %%sroute.alSubRouteMatchReceiver
-      continue: true
       %end if
     %end for
   %end if