Merge pull request #20 from mcktr/feature/perfdata-output

Implement performance data output

cmd/check_fritz/check_connection.go

@@ -2,6 +2,9 @@ package main
 
 import (
 	"fmt"
+	"strconv"
+
+	"github.com/mcktr/check_fritz/pkg/perfdata"
 
 	"github.com/mcktr/check_fritz/pkg/fritz"
 )
@@ -53,7 +56,15 @@ func CheckConnectionUptime(aI ArgumentInformation) {
 		return
 	}
 
-	fmt.Print("OK - Connection Uptime: " + resp.NewUptime + "\n")
+	uptime, err := strconv.ParseFloat(resp.NewUptime, 64)
+
+	if HandleError(err) {
+		return
+	}
+
+	perfData := perfdata.CreatePerformanceData("uptime", uptime, "s")
+
+	fmt.Print("OK - Connection Uptime: " + fmt.Sprintf("%.f", uptime) + " " + perfData.GetPerformanceDataAsString() + "\n")
 
 	GlobalReturnCode = exitOk
 }

cmd/check_fritz/check_device.go

@@ -2,8 +2,10 @@ package main
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/mcktr/check_fritz/pkg/fritz"
+	"github.com/mcktr/check_fritz/pkg/perfdata"
 )
 
 // CheckDeviceUptime checks the uptime of the device
@@ -24,7 +26,15 @@ func CheckDeviceUptime(aI ArgumentInformation) {
 		return
 	}
 
-	fmt.Print("OK - Device Uptime: " + resp.NewUpTime + "\n")
+	uptime, err := strconv.ParseFloat(resp.NewUpTime, 64)
+
+	if HandleError(err) {
+		return
+	}
+
+	perfData := perfdata.CreatePerformanceData("uptime", uptime, "s")
+
+	fmt.Print("OK - Device Uptime: " + fmt.Sprintf("%.0f", uptime) + " " + perfData.GetPerformanceDataAsString() + "\n")
 
 	GlobalReturnCode = exitOk
 }

cmd/check_fritz/check_downstream.go

@@ -5,6 +5,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/mcktr/check_fritz/pkg/perfdata"
+
 	"github.com/mcktr/check_fritz/pkg/fritz"
 	"github.com/mcktr/check_fritz/pkg/thresholds"
 )
@@ -29,6 +31,7 @@ func CheckDownstreamMax(aI ArgumentInformation) {
 	}
 
 	downstream, err := strconv.ParseFloat(resp.NewMaxDS, 64)
