diff --git a/alerting/provider/email/email.go b/alerting/provider/email/email.go index 01dd3fd4..5093312e 100644 --- a/alerting/provider/email/email.go +++ b/alerting/provider/email/email.go @@ -143,10 +143,10 @@ func (provider *AlertProvider) Send(ep *endpoint.Endpoint, alert *alert.Alert, r func (provider *AlertProvider) buildMessageSubjectAndBody(ep *endpoint.Endpoint, alert *alert.Alert, result *endpoint.Result, resolved bool) (string, string) { var subject, message string if resolved { - subject = fmt.Sprintf("[%s] Alert resolved", ep.DisplayName()) + subject = fmt.Sprintf("%s: Alert resolved", ep.DisplayName()) message = fmt.Sprintf("An alert for %s has been resolved after passing successfully %d time(s) in a row", ep.DisplayName(), alert.SuccessThreshold) } else { - subject = fmt.Sprintf("[%s] Alert triggered", ep.DisplayName()) + subject = fmt.Sprintf("%s: Alert triggered", ep.DisplayName()) message = fmt.Sprintf("An alert for %s has been triggered due to having failed %d time(s) in a row", ep.DisplayName(), alert.FailureThreshold) } var formattedConditionResults string diff --git a/alerting/provider/email/email_test.go b/alerting/provider/email/email_test.go index 2e4c2aa6..9d34d2ee 100644 --- a/alerting/provider/email/email_test.go +++ b/alerting/provider/email/email_test.go @@ -86,7 +86,7 @@ func TestAlertProvider_buildRequestBody(t *testing.T) { Alert: alert.Alert{Description: &firstDescription, SuccessThreshold: 5, FailureThreshold: 3}, Resolved: false, Endpoint: &endpoint.Endpoint{Name: "endpoint-name"}, - ExpectedSubject: "[endpoint-name] Alert triggered", + ExpectedSubject: "endpoint-name: Alert triggered", ExpectedBody: "An alert for endpoint-name has been triggered due to having failed 3 time(s) in a row\n\nAlert description: description-1\n\nCondition results:\n❌ [CONNECTED] == true\n❌ [STATUS] == 200\n", }, { @@ -95,7 +95,7 @@ func TestAlertProvider_buildRequestBody(t *testing.T) { Alert: alert.Alert{Description: &secondDescription, SuccessThreshold: 5, FailureThreshold: 3}, Resolved: true, Endpoint: &endpoint.Endpoint{Name: "endpoint-name"}, - ExpectedSubject: "[endpoint-name] Alert resolved", + ExpectedSubject: "endpoint-name: Alert resolved", 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", }, { @@ -104,7 +104,7 @@ func TestAlertProvider_buildRequestBody(t *testing.T) { Alert: alert.Alert{Description: &firstDescription, SuccessThreshold: 5, FailureThreshold: 3}, Resolved: false, Endpoint: &endpoint.Endpoint{Name: "endpoint-name", ExtraLabels: map[string]string{"environment": "production"}}, - ExpectedSubject: "[endpoint-name] Alert triggered", + ExpectedSubject: "endpoint-name: Alert triggered", ExpectedBody: "An alert for endpoint-name has been triggered due to having failed 3 time(s) in a row\n\nAlert description: description-1\n\nExtra labels:\n environment: production\n\n\nCondition results:\n❌ [CONNECTED] == true\n❌ [STATUS] == 200\n", }, { @@ -113,7 +113,7 @@ func TestAlertProvider_buildRequestBody(t *testing.T) { Alert: alert.Alert{Description: &secondDescription, SuccessThreshold: 5, FailureThreshold: 3}, Resolved: true, Endpoint: &endpoint.Endpoint{Name: "endpoint-name", ExtraLabels: map[string]string{"service": "api"}}, - ExpectedSubject: "[endpoint-name] Alert resolved", + ExpectedSubject: "endpoint-name: Alert resolved", ExpectedBody: "An alert for endpoint-name has been resolved after passing successfully 5 time(s) in a row\n\nAlert description: description-2\n\nExtra labels:\n service: api\n\n\nCondition results:\n✅ [CONNECTED] == true\n✅ [STATUS] == 200\n", }, { @@ -122,7 +122,7 @@ func TestAlertProvider_buildRequestBody(t *testing.T) { Alert: alert.Alert{Description: &firstDescription, SuccessThreshold: 5, FailureThreshold: 3}, Resolved: false, Endpoint: &endpoint.Endpoint{Name: "endpoint-name", ExtraLabels: map[string]string{}}, - ExpectedSubject: "[endpoint-name] Alert triggered", + ExpectedSubject: "endpoint-name: Alert triggered", ExpectedBody: "An alert for endpoint-name has been triggered due to having failed 3 time(s) in a row\n\nAlert description: description-1\n\nCondition results:\n❌ [CONNECTED] == true\n❌ [STATUS] == 200\n", }, }