From 2ab9afabc96d64e6fa604c084bd74af9b18a4521 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Thu, 7 Dec 2023 07:39:31 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E2=80=94=20Use=20alerts=20config?= =?UTF-8?q?=20in=20handle=5Falert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argos/server/alerting.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/argos/server/alerting.py b/argos/server/alerting.py index 31d4006..6a71cf9 100644 --- a/argos/server/alerting.py +++ b/argos/server/alerting.py @@ -15,8 +15,12 @@ from argos.schemas.config import Config, Mail, GotifyUrl def handle_alert(config: Config, result, task, severity, request): """Dispatch alert through configured alert channels""" - msg = f"task={task.id}, status={result.status}, {severity=}" - logger.error("Alerting stub: %s", msg) + + if 'local' in getattr(config.general.alerts, severity): + logger.error("Alerting stub: task=%i, status=%s, severity=%s", + task.id, + result.status, + severity) if config.general.mail is not None or \ config.general.gotify is not None: @@ -31,9 +35,11 @@ Time: {result.submitted_at} See results of task on {request.url_for('get_task_results', task_id=task.id)} """ - if config.general.mail is not None: + if config.general.mail is not None and \ + 'mail' in getattr(config.general.alerts, severity): notify_by_mail(subject, msg, config.general.mail) - if config.general.gotify is not None: + if config.general.gotify is not None and \ + 'gotify' in getattr(config.general.alerts, severity): notify_with_gotify(subject, msg, severity, config.general.gotify)