From ffddc27d91fb69e7123f935bd4e3ed2ccfbd87df Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Sat, 21 Nov 2020 18:35:10 +0000 Subject: [PATCH] Include evalMatches in Grafana alerts if present --- contrib/modules/grafana.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/modules/grafana.py b/contrib/modules/grafana.py index 4209f76..e35806e 100644 --- a/contrib/modules/grafana.py +++ b/contrib/modules/grafana.py @@ -3,7 +3,8 @@ import json async def process(request): obj = json.loads(await request.text()) + evalMatchesStr = (': ' + ', '.join(f'{x["metric"]} = {x["value"]}' for x in obj['evalMatches'])) if 'evalMatches' in obj else '' if 'message' in obj: - return f'{obj["title"]} - {obj["message"]}' + return f'{obj["title"]} - {obj["message"]}{evalMatchesStr}' else: - return obj['title'] + return f'{obj["title"]}{evalMatchesStr}'