printer collector: Use ENUM pattern for printer status (prometheus-co…

…mmunity#1500)
anubhavg-icpl · Jul 23, 2024 · 0399933 · 0399933
1 parent bf59ca7
commit 0399933
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/pkg/collector/printer/printer.go b/pkg/collector/printer/printer.go
@@ -158,17 +158,21 @@ func (c *collector) collectPrinterStatus(ch chan<- prometheus.Metric) error {
 			continue
 		}
 
-		printerStatus, ok := printerStatusMap[printer.PrinterStatus]
-		if !ok {
-			printerStatus = "Unknown"
+		for printerStatus, printerStatusName := range printerStatusMap {
+			isCurrentStatus := 0.0
+			if printerStatus == printer.PrinterStatus {
+				isCurrentStatus = 1.0
+			}
+
+			ch <- prometheus.MustNewConstMetric(
+				c.printerStatus,
+				prometheus.GaugeValue,
+				isCurrentStatus,
+				printer.Name,
+				printerStatusName,
+			)
 		}
-		ch <- prometheus.MustNewConstMetric(
-			c.printerStatus,
-			prometheus.GaugeValue,
-			1,
-			printer.Name,
-			printerStatus,
-		)
+
 		ch <- prometheus.MustNewConstMetric(
 			c.printerJobCount,
 			prometheus.CounterValue,

diff --git a/pkg/collector/scheduled_task/scheduled_task.go b/pkg/collector/scheduled_task/scheduled_task.go
@@ -9,12 +9,13 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
 	"github.com/prometheus/client_golang/prometheus"
 )