notifications: Reintroduce Extra Tags

This reverts commit 89dce8b and adds
ExtraTags to event.Event, which was not yet imported here at the time of
the commit.

Author: oxzi

notifications/event/event.go

@@ -26,6 +26,9 @@ type Event struct {
 	// For hosts: {"host": "host_name"} and for services: {"host": "host_name", "service": "service_name"}.
 	Tags map[string]string `json:"tags"`
 
+	// ExtraTags supplement Tags, for example with host or service groups for an Icinga DB source.
+	ExtraTags map[string]string `json:"extra_tags"`
+
 	// Type indicates the type of the event.
 	Type Type `json:"type"`
 	// Severity of the event.

notifications/event/event_test.go

@@ -21,6 +21,7 @@ func TestEvent(t *testing.T) {
 				Name:         "TestEvent",
 				URL:          "/icingadb/service?name=https%20ssl%20v3.0%20compatibility%20IE%206.0&host.name=example%20host",
 				Tags:         map[string]string{"tag1": "value1"},
+				ExtraTags:    map[string]string{},
 				Type:         TypeState,
 				Severity:     SeverityOK,
 				Username:     "testuser",
@@ -37,6 +38,7 @@ func TestEvent(t *testing.T) {
 					"name":"TestEvent",
 					"url":"/icingadb/service?name=https%20ssl%20v3.0%20compatibility%20IE%206.0&host.name=example%20host",
 					"tags":{"tag1":"value1"},
+					"extra_tags":{},
 					"type":"state",
 					"severity":"ok",
 					"username":"testuser",

notifications/plugin/plugin.go

@@ -133,6 +133,9 @@ type Object struct {
 
 	// Tags defining this Object, may be "host" and "service" when from Icinga 2.
 	Tags map[string]string `json:"tags"`
+
+	// ExtraTags attached, may be a host or service groups when form Icinga 2.
+	ExtraTags map[string]string `json:"extra_tags"`
 }
 
 // Incident of this NotificationRequest, grouping Events for this Object.
@@ -300,6 +303,13 @@ func FormatMessage(writer io.Writer, req *NotificationRequest) {
 		_, _ = fmt.Fprintf(writer, "%s: %s\n", k, v)
 	}
 
+	if len(req.Object.ExtraTags) > 0 {
+		_, _ = writer.Write([]byte("\nExtra Tags:\n"))
+		for k, v := range utils.IterateOrderedMap(req.Object.ExtraTags) {
+			_, _ = fmt.Fprintf(writer, "%s: %s\n", k, v)
+		}
+	}
+
 	_, _ = fmt.Fprintf(writer, "\nIncident: %s", req.Incident.Url)
 }