From cede94635929e977550bcf34ddbdfd878ba049e9 Mon Sep 17 00:00:00 2001 From: Innokentii Konstantinov Date: Wed, 13 Jul 2022 14:54:53 +0400 Subject: [PATCH] Reshape webhook payload 1. Remove alert.title, alert.message, alert.image_url from webhook payload, they are deprecated. 2. Pass alert_group_id to webhook payload. --- engine/apps/alerts/models/custom_button.py | 5 +---- .../OutgoingWebhookForm/OutgoingWebhookForm.config.ts | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/engine/apps/alerts/models/custom_button.py b/engine/apps/alerts/models/custom_button.py index 9007c34f..0ecf1eae 100644 --- a/engine/apps/alerts/models/custom_button.py +++ b/engine/apps/alerts/models/custom_button.py @@ -118,11 +118,8 @@ class CustomButton(models.Model): elif self.data: rendered_data = Template(self.data).render( { - "alert_title": self._escape_string(alert.title), - "alert_message": self._escape_string(alert.message), - "alert_url": alert.link_to_upstream_details, "alert_payload": self._escape_alert_payload(alert.raw_request_data), - "alert_payload_json": json.dumps(alert.raw_request_data), + "alert_group_id": alert.group.public_primary_key, } ) post_kwargs["json"] = json.loads(rendered_data) diff --git a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts index c80813f8..76fecf4f 100644 --- a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts +++ b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts @@ -36,7 +36,7 @@ export const form: { name: string; fields: FormItem[] } = { name: 'data', getDisabled: (form_data) => Boolean(form_data.forward_whole_payload), type: FormItemType.TextArea, - description: 'Available variables: {{ alert_title }}, {{ alert_message }}, {{ alert_url }}, {{ alert_payload }}', + description: 'Available variables: {{ alert_payload }}, {{ alert_group_id }}', extra: { rows: 9, },