From 74cde8ae8d6dc4288871f4a3463bc200ca56a8e4 Mon Sep 17 00:00:00 2001 From: Sergey Khokhlov Date: Sat, 6 May 2023 17:09:05 +0300 Subject: [PATCH] fix(alerting): use same email subject for trigger and resolution alert (#465) --- alerting/provider/email/email.go | 5 ++--- alerting/provider/email/email_test.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/alerting/provider/email/email.go b/alerting/provider/email/email.go index e16f8e37..5d250a31 100644 --- a/alerting/provider/email/email.go +++ b/alerting/provider/email/email.go @@ -67,12 +67,11 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert, // buildMessageSubjectAndBody builds the message subject and body func (provider *AlertProvider) buildMessageSubjectAndBody(endpoint *core.Endpoint, alert *alert.Alert, result *core.Result, resolved bool) (string, string) { - var subject, message, results string + var message, results string + subject := fmt.Sprintf("[%s] Alert triggered", endpoint.DisplayName()) if resolved { - subject = fmt.Sprintf("[%s] Alert resolved", endpoint.DisplayName()) message = fmt.Sprintf("An alert for %s has been resolved after passing successfully %d time(s) in a row", endpoint.DisplayName(), alert.SuccessThreshold) } else { - subject = fmt.Sprintf("[%s] Alert triggered", endpoint.DisplayName()) message = fmt.Sprintf("An alert for %s has been triggered due to having failed %d time(s) in a row", endpoint.DisplayName(), alert.FailureThreshold) } for _, conditionResult := range result.ConditionResults { diff --git a/alerting/provider/email/email_test.go b/alerting/provider/email/email_test.go index e409ca05..f954f099 100644 --- a/alerting/provider/email/email_test.go +++ b/alerting/provider/email/email_test.go @@ -83,7 +83,7 @@ func TestAlertProvider_buildRequestBody(t *testing.T) { Provider: AlertProvider{}, Alert: alert.Alert{Description: &secondDescription, SuccessThreshold: 5, FailureThreshold: 3}, Resolved: true, - ExpectedSubject: "[endpoint-name] Alert resolved", + ExpectedSubject: "[endpoint-name] Alert triggered", ExpectedBody: "An alert for endpoint-name has been resolved after passing successfully 5 time(s) in a row\n\nAlert description: description-2\n\nCondition results:\n✅ [CONNECTED] == true\n✅ [STATUS] == 200\n", }, }