nodes: Also count the nodes that are not parsed correctly

Author: fihuer

nodes.go

@@ -38,6 +38,7 @@ type NodesMetrics struct {
 	maint map[string]float64
 	mix   map[string]float64
 	resv  map[string]float64
+	other map[string]float64
 	total map[string]float64
 }
 
@@ -74,6 +75,7 @@ func InitFeatureSet(nm *NodesMetrics, feature_set string) {
 	nm.maint[feature_set] = nm.maint[feature_set]
 	nm.mix[feature_set] = nm.mix[feature_set]
 	nm.resv[feature_set] = nm.resv[feature_set]
+	nm.other[feature_set] = nm.other[feature_set]
 	nm.total[feature_set] = nm.total[feature_set]
 }
 
@@ -96,6 +98,7 @@ func ParseNodesMetrics(input []byte) *NodesMetrics {
 	nm.maint = make(map[string]float64)
 	nm.mix = make(map[string]float64)
 	nm.resv = make(map[string]float64)
+	nm.other = make(map[string]float64)
 	nm.total = make(map[string]float64)
 
 	for _, line := range lines_uniq {
@@ -141,6 +144,8 @@ func ParseNodesMetrics(input []byte) *NodesMetrics {
 				nm.mix[feature_set] += count
 			case resv.MatchString(state):
 				nm.resv[feature_set] += count
+			default:
+				nm.other[feature_set] += count
 			}
 		}
 	}
@@ -225,6 +230,7 @@ func NewNodesCollector() *NodesCollector {
 		maint: prometheus.NewDesc("slurm_nodes_maint", "Maint nodes", labelnames, nil),
 		mix:   prometheus.NewDesc("slurm_nodes_mix", "Mix nodes", labelnames, nil),
 		resv:  prometheus.NewDesc("slurm_nodes_resv", "Reserved nodes", labelnames, nil),
+		other: prometheus.NewDesc("slurm_nodes_other", "Nodes reported with an unknown state", labelnames, nil),
 		total: prometheus.NewDesc("slurm_nodes_total", "Total number of nodes", nil, nil),
 	}
 }
@@ -240,6 +246,7 @@ type NodesCollector struct {
 	maint *prometheus.Desc
 	mix   *prometheus.Desc
 	resv  *prometheus.Desc
+	other *prometheus.Desc
 	total *prometheus.Desc
 }
 
@@ -255,6 +262,7 @@ func (nc *NodesCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- nc.maint
 	ch <- nc.mix
 	ch <- nc.resv
+	ch <- nc.other
 	ch <- nc.total
 }
 
@@ -282,6 +290,7 @@ func (nc *NodesCollector) Collect(ch chan<- prometheus.Metric) {
 		SendFeatureSetMetric(ch, nc.maint, prometheus.GaugeValue, nm.maint, part)
 		SendFeatureSetMetric(ch, nc.mix, prometheus.GaugeValue, nm.mix, part)
 		SendFeatureSetMetric(ch, nc.resv, prometheus.GaugeValue, nm.resv, part)
+		SendFeatureSetMetric(ch, nc.other, prometheus.GaugeValue, nm.other, part)
 	}
 	total := SlurmGetTotal()
 	ch <- prometheus.MustNewConstMetric(nc.total, prometheus.GaugeValue, total)

nodes_test.go

@@ -36,4 +36,6 @@ func TestNodesMetrics(t *testing.T) {
 	assert.Equal(t, 40, int(nm.alloc["feature_a,feature_b"]))
 	assert.Equal(t, 20, int(nm.alloc["feature_a"]))
 	assert.Equal(t, 10, int(nm.down["null"]))
+	assert.Equal(t, 42, int(nm.other["null"]))
+	assert.Equal(t, 24, int(nm.other["feature_a"]))
 }

test_data/sinfo.txt

@@ -3,4 +3,6 @@
 40|allocated|feature_a,feature_b
 20|allocated|feature_a
 10|down*|(null)
+42|foo_bar_baz|(null)
+24|foo_bar_baz|feature_a