pkg/plugin/plugin.go: Introduce Object struct

All object related values (name, url, etc) are moved into this struct and used accordingly

cmd/channel/email/main.go

@@ -36,7 +36,7 @@ func (ch *Email) SendNotification(req *plugin.NotificationRequest) error {
 
 	var msg bytes.Buffer
 	_, _ = fmt.Fprintf(&msg, "To: %s\n", strings.Join(to, ","))
-	_, _ = fmt.Fprintf(&msg, "Subject: [#%d] %s %s is %s\n\n", req.Incident.Id, req.Event.Type, req.Incident.ObjectDisplayName, req.Event.Severity)
+	_, _ = fmt.Fprintf(&msg, "Subject: [#%d] %s %s is %s\n\n", req.Incident.Id, req.Event.Type, req.Object.Name, req.Event.Severity)
 
 	plugin.FormatMessage(&msg, req)
 

cmd/channel/rocketchat/main.go

@@ -22,7 +22,7 @@ func main() {
 
 func (ch *RocketChat) SendNotification(req *plugin.NotificationRequest) error {
 	var output bytes.Buffer
-	_, _ = fmt.Fprintf(&output, "[#%d] %s %s is %s\n\n", req.Incident.Id, req.Event.Type, req.Incident.ObjectDisplayName, req.Event.Severity)
+	_, _ = fmt.Fprintf(&output, "[#%d] %s %s is %s\n\n", req.Incident.Id, req.Event.Type, req.Object.Name, req.Event.Severity)
 
 	plugin.FormatMessage(&output, req)
 

internal/channel/examples/send-notification.json

@@ -13,17 +13,26 @@
         }
       ]
     },
+    "object": {
+      "name": "httpd",
+      "url": "https://example.com/icingaweb2/icingadb/service?name=httpd&host.name=www1",
+      "tags": {
+        "host": "www1",
+        "service": "httpd"
+      },
+      "extra_tags": {
+        "hostgroup/server": null
+      }
+    },
     "incident": {
       "id": 22,
-      "object_display_name": "httpd"
+      "url": "https://example.com/icingaweb2/notifications/incident?id=22"
     },
     "event": {
-      "url": "https://example.com/icingaweb2/icingadb/service?name=httpd&host.name=www1",
       "type": "state",
       "severity": "crit",
       "message": "Service is down"
-    },
-    "icingaweb2_url": "https://example.com/icingaweb2/"
+    }
   },
   "id": 2020
 }

internal/channel/plugin.go

@@ -9,6 +9,7 @@ import (
 	"github.com/icinga/icinga-notifications/internal/recipient"
 	"github.com/icinga/icinga-notifications/pkg/plugin"
 	"github.com/icinga/icinga-notifications/pkg/rpc"
+	"strings"
 )
 
 func (c *Channel) GetInfo() (*plugin.Info, error) {
@@ -38,18 +39,29 @@ func (c *Channel) SendNotification(contact *recipient.Contact, i contracts.Incid
 		contactStruct.Addresses = append(contactStruct.Addresses, &plugin.Address{Type: addr.Type, Address: addr.Address})
 	}
 
+	if !strings.HasSuffix(icingaweb2Url, "/") {
+		icingaweb2Url = icingaweb2Url + "/"
+	}
+
 	req := plugin.NotificationRequest{
-		Contact:  contactStruct,
-		Incident: &plugin.Incident{Id: i.ID(), ObjectDisplayName: i.ObjectDisplayName()},
+		Contact: contactStruct,
+		Object: &plugin.Object{
+			Name:      i.ObjectDisplayName(),
+			Url:       ev.URL,
+			Tags:      ev.Tags,
+			ExtraTags: ev.ExtraTags,
+		},
+		Incident: &plugin.Incident{
+			Id:  i.ID(),
+			Url: fmt.Sprintf("%snotifications/incident?id=%d\n", icingaweb2Url, i.ID()),
+		},
 		Event: &plugin.Event{
 			Time:     ev.Time,
-			URL:      ev.URL,
 			Type:     ev.Type,
 			Severity: ev.Severity.String(),
 			Username: ev.Username,
 			Message:  ev.Message,
 		},
-		IcingaWeb2Url: icingaweb2Url,
 	}
 
 	params, err := json.Marshal(req)

pkg/plugin/plugin.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"log"
 	"os"
-	"strings"
 	"sync"
 	"time"
 )
@@ -34,25 +33,31 @@ type Address struct {
 	Address string `json:"address"`
 }
 
+type Object struct {
+	Name      string            `json:"name"`
+	Url       string            `json:"url"`
+	Tags      map[string]string `json:"tags"`
+	ExtraTags map[string]string `json:"extra_tags"`
+}
+
 type Incident struct {
-	Id                int64  `json:"id"`
-	ObjectDisplayName string `json:"object_display_name"`
+	Id  int64  `json:"id"`
+	Url string `json:"url"`
 }
 
 type Event struct {
 	Time     time.Time `json:"time"`
-	URL      string    `json:"url"`
 	Type     string    `json:"type"`
 	Severity string    `json:"severity"`
 	Username string    `json:"username"`
 	Message  string    `json:"message"`
 }
 
 type NotificationRequest struct {
-	Contact       *Contact  `json:"contact"`
-	Incident      *Incident `json:"incident"`
-	Event         *Event    `json:"event"`
-	IcingaWeb2Url string    `json:"icingaweb2_url"`
+	Contact  *Contact  `json:"contact"`
+	Object   *Object   `json:"object"`
+	Incident *Incident `json:"incident"`
+	Event    *Event    `json:"event"`
 }
 
 type Plugin interface {
@@ -124,14 +129,18 @@ func FormatMessage(writer io.Writer, req *NotificationRequest) {
 	if req.Event.Username != "" {
 		_, _ = fmt.Fprintf(writer, "\nCommented by %s\n\n", req.Event.Username)
 	}
+	_, _ = fmt.Fprintf(writer, "Object: %s\n\n", req.Object.Url)
+	_, _ = writer.Write([]byte("Tags:\n"))
+	for k, v := range req.Object.Tags {
+		_, _ = fmt.Fprintf(writer, "%s: %s\n", k, v)
+	}
 
-	_, _ = writer.Write([]byte(req.Event.URL + "\n\n"))
-	incidentUrl := req.IcingaWeb2Url
-	if strings.HasSuffix(incidentUrl, "/") {
-		incidentUrl = fmt.Sprintf("Incident: %snotifications/incident?id=%d\n", req.IcingaWeb2Url, req.Incident.Id)
-	} else {
-		incidentUrl = fmt.Sprintf("Incident: %s/notifications/incident?id=%d\n", req.IcingaWeb2Url, req.Incident.Id)
+	if len(req.Object.ExtraTags) > 0 {
+		_, _ = writer.Write([]byte("\nExtra Tags:\n"))
+		for k, v := range req.Object.ExtraTags {
+			_, _ = fmt.Fprintf(writer, "%s: %s\n", k, v)
+		}
 	}
 
-	_, _ = writer.Write([]byte(incidentUrl))
+	_, _ = fmt.Fprintf(writer, "Incident: %s", req.Incident.Url)
 }