+	perfData := perfdata.CreatePerformanceData("downstream_max", downstream, "")
 
 	if HandleError(err) {
 		return
@@ -38,6 +41,14 @@ func CheckDownstreamMax(aI ArgumentInformation) {
 
 	GlobalReturnCode = exitOk
 
+	if thresholds.GetThresholdsStatus(aI.Warning) {
+		perfData.SetWarning(aI.Warning)
+	}
+
+	if thresholds.GetThresholdsStatus(aI.Critical) {
+		perfData.SetCritical(aI.Critical)
+	}
+
 	if thresholds.CheckLower(aI.Warning, downstream) {
 		GlobalReturnCode = exitWarning
 	}
@@ -46,13 +57,15 @@ func CheckDownstreamMax(aI ArgumentInformation) {
 		GlobalReturnCode = exitCritical
 	}
 
+	output := " - Max Downstream: " + fmt.Sprintf("%.2f", downstream) + " Mbit/s " + perfData.GetPerformanceDataAsString()
+
 	switch GlobalReturnCode {
 	case exitOk:
-		fmt.Print("OK - Max Downstream: " + fmt.Sprintf("%.2f", downstream) + " Mbit/s \n")
+		fmt.Print("OK" + output + "\n")
 	case exitWarning:
-		fmt.Print("WARNING - Max Downstream " + fmt.Sprintf("%.2f", downstream) + " Mbit/s\n")
+		fmt.Print("WARNING" + output + "\n")
 	case exitCritical:
-		fmt.Print("CRITICAL - Max Downstream: " + fmt.Sprintf("%.2f", downstream) + " Mbit/s \n")
+		fmt.Print("CRITICAL" + output + "\n")
 	default:
 		GlobalReturnCode = exitUnknown
 		fmt.Print("UNKNWON - Not able to calculate maximum downstream\n")
@@ -87,9 +100,18 @@ func CheckDownstreamCurrent(aI ArgumentInformation) {
 	}
 
 	downstream = downstream * 8 / 1000000
+	perfData := perfdata.CreatePerformanceData("downstream_current", downstream, "")
 
 	GlobalReturnCode = exitOk
 
+	if thresholds.GetThresholdsStatus(aI.Warning) {
+		perfData.SetWarning(aI.Warning)
+	}
+
+	if thresholds.GetThresholdsStatus(aI.Critical) {
+		perfData.SetCritical(aI.Critical)
+	}
+
 	if thresholds.CheckUpper(aI.Warning, downstream) {
 		GlobalReturnCode = exitWarning
 	}
@@ -98,13 +120,15 @@ func CheckDownstreamCurrent(aI ArgumentInformation) {
 		GlobalReturnCode = exitCritical
 	}
 
+	output := " - Current Downstream: " + fmt.Sprintf("%.2f", downstream) + " Mbit/s \n " + perfData.GetPerformanceDataAsString()
+
 	switch GlobalReturnCode {
 	case exitOk:
-		fmt.Print("OK - Current Downstream: " + fmt.Sprintf("%.2f", downstream) + " Mbit/s \n")
+		fmt.Print("OK" + output + "\n")
 	case exitWarning:
-		fmt.Print("WARNING - Current Downstream " + fmt.Sprintf("%.2f", downstream) + " Mbit/s\n")
+		fmt.Print("WARNING" + output + "\n")
 	case exitCritical:
-		fmt.Print("CRITICAL - Current Downstream: " + fmt.Sprintf("%.2f", downstream) + " Mbit/s \n")
+		fmt.Print("CRITICAL" + output + "\n")
 	default:
 		GlobalReturnCode = exitUnknown
 		fmt.Print("UNKNWON - Not able to calculate current downstream\n")

cmd/check_fritz/check_smart.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/mcktr/check_fritz/pkg/perfdata"
+
 	"github.com/mcktr/check_fritz/pkg/fritz"
 	"github.com/mcktr/check_fritz/pkg/thresholds"
 )
@@ -40,17 +42,27 @@ func CheckSmartThermometer(aI ArgumentInformation) {
 	}
 
 	currentTemp = currentTemp / 10.0
+	perfData := perfdata.CreatePerformanceData("temperature", currentTemp, "")
 
 	GlobalReturnCode = exitOk
 
+	if thresholds.GetThresholdsStatus(aI.Warning) {
+		perfData.SetWarning(aI.Warning)
+	}
+
+	if thresholds.GetThresholdsStatus(aI.Critical) {
+		perfData.SetCritical(aI.Critical)
+	}
+
 	if thresholds.CheckLower(aI.Warning, currentTemp) {
 		GlobalReturnCode = exitWarning
 	}
 
 	if thresholds.CheckLower(aI.Critical, currentTemp) {
 		GlobalReturnCode = exitCritical
 	}
-	output := "- " + resp.NewProductName + " " + resp.NewFirmwareVersion + " - " + resp.NewDeviceName + " " + resp.NewPresent + " " + fmt.Sprintf("%.2f", currentTemp) + " °C"
+
+	output := "- " + resp.NewProductName + " " + resp.NewFirmwareVersion + " - " + resp.NewDeviceName + " " + resp.NewPresent + " " + fmt.Sprintf("%.2f", currentTemp) + " °C " + perfData.GetPerformanceDataAsString()
 
 	switch GlobalReturnCode {
 	case exitOk:
@@ -85,6 +97,7 @@ func CheckSmartSocketPower(aI ArgumentInformation) {
 	}
 
 	currentPower, err := strconv.ParseFloat(resp.NewMultimeterPower, 64)
+	perfData := perfdata.CreatePerformanceData("power", currentPower, "")
 
 	if HandleError(err) {
 		return
@@ -94,6 +107,14 @@ func CheckSmartSocketPower(aI ArgumentInformation) {
 
 	GlobalReturnCode = exitOk
 
+	if thresholds.GetThresholdsStatus(aI.Warning) {
+		perfData.SetWarning(aI.Warning)
+	}
+
+	if thresholds.GetThresholdsStatus(aI.Critical) {
+		perfData.SetCritical(aI.Critical)
+	}
+
 	if thresholds.CheckUpper(aI.Warning, currentPower) {
 		GlobalReturnCode = exitWarning
 	}
@@ -102,7 +123,7 @@ func CheckSmartSocketPower(aI ArgumentInformation) {
 		GlobalReturnCode = exitCritical
 	}
 
-	output := "- " + resp.NewProductName + " " + resp.NewFirmwareVersion + " - " + resp.NewDeviceName + " " + resp.NewPresent + " " + fmt.Sprintf("%.2f", currentPower) + " W"
+	output := "- " + resp.NewProductName + " " + resp.NewFirmwareVersion + " - " + resp.NewDeviceName + " " + resp.NewPresent + " " + fmt.Sprintf("%.2f", currentPower) + " W " + perfData.GetPerformanceDataAsString()
 
 	switch GlobalReturnCode {
 	case exitOk:
@@ -143,9 +164,18 @@ func CheckSmartSocketEnergy(aI ArgumentInformation) {
 	}
 
 	currentEnergy = currentEnergy / 1000.0
+	perfData := perfdata.CreatePerformanceData("energy", currentEnergy, "")
 
 	GlobalReturnCode = exitOk
 
+	if thresholds.GetThresholdsStatus(aI.Warning) {
+		perfData.SetWarning(aI.Warning)
+	}
+
+	if thresholds.GetThresholdsStatus(aI.Critical) {
+		perfData.SetCritical(aI.Critical)
+	}
+
 	if thresholds.CheckUpper(aI.Warning, currentEnergy) {
 		GlobalReturnCode = exitWarning
 	}
@@ -154,7 +184,7 @@ func CheckSmartSocketEnergy(aI ArgumentInformation) {
 		GlobalReturnCode = exitCritical
 	}
 
-	output := "- " + resp.NewProductName + " " + resp.NewFirmwareVersion + " - " + resp.NewDeviceName + " " + resp.NewPresent + " " + fmt.Sprintf("%.2f", currentEnergy) + " kWh"
+	output := "- " + resp.NewProductName + " " + resp.NewFirmwareVersion + " - " + resp.NewDeviceName + " " + resp.NewPresent + " " + fmt.Sprintf("%.2f", currentEnergy) + " kWh " + perfData.GetPerformanceDataAsString()
 
 	switch GlobalReturnCode {
 	case exitOk:

cmd/check_fritz/check_upstream.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/mcktr/check_fritz/pkg/fritz"
+	"github.com/mcktr/check_fritz/pkg/perfdata"
 	"github.com/mcktr/check_fritz/pkg/thresholds"
 )
 
@@ -35,9 +36,17 @@ func CheckUpstreamMax(aI ArgumentInformation) {
 	}
 
 	upstream = upstream * 8 / 1000000
+	perfData := perfdata.CreatePerformanceData("upstream_max", upstream, "")
 
 	GlobalReturnCode = exitOk
 
+	if thresholds.GetThresholdsStatus(aI.Warning) {
+		perfData.SetWarning(aI.Warning)
+	}
+
+	if thresholds.GetThresholdsStatus(aI.Critical) {
+		perfData.SetCritical(aI.Critical)
+	}
 	if thresholds.CheckLower(aI.Warning, upstream) {
 		GlobalReturnCode = exitWarning
 	}
@@ -46,13 +55,15 @@ func CheckUpstreamMax(aI ArgumentInformation) {
 		GlobalReturnCode = exitCritical
 	}
 
+	output := " - Max Upstream: " + fmt.Sprintf("%.2f", upstream) + " Mbit/s " + perfData.GetPerformanceDataAsString()
+
 	switch GlobalReturnCode {
 	case exitOk:
-		fmt.Print("OK - Max Upstream: " + fmt.Sprintf("%.2f", upstream) + " Mbit/s \n")
+		fmt.Print("OK" + output + "\n")
 	case exitWarning:
-		fmt.Print("WARNING - Max Upstream " + fmt.Sprintf("%.2f", upstream) + " Mbit/s\n")
+		fmt.Print("WARNING" + output + "\n")
 	case exitCritical:
-		fmt.Print("CRITICAL - Max Upstream: " + fmt.Sprintf("%.2f", upstream) + " Mbit/s \n")
+		fmt.Print("CRITICAL" + output + "\n")
 	default:
 		GlobalReturnCode = exitUnknown
 		fmt.Print("UNKNWON - Not able to calculate maximum upstream\n")
@@ -87,9 +98,18 @@ func CheckUpstreamCurrent(aI ArgumentInformation) {
 	}
 
 	upstream = upstream * 8 / 1000000
+	perfData := perfdata.CreatePerformanceData("upstream_current", upstream, "")
 
 	GlobalReturnCode = exitOk
 
+	if thresholds.GetThresholdsStatus(aI.Warning) {
+		perfData.SetWarning(aI.Warning)
+	}
+
+	if thresholds.GetThresholdsStatus(aI.Critical) {
+		perfData.SetCritical(aI.Critical)
+	}
+
 	if thresholds.CheckUpper(aI.Warning, upstream) {
 		GlobalReturnCode = exitWarning
 	}
@@ -98,13 +118,15 @@ func CheckUpstreamCurrent(aI ArgumentInformation) {
 		GlobalReturnCode = exitCritical
 	}
 
+	output := " - Current Upstream: " + fmt.Sprintf("%.2f", upstream) + " Mbit/s \n " + perfData.GetPerformanceDataAsString()
+
 	switch GlobalReturnCode {
 	case exitOk:
-		fmt.Print("OK - Current Upstream: " + fmt.Sprintf("%.2f", upstream) + " Mbit/s \n")
+		fmt.Print("OK" + output + "\n")
 	case exitWarning:
-		fmt.Print("WARNING - Current Upstream " + fmt.Sprintf("%.2f", upstream) + " Mbit/s\n")
+		fmt.Print("WARNING" + output + "\n")
 	case exitCritical:
-		fmt.Print("CRITICAL - Current Upstream: " + fmt.Sprintf("%.2f", upstream) + " Mbit/s \n")
+		fmt.Print("CRITICAL" + output + "\n")
 	default:
 		GlobalReturnCode = exitUnknown
 		fmt.Print("UNKNWON - Not able to calculate current upstream\n")

pkg/perfdata/perfdata.go

@@ -0,0 +1,52 @@
+package perfdata
+
+import "fmt"
+
+// PerformanceData is the data structure for check performance data
+type PerformanceData struct {
+	Label    string
+	Value    float64
+	UOM      string
+	Warning  string
+	Critical string
+	Minimum  string
+	Maximum  string
+}
+
+// CreatePerformanceData creates and returns a new PerformanceData object
+func CreatePerformanceData(Label string, Value float64, UOM string) *PerformanceData {
+	var pd PerformanceData
+
+	pd.Label = Label
+	pd.Value = Value
+	pd.UOM = UOM
+
+	return &pd
+}
+
+// SetWarning sets the warning value of a PerformanceData object
+func (pd *PerformanceData) SetWarning(Warning float64) {
+	pd.Warning = fmt.Sprintf("%f", Warning)
+
+}
+
+// SetCritical sets the critical value of a PerformanceData object
+func (pd *PerformanceData) SetCritical(Critical float64) {
+	pd.Critical = fmt.Sprintf("%f", Critical)
+
+}
+
+// SetMinimum sets the minimum value of a PerformanceData object
+func (pd *PerformanceData) SetMinimum(Minimum float64) {
+	pd.Minimum = fmt.Sprintf("%f", Minimum)
+}
+
+// SetMaximum sets the maximum value of a PerformanceData object
+func (pd *PerformanceData) SetMaximum(Maximum float64) {
+	pd.Maximum = fmt.Sprintf("%f", Maximum)
+}
+
+// GetPerformanceDataAsString returns a PerformanceData object as formatted string
+func (pd *PerformanceData) GetPerformanceDataAsString() string {
+	return fmt.Sprintf("| '%s'=%f%s;%s;%s;%s;%s", pd.Label, pd.Value, pd.UOM, pd.Warning, pd.Critical, pd.Minimum, pd.Maximum)
+}