refactor: reduce ipmi log

flashcatcloud · Jun 13, 2024 · d92ad58 · d92ad58
1 parent beda1a1
commit d92ad58
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/inputs/ipmi/exporter/collector_ipmi.go b/inputs/ipmi/exporter/collector_ipmi.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
+	cfg "flashcat.cloud/categraf/config"
 	"flashcat.cloud/categraf/inputs/ipmi/exporter/freeipmi"
 )
 
@@ -167,11 +168,13 @@ func (c IPMICollector) Collect(result freeipmi.Result, ch chan<- prometheus.Metr
 		case "N/A":
 			state = math.NaN()
 		default:
-			log.Println("msg", "Unknown sensor state", "target", targetHost, "state", data.State)
+			log.Println("W!", "Unknown sensor state", "target", targetHost, "state", data.State)
 			state = math.NaN()
 		}
 
-		log.Println("msg", "Got values", "target", targetHost, "data", fmt.Sprintf("%+v", data))
+		if cfg.Config.DebugMode {
+			log.Println("D!", "Got values", "target", targetHost, "data", fmt.Sprintf("%+v", data))
+		}
 
 		switch data.Unit {
 		case "RPM":

diff --git a/inputs/ipmi/exporter/collector_notwindows.go b/inputs/ipmi/exporter/collector_notwindows.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
+	cfg "flashcat.cloud/categraf/config"
 	"flashcat.cloud/categraf/inputs/ipmi/exporter/freeipmi"
 )
 
@@ -84,7 +85,10 @@ func Collect(ch chan<- prometheus.Metric, host, binPath string, config IPMIConfi
 	start := time.Now()
 	defer func() {
 		duration := time.Since(start).Seconds()
-		log.Println("msg", "Scrape duration", "target", targetName(host), "duration", duration)
+
+		if cfg.Config.DebugMode {
+			log.Println("D!", "Scrape duration", "target", targetName(host), "duration", duration)
+		}
 		ch <- prometheus.MustNewConstMetric(
 			durationDesc,
 			prometheus.GaugeValue,
@@ -99,7 +103,9 @@ func Collect(ch chan<- prometheus.Metric, host, binPath string, config IPMIConfi
 
 	for _, collector := range config.GetCollectors() {
 		var up int
-		log.Println("msg", "Running collector", "target", target.host, "collector", collector.Name())
+		if cfg.Config.DebugMode {
+			log.Println("D!", "Running collector", "target", target.host, "collector", collector.Name())
+		}
 
 		fqcmd := path.Join(binPath, collector.Cmd())
 		args := collector.Args()

diff --git a/inputs/ipmi/exporter/freeipmi/freeipmi.go b/inputs/ipmi/exporter/freeipmi/freeipmi.go
@@ -31,6 +31,8 @@ import (
 	"strconv"
 	"strings"
 	"syscall"
+
+	cfg "flashcat.cloud/categraf/config"
 )
 
 var (
@@ -152,7 +154,10 @@ func Execute(cmd string, args []string, config string, target string) Result {
 		args = append(args, "-h", target)
 	}
 
-	log.Println("msg", "Executing", "command", cmd, "args", fmt.Sprintf("%+v", args))
+	if cfg.Config.DebugMode {
+		log.Println("D!", "Executing", "command", cmd, "args", fmt.Sprintf("%+v", args))
+	}
+
 	out, err := exec.Command(cmd, args...).CombinedOutput()
 	if err != nil {
 		err = fmt.Errorf("error running %s: %s", cmd, err)