Add icinga service command

Author: uubk

Makefile

@@ -1,3 +1,3 @@
 build:
-	go build -i -v -ldflags="-X main.gitversion=$(shell git describe --always --long --dirty)" 
+	go build -i -v -ldflags="-X main.gitversion=$(shell git describe --always --long --dirty)"
 	strip sendmsg

icinga_host.go icinga.go

@@ -7,63 +7,88 @@ import (
 	"time"
 	"github.com/sirupsen/logrus"
 	"strconv"
+	"strings"
 )
 
 var icGoodState = map[string]bool {
 	"UP": true,
+	"OK": true,
 }
 
 var icBadState = map[string]bool {
 	"UNREACHABLE": true,
 	"DOWN": true,
+	"CRITICAL": true,
 }
 
-type icingaHostCmd struct {
+var icWarnState = map[string]bool {
+	"WARNING": true,
+}
+
+type icingaCmd struct {
 	SimpleCFGLocation *string
-	icHostname *string
-	icHostV4 *string
-	icHostV6 *string
-	icHostState *string
-	icHostNotfnType *string
-	icHostCheckOutput *string
-	icHostNotfnUser *string
-	icHostNotfnComment *string
-	icURL *string
+	// Shared fields
+	icHostname     *string
+	icHostV4       *string
+	icHostV6       *string
+	icCheckState   *string
+	icCheckOutput  *string
+	icNotfnType    *string
+	icNotfnUser    *string
+	icNotfnComment *string
+	icURL          *string
+	// Service-only fields
+	icServiceName *string
+	icServiceDisplayName *string
 	// Fields below are unused currently but need to be parsed in order to be compliant
 	icDateTime *string
 	icHostDisplayname *string
 	icUserEmail *string
 	icMailFrom *string
 	icToSyslog *string
+	// Which command are we executing?
+	icIsServiceCMD bool
 }
 
-func (this *icingaHostCmd) Init(flagSet *flag.FlagSet) {
+func (this *icingaCmd) Init(flagSet *flag.FlagSet, isServiceCMD bool) {
 	this.SimpleCFGLocation = flagSet.String("cfg", "/etc/sendmsg.yml", "Path to sendmsg config")
 	this.icHostname = flagSet.String("l", "", "Hostname")
 	this.icHostV4 = flagSet.String("4", "", "Host address (v4)")
 	this.icHostV6 = flagSet.String("6", "", "Host address (v6)")
-	this.icHostState = flagSet.String("s", "", "Host state")
-	this.icHostNotfnType = flagSet.String("t", "", "Notification type")
-	this.icHostCheckOutput = flagSet.String("o", "", "Check output")
-	this.icHostNotfnUser = flagSet.String("b", "", "Manual host notification user")
-	this.icHostNotfnComment = flagSet.String("c", "", "Manual host notification comment")
+	this.icCheckState = flagSet.String("s", "", "Host state")
+	this.icNotfnType = flagSet.String("t", "", "Notification type")
+	this.icCheckOutput = flagSet.String("o", "", "Check output")
+	this.icNotfnUser = flagSet.String("b", "", "Manual notification user")
+	this.icNotfnComment = flagSet.String("c", "", "Manual notification comment")
 	this.icURL = flagSet.String("i", "", "URL of Webinterface")
 	this.icDateTime = flagSet.String("d", "", "Date/Time of event")
 	this.icHostDisplayname = flagSet.String("n", "", "Host display name")
 	this.icUserEmail = flagSet.String("r", "", "User email")
 	this.icMailFrom = flagSet.String("f", "", "Sender email")
 	this.icToSyslog = flagSet.String("v", "", "Send to syslog")
+	this.icIsServiceCMD = isServiceCMD
+	if isServiceCMD {
+		this.icServiceName = flagSet.String("e", "", "Service name")
+		this.icServiceDisplayName = flagSet.String("u", "", "Service display name")
+	}
 }
 
-func (this *icingaHostCmd) Parse() Message {
+func (this *icingaCmd) Parse() Message {
 	var msg Message
 
-	msg.Body_title = *this.icHostname + " is " + *this.icHostState
+	if this.icIsServiceCMD {
+		msg.Body_title = *this.icServiceName + " is " + *this.icCheckState
+	} else {
+		msg.Body_title = *this.icHostname + " is " + *this.icCheckState
+	}
 
 	addFieldToMessage(&msg, true, "IPv4", this.icHostV4)
 	addFieldToMessage(&msg, true, "IPv6", this.icHostV6)
-	addFieldToMessage(&msg, true, "Notification type", this.icHostNotfnType)
-	addFieldToMessage(&msg, true, "Notification user", this.icHostNotfnUser)
+	addFieldToMessage(&msg, true, "Notification type", this.icNotfnType)
+	addFieldToMessage(&msg, true, "Notification user", this.icNotfnUser)
+	if this.icIsServiceCMD {
+		addFieldToMessage(&msg, true, "Host", this.icHostname)
+	}
 	timestamp, err := time.Parse("2006-01-02 15:04:05 -0700", *this.icDateTime)
 	if err != nil {
 		logrus.WithFields(logrus.Fields{
@@ -77,29 +102,40 @@ func (this *icingaHostCmd) Parse() Message {
 	var buffer bytes.Buffer
 
 	buffer.WriteString("```\n")
-	buffer.WriteString(*this.icHostCheckOutput)
+	buffer.WriteString(*this.icCheckOutput)
 	buffer.WriteString("```\n")
-	if *this.icHostNotfnComment != "" {
+	if *this.icNotfnComment != "" {
 		buffer.WriteString("Comment: ")
-		buffer.WriteString(*this.icHostNotfnComment)
+		buffer.WriteString(*this.icNotfnComment)
 	}
 	msg.Body = buffer.String()
 
 	if *this.icURL != "" {
 		params := url.Values{}
 		params.Add("host", *this.icHostname)
-		msg.Body_link = *this.icURL + "/monitoring/host/show?"+ params.Encode()
+		if this.icIsServiceCMD {
+			params.Add("service", *this.icServiceName)
+			msg.Body_link = *this.icURL + "/monitoring/service/show?"+ strings.Replace(params.Encode(), "+", "%20", -1)
+		} else {
+			msg.Body_link = *this.icURL + "/monitoring/host/show?"+ strings.Replace(params.Encode(), "+", "%20", -1)
+		}
 	}
 
-	if icBadState[*this.icHostState] {
+	if icBadState[*this.icCheckState] {
 		msg.Color = "#ff5566"
-	} else if icGoodState[*this.icHostState] {
+	} else if icGoodState[*this.icCheckState] {
 		msg.Color = "#44bb77"
+	} else if icWarnState[*this.icCheckState] {
+		msg.Color = "#ffaa44"
 	} else {
 		msg.Color = "#aa44ff"
 	}
 
-	msg.Frontend = "Icinga2 Host Notification"
+	if this.icIsServiceCMD {
+		msg.Frontend = "Icinga2 Service Notification"
+	} else {
+		msg.Frontend = "Icinga2 Host Notification"
+	}
 	msg.FrontendIconURL = "https://raw.githubusercontent.com/Icinga/icingaweb2/master/public/img/favicon.png"
 
 	return msg

sendmsg.go

@@ -20,11 +20,15 @@ func main() {
 
 	// 'Icinga2' frontend - use this as a drop-in replacement for mails
 	icingaHostCommand := flag.NewFlagSet("icingaHost", flag.ExitOnError)
-	icingaHostCmd := icingaHostCmd{}
-	icingaHostCmd.Init(icingaHostCommand)
+	icingaServiceCommand := flag.NewFlagSet("icingaService", flag.ExitOnError)
+	icingaHostCmd := icingaCmd{}
+	icingaHostCmd.Init(icingaHostCommand, false)
+	icingaServiceCmd := icingaCmd{}
+	icingaServiceCmd.Init(icingaServiceCommand, true)
 
 	if len(os.Args) < 2 {
-		logrus.Fatal("Please use one of [simple, icingaHost]")
+		logrus.Fatal("Please specify a command [simple, icingaHost, icingaService]")
+		flag.PrintDefaults()
 	}
 
 	var cfglocation *string
@@ -37,6 +41,10 @@ func main() {
 		icingaHostCommand.Parse(os.Args[2:])
 		cfglocation = icingaHostCmd.SimpleCFGLocation
 		break
+	case "icingaService":
+		icingaServiceCommand.Parse(os.Args[2:])
+		cfglocation = icingaServiceCmd.SimpleCFGLocation
+		break
 	default:
 		flag.PrintDefaults()
 		return
@@ -59,6 +67,9 @@ func main() {
 	if icingaHostCommand.Parsed() {
 		msg = icingaHostCmd.Parse()
 	}
+	if icingaServiceCommand.Parsed() {
+		msg = icingaServiceCmd.Parse()
+	}
 
 	if msg.Body == "" || msg.Body_title == "" {
 		logrus.WithFields(logrus.Fields{