diff options
| author |  JustAnotherArchivist | 2021-12-07 06:34:34 +0000 |
|---|---|---|
| committer | JustAnotherArchivist | 2021-12-07 06:34:34 +0000 |
| commit | e9a9b745990cfcef4c096ae13e9ca46ec6855aa5 (patch) | |
| tree | e98af092f11e7a20324a1bad1b90dcb3e16fd468 | |
| parent | Switch licence from GPLv3+ to AGPLv3+ (diff) | |
| signature | ||
Replace LF with two spaces
Grafana v8.0.0 and newer (AlertingNG) changed the message format and sends a multi-line string.
| -rw-r--r-- | contrib/modules/grafana.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/modules/grafana.py b/contrib/modules/grafana.py index 75025ce..2fde817 100644 --- a/contrib/modules/grafana.py +++ b/contrib/modules/grafana.py @@ -5,6 +5,7 @@ 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 and obj['evalMatches'] else '' if 'message' in obj: - return f'{obj["title"]} - {obj["message"]}{evalMatchesStr}' + message = obj['message'].replace('\n', ' ') + return f'{obj["title"]} - {message}{evalMatchesStr}' else: return f'{obj["title"]}{evalMatchesStr}' |