Fix max clock metrics

collectors/iostatMetric.go

@@ -20,17 +20,18 @@ import (
 	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )
 
+// Konstante für den Pfad zu /proc/diskstats
 const IOSTATFILE = `/proc/diskstats`
 
 type IOstatCollectorConfig struct {
 	ExcludeMetrics []string `json:"exclude_metrics,omitempty"`
+	// Neues Feld zum Ausschließen von Devices per JSON-Konfiguration
 	ExcludeDevices []string `json:"exclude_devices,omitempty"`
 }
 
 type IOstatCollectorEntry struct {
-	currentValues map[string]int64
-	lastValues    map[string]int64
-	tags          map[string]string
+	lastValues map[string]int64
+	tags       map[string]string
 }
 
 type IOstatCollector struct {
@@ -104,27 +105,16 @@ func (m *IOstatCollector) Init(config json.RawMessage) error {
 		if _, skip := stringArrayContains(m.config.ExcludeDevices, device); skip {
 			continue
 		}
-		currentValues := make(map[string]int64)
-		lastValues := make(map[string]int64)
+		values := make(map[string]int64)
 		for m := range m.matches {
-			currentValues[m] = 0
-			lastValues[m] = 0
-		}
-		for name, idx := range m.matches {
-			if idx < len(linefields) {
-				if value, err := strconv.ParseInt(linefields[idx], 0, 64); err == nil {
-					currentValues[name] = value
-					lastValues[name] = value // Set last to current for first read
-				}
-			}
+			values[m] = 0
 		}
 		m.devices[device] = IOstatCollectorEntry{
 			tags: map[string]string{
 				"device": device,
 				"type":   "node",
 			},
-			currentValues: currentValues,
-			lastValues:    lastValues,
+			lastValues: values,
 		}
 	}
 	m.init = true
@@ -163,22 +153,18 @@ func (m *IOstatCollector) Read(interval time.Duration, output chan lp.CCMessage)
 		if _, ok := m.devices[device]; !ok {
 			continue
 		}
-		// Update current and last values
 		entry := m.devices[device]
 		for name, idx := range m.matches {
 			if idx < len(linefields) {
 				x, err := strconv.ParseInt(linefields[idx], 0, 64)
 				if err == nil {
-					// Calculate difference using previous current and new value
-					diff := x - entry.currentValues[name]
-					y, err := lp.NewMetric(name, entry.tags, m.meta, int(diff), time.Now())
+					diff := x - entry.lastValues[name]
+					y, err := lp.NewMessage(name, entry.tags, m.meta, map[string]interface{}{"value": int(diff)}, time.Now())
 					if err == nil {
 						output <- y
 					}
-					// Update last to previous current, and current to new value
-					entry.lastValues[name] = entry.currentValues[name]
-					entry.currentValues[name] = x
 				}
+				entry.lastValues[name] = x
 			}
 		}
 		m.devices[device] = entry

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/tklauser/go-sysconf v0.3.15
 	golang.design/x/thread v0.0.0-20210122121316-335e9adffdf1
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
-	golang.org/x/sys v0.38.0
+	golang.org/x/sys v0.37.0
 )
 
 require (

go.sum

@@ -121,8 +121,8 @@ golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAf
 golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
 golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/sys v0.0.0-20210122093101-04d7465088b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
 golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=