Replace log.Printf in Plugin#Send() methods with a proper logging

Author: yhabteab

internal/channel/email.go

@@ -7,7 +7,6 @@ import (
 	"github.com/icinga/icinga-notifications/internal/contracts"
 	"github.com/icinga/icinga-notifications/internal/event"
 	"github.com/icinga/icinga-notifications/internal/recipient"
-	"log"
 	"net"
 	"net/smtp"
 	"os"
@@ -58,8 +57,6 @@ func NewEMail(config string) (Plugin, error) {
 }
 
 func (e *EMail) Send(contact *recipient.Contact, incident contracts.Incident, event *event.Event, icingaweb2Url string) error {
-	log.Printf("email: contact=%v incident=%v event=%v", contact, incident, event)
-
 	var to []string
 	for _, address := range contact.Addresses {
 		if address.Type == "email" {
@@ -82,8 +79,6 @@ func (e *EMail) Send(contact *recipient.Contact, incident contracts.Incident, ev
 		return err
 	}
 
-	log.Printf("Successfully sent mail to user %s\n", contact.FullName)
-
 	return nil
 }
 

internal/channel/rocketchat.go

@@ -8,7 +8,6 @@ import (
 	"github.com/icinga/icinga-notifications/internal/contracts"
 	"github.com/icinga/icinga-notifications/internal/event"
 	"github.com/icinga/icinga-notifications/internal/recipient"
-	"log"
 	"net/http"
 	"time"
 )
@@ -33,8 +32,6 @@ func NewRocketChat(config string) (Plugin, error) {
 }
 
 func (r *RocketChat) Send(contact *recipient.Contact, incident contracts.Incident, event *event.Event, icingaweb2Url string) error {
-	log.Printf("rocketchat: contact=%v incident=%v event=%v", contact, incident, event)
-
 	var output bytes.Buffer
 	_, _ = fmt.Fprintf(&output, "[#%d] %s %s is %s\n\n", incident.ID(), event.Type, incident.ObjectDisplayName(), event.Severity.String())
 
@@ -86,7 +83,5 @@ func (r *RocketChat) Send(contact *recipient.Contact, incident contracts.Inciden
 		return errors.New(resp.Status)
 	}
 
-	log.Printf("Successfully sent a rocketchat message to user %s\n", contact.FullName)
-
 	return nil
 }

internal/incident/incident.go

@@ -473,6 +473,10 @@ func (i *Incident) notifyContacts(ev *event.Event, causedBy types.Int) error {
 				i.logger.Errorw("Failed to send via channel", zap.String("type", chType), zap.Error(err))
 				continue
 			}
+
+			i.logger.Infow(
+				"Successfully sent a message via channel", zap.String("type", chType), zap.String("contact", contact.String()),
+			)
 		}
 	}