diff --git a/dicos/70_prometheus.xml b/dicos/70_prometheus.xml index 27fddb9..39d96d2 100644 --- a/dicos/70_prometheus.xml +++ b/dicos/70_prometheus.xml @@ -122,7 +122,8 @@ Configuration du serveur Prometheus Configuration SMTP pour l'envois des alertes Destinatires - Rêgles de distribution + Rêgles de distribution simples + Rêgles de distribution regexp Sous-rêgles de distribution @@ -165,6 +166,12 @@ ['Node Exporter','Port'] + + non + alSMTPUser + alSMTPPass + + non prometheus @@ -172,6 +179,7 @@ prometheus activer_grafana + non grafana diff --git a/tmpl/alertmanager.yml b/tmpl/alertmanager.yml index 9f716cc..d230571 100644 --- a/tmpl/alertmanager.yml +++ b/tmpl/alertmanager.yml @@ -51,7 +51,7 @@ route: - match_re: %%{route.alRouteMatchRegExpSource}: %%{route.alRouteMatchRegExp} receiver: %%route.alRouteMatchRegxpRecv - %if not is_empty('alSubRoute') + %if not %%is_empty('alSubRoute') routes: %for sroute in %%getVar('alSubRoute',[]) # The service has a sub-route for critical alerts, any alerts @@ -70,7 +70,7 @@ route: %%{rt.alRouteMatchSource}: %%{rt.alRouteMatchValue} receiver: %%rt.alRouteMatchReceiver - %if not is_empty('alSubRoute') + %if not %%is_empty('alSubRoute') routes: %for sroute in %%getVar('alSubRoute',[]) %if %%sroute == %%rt