Added warning and critical to disk check

inexio · Mar 8, 2021 · 21d8a4d · 21d8a4d
1 parent 32e4623
commit 21d8a4d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/cmd/check_disk.go b/cmd/check_disk.go
@@ -8,6 +8,9 @@ import (
 func init() {
 	addDeviceFlags(checkDiskCMD)
 	checkCMD.AddCommand(checkDiskCMD)
+
+	checkDiskCMD.Flags().Float64("warning", 0, "warning threshold for free disk space")
+	checkDiskCMD.Flags().Float64("critical", 0, "critical threshold for free disk space")
 }
 
 var checkDiskCMD = &cobra.Command{
@@ -18,6 +21,7 @@ var checkDiskCMD = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		r := request.CheckDiskRequest{
 			CheckDeviceRequest: getCheckDeviceRequest(args[0]),
+			DiskThresholds:     generateCheckThresholds(cmd, "warning", "", "critical", ""),
 		}
 		handleRequest(&r)
 	},

diff --git a/cmd/check_memory_usage.go b/cmd/check_memory_usage.go
@@ -10,7 +10,7 @@ func init() {
 	checkCMD.AddCommand(checkMemoryUsage)
 
 	checkMemoryUsage.Flags().Float64("warning", 0, "warning threshold for memory usage")
-	checkMemoryUsage.Flags().Float64("critical", 0, "critical threshold for system voltage")
+	checkMemoryUsage.Flags().Float64("critical", 0, "critical threshold for memory usage")
 }
 
 var checkMemoryUsage = &cobra.Command{

diff --git a/core/request/check_disk_request_process.go b/core/request/check_disk_request_process.go
@@ -4,7 +4,9 @@ package request
 
 import (
 	"context"
+	"fmt"
 	"github.com/inexio/go-monitoringplugin"
+	"github.com/inexio/thola/core/value"
 )
 
 func (r *CheckDiskRequest) process(ctx context.Context) (Response, error) {
@@ -27,12 +29,27 @@ func (r *CheckDiskRequest) process(ctx context.Context) (Response, error) {
 					r.mon.PrintPerformanceData(false)
 					return &CheckResponse{r.mon.GetInfo()}, nil
 				}
+
 				p = monitoringplugin.NewPerformanceDataPoint("disk_used", *storage.Used, "KB").SetLabel(*storage.Description)
 				err = r.mon.AddPerformanceDataPoint(p)
 				if r.mon.UpdateStatusOnError(err, monitoringplugin.UNKNOWN, "error while adding performance data point", true) {
 					r.mon.PrintPerformanceData(false)
 					return &CheckResponse{r.mon.GetInfo()}, nil
 				}
+
+				// get percentage of free part on the storage
+				free := fmt.Sprintf("%.2f", 100-float64(*storage.Used)/float64(*storage.Available)*100)
+				p = monitoringplugin.NewPerformanceDataPoint("disk_free", free, "%").SetLabel(*storage.Description)
+				err = r.mon.AddPerformanceDataPoint(p)
+				if r.mon.UpdateStatusOnError(err, monitoringplugin.UNKNOWN, "error while adding performance data point", true) {
+					r.mon.PrintPerformanceData(false)
+					return &CheckResponse{r.mon.GetInfo()}, nil
+				}
+				val := value.New(free)
+				if !r.DiskThresholds.isEmpty() {
+					code := r.DiskThresholds.checkValue(val)
+					r.mon.UpdateStatusIf(code != monitoringplugin.OK, code, fmt.Sprintf("disk usage at %s is %s%%", *storage.Description, val))
+				}
 			}
 		}
 	}