Drop Event.Type & Event.Username fields

Author: yhabteab

notifications/event/event.go

@@ -30,12 +30,8 @@ type Event struct {
 	// For hosts: {"host": "host_name"} and for services: {"host": "host_name", "service": "service_name"}.
 	Tags map[string]string `json:"tags"`
 
-	// Type indicates the type of the event.
-	Type Type `json:"type"`
 	// Severity of the event.
 	Severity Severity `json:"severity,omitempty"`
-	// Username is the name of the user who triggered the event.
-	Username string `json:"username"`
 	// Message is a human-readable message describing the event.
 	Message string `json:"message"`
 

notifications/event/event_test.go

@@ -98,9 +98,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"},
-				Type:              TypeState,
 				Severity:          SeverityOK,
-				Username:          "testuser",
 				Message:           "Test",
 				CompleteRelations: []string{"relation1", "relation2"},
 				Relations: map[string]any{
@@ -117,9 +115,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"},
-					"type":"state",
 					"severity":"ok",
-					"username":"testuser",
 					"message":"Test",
 					"complete_relations":["relation1", "relation2"],
 					"relations":{"relation1":"relation1","relation2":"relation2"}
@@ -131,12 +127,10 @@ func TestEvent(t *testing.T) {
 			t.Parallel()
 
 			event := &Event{
-				Name:     "TestEvent",
-				URL:      "https://example.com/icingaweb2/icingadb/service?name=https%20ssl%20v3.0%20compatibility%20IE%206.0&host.name=example%20host",
-				Tags:     map[string]string{"tag1": "value1"},
-				Type:     TypeMute,
-				Username: "testuser",
-				Message:  "Test",
+				Name:    "TestEvent",
+				URL:     "https://example.com/icingaweb2/icingadb/service?name=https%20ssl%20v3.0%20compatibility%20IE%206.0&host.name=example%20host",
+				Tags:    map[string]string{"tag1": "value1"},
+				Message: "Test",
 			}
 
 			data, err := json.Marshal(event)

notifications/event/type.go

@@ -160,12 +160,6 @@ type Event struct {
 	// Time when this event occurred, being encoded according to RFC 3339 when passed as JSON.
 	Time time.Time `json:"time"`
 
-	// Type of this event, e.g., a "state" change, "mute" or "unmute". See further ./internal/event/event.go
-	Type event.Type `json:"type"`
-
-	// Username may contain a user triggering this event, depending on the event's source.
-	Username string `json:"username"`
-
 	// Message of this event, might be a check output when the related Object is an Icinga 2 object.
 	Message string `json:"message"`
 }
@@ -291,19 +285,10 @@ func RunPlugin(plugin Plugin) {
 // The created message is a multi-line message as one might expect it in an email.
 func FormatMessage(writer io.Writer, req *NotificationRequest) {
 	if req.Event.Message != "" {
-		msgTitle := "Comment"
-		if req.Event.Type == event.TypeState {
-			msgTitle = "Output"
-		}
-
-		_, _ = fmt.Fprintf(writer, "%s: %s\n\n", msgTitle, req.Event.Message)
+		_, _ = fmt.Fprintf(writer, "Message: %s\n\n", req.Event.Message)
 	}
 
 	_, _ = fmt.Fprintf(writer, "When: %s\n\n", req.Event.Time.Format("2006-01-02 15:04:05 MST"))
-
-	if req.Event.Username != "" {
-		_, _ = fmt.Fprintf(writer, "Author: %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 utils.IterateOrderedMap(req.Object.Tags) {
@@ -319,18 +304,8 @@ func FormatMessage(writer io.Writer, req *NotificationRequest) {
 
 // FormatSubject returns the formatted subject string based on the event type.
 func FormatSubject(req *NotificationRequest) string {
-	switch req.Event.Type {
-	case event.TypeState:
-		return fmt.Sprintf("[#%d] %s %s is %s", req.Incident.Id, req.Event.Type, req.Object.Name, req.Incident.Severity)
-	case event.TypeAcknowledgementCleared, event.TypeDowntimeRemoved:
-		if req.Incident != nil {
-			return fmt.Sprintf("[#%d] %s from %s", req.Incident.Id, req.Event.Type, req.Object.Name)
-		}
-		return fmt.Sprintf("%s from %s", req.Event.Type, req.Object.Name)
-	default:
-		if req.Incident != nil {
-			return fmt.Sprintf("[#%d] %s on %s", req.Incident.Id, req.Event.Type, req.Object.Name)
-		}
-		return fmt.Sprintf("%s on %s", req.Event.Type, req.Object.Name)
+	if req.Incident != nil {
+		return fmt.Sprintf("[#%d] %s is %s", req.Incident.Id, req.Object.Name, req.Incident.Severity)
 	}
+	return req.Object.Name
 }