[alerting] Add target ip to available alert fields. (#548)

Also remove duplicate template constant in alerting.go.
cloudprober · Oct 5, 2023 · a8b0282 · a8b0282
1 parent 7d836a9
commit a8b0282
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/probes/alerting/alerting.go b/probes/alerting/alerting.go
@@ -31,20 +31,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-const (
-	DefaultDashboardURLTemplate = "http://localhost:9313/status?probe=@probe@"
-	DefaultSummaryTemplate      = "Cloudprober alert @alert@ for @target@"
-	DefaultDetailsTemplate      = `Cloudprober alert "@alert@" for "@target@":
-
-Failures: @failures@ out of @total@ probes
-Failing since: @since@
-Probe: @probe@
-Dashboard: @dashboard_url@
-Playbook: @playbook_url@
-Condition ID: @condition_id@
-`
-)
-
 type targetState struct {
 	lastSuccess int64
 	lastTotal   int64

diff --git a/probes/alerting/notifier/notifier.go b/probes/alerting/notifier/notifier.go
@@ -84,6 +84,10 @@ func (n *Notifier) alertFields(alertInfo *AlertInfo) (map[string]string, error)
 		fields["target.label."+k] = v
 	}
 
+	if alertInfo.Target.IP != nil {
+		fields["target_ip"] = alertInfo.Target.IP.String()
+	}
+
 	alertJSON, err := json.Marshal(fields)
 	if err != nil {
 		return nil, fmt.Errorf("error marshalling alert fields into json: %v", err)

diff --git a/probes/alerting/notifier/notifier_test.go b/probes/alerting/notifier/notifier_test.go
@@ -16,6 +16,7 @@ package notifier
 
 import (
 	"context"
+	"net"
 	"net/smtp"
 	"testing"
 	"time"
@@ -28,6 +29,7 @@ import (
 func TestAlertFields(t *testing.T) {
 	testTarget := endpoint.Endpoint{
 		Name: "test-target",
+		IP:   net.ParseIP("10.11.12.13"),
 		Labels: map[string]string{
 			"apptype":  "backend",
 			"language": "go",
@@ -55,12 +57,13 @@ func TestAlertFields(t *testing.T) {
 				"probe":                 "test-probe",
 				"condition_id":          "122333444",
 				"target":                "test-target",
+				"target_ip":             "10.11.12.13",
 				"failures":              "8",
 				"total":                 "12",
 				"since":                 "0001-01-01T00:00:01Z",
 				"target.label.apptype":  "backend",
 				"target.label.language": "go",
-				"json":                  `{"alert":"test-alert","condition_id":"122333444","failures":"8","probe":"test-probe","since":"0001-01-01T00:00:01Z","target":"test-target","target.label.apptype":"backend","target.label.language":"go","total":"12"}`,
+				"json":                  `{"alert":"test-alert","condition_id":"122333444","failures":"8","probe":"test-probe","since":"0001-01-01T00:00:01Z","target":"test-target","target.label.apptype":"backend","target.label.language":"go","target_ip":"10.11.12.13","total":"12"}`,
 				"summary":               "Cloudprober alert test-alert for test-target",
 				"details":               "Cloudprober alert \"test-alert\" for \"test-target\":\n\nFailures: 8 out of 12 probes\nFailing since: 0001-01-01T00:00:01Z\nProbe: test-probe\nDashboard: @dashboard_url@\nPlaybook: \nCondition ID: 122333444\n",
 				"playbook_url":          "",