From 0a0df3bc58531a2035132fabbb51a3e1f9724e5e Mon Sep 17 00:00:00 2001 From: Eeshan Garg Date: Tue, 16 Apr 2019 21:23:42 -0230 Subject: [PATCH] webhooks/zabbix: Improve message formatting and punctuation. --- zerver/webhooks/zabbix/tests.py | 2 +- zerver/webhooks/zabbix/view.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zerver/webhooks/zabbix/tests.py b/zerver/webhooks/zabbix/tests.py index 95a6277249..4600c54ae7 100644 --- a/zerver/webhooks/zabbix/tests.py +++ b/zerver/webhooks/zabbix/tests.py @@ -15,7 +15,7 @@ class ZabbixHookTests(WebhookTestCase): Tests if zabbix alert is handled correctly """ expected_topic = u"www.example.com" - expected_message = u"PROBLEM (Average) alert on [www.example.com](https://zabbix.example.com/tr_events.php?triggerid=14032&eventid=10528).\nZabbix agent on www.example.com is unreachable for 5 minutes\nAgent ping is Up (1)" + expected_message = u"PROBLEM (Average) alert on [www.example.com](https://zabbix.example.com/tr_events.php?triggerid=14032&eventid=10528):\n* Zabbix agent on www.example.com is unreachable for 5 minutes\n* Agent ping is Up (1)" self.send_and_test_stream_message('zabbix_alert', expected_topic, expected_message) def test_zabbix_invalid_payload_with_missing_data(self) -> None: diff --git a/zerver/webhooks/zabbix/view.py b/zerver/webhooks/zabbix/view.py index 1b53e37945..52c2c6f79d 100644 --- a/zerver/webhooks/zabbix/view.py +++ b/zerver/webhooks/zabbix/view.py @@ -20,7 +20,11 @@ need further help! """ ZABBIX_TOPIC_TEMPLATE = '{hostname}' -ZABBIX_MESSAGE_TEMPLATE = '{status} ({severity}) alert on [{hostname}]({link}).\n{trigger}\n{item}' +ZABBIX_MESSAGE_TEMPLATE = """ +{status} ({severity}) alert on [{hostname}]({link}): +* {trigger} +* {item} +""".strip() @api_key_only_webhook_view('Zabbix') @has_request_variables