Refactored node.go to use subprocess.go

go.mod

@@ -5,4 +5,5 @@ go 1.12
 require (
 	github.com/prometheus/client_golang v1.2.1
 	github.com/prometheus/common v0.7.0
+	github.com/stretchr/testify v1.3.0 // indirect
 )

node.go

@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package main
 
 import (
-	"log"
-	"os/exec"
 	"sort"
 	"strconv"
 	"strings"
@@ -36,8 +34,8 @@ type NodeMetrics struct {
 	nodeStatus string
 }
 
-func NodeGetMetrics() map[string]*NodeMetrics {
-	return ParseNodeMetrics(NodeData())
+func GetNodeMetrics() map[string]*NodeMetrics {
+	return ParseNodeMetrics(Subprocess("sinfo", "-h", "-N", "-O", "NodeList,AllocMem,Memory,CPUsState,StateLong"))
 }
 
 // ParseNodeMetrics takes the output of sinfo with node data
@@ -79,17 +77,6 @@ func ParseNodeMetrics(input []byte) map[string]*NodeMetrics {
 	return nodes
 }
 
-// NodeData executes the sinfo command to get data for each node
-// It returns the output of the sinfo command
-func NodeData() []byte {
-	cmd := exec.Command("sinfo", "-h", "-N", "-O", "NodeList,AllocMem,Memory,CPUsState,StateLong")
-	out, err := cmd.Output()
-	if err != nil {
-		log.Fatal(err)
-	}
-	return out
-}
-
 type NodeCollector struct {
 	cpuAlloc *prometheus.Desc
 	cpuIdle  *prometheus.Desc
@@ -125,7 +112,7 @@ func (nc *NodeCollector) Describe(ch chan<- *prometheus.Desc) {
 }
 
 func (nc *NodeCollector) Collect(ch chan<- prometheus.Metric) {
-	nodes := NodeGetMetrics()
+	nodes := GetNodeMetrics()
 	for node := range nodes {
 		ch <- prometheus.MustNewConstMetric(nc.cpuAlloc, prometheus.GaugeValue, float64(nodes[node].cpuAlloc), node, nodes[node].nodeStatus)
 		ch <- prometheus.MustNewConstMetric(nc.cpuIdle,  prometheus.GaugeValue, float64(nodes[node].cpuIdle),  node, nodes[node].nodeStatus)

node_test.go

@@ -1,4 +1,5 @@
-/* Copyright 2021 Chris Read
+// +build unit
+/* Copyright 2021 Chris Read, Rovanion Luckey
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -45,7 +46,7 @@ func TestNodeMetrics(t *testing.T) {
 		t.Fatalf("Can not open test data: %v", err)
 	}
 	metrics := ParseNodeMetrics(data)
-	t.Logf("%+v", metrics)
+	// t.Logf("%+v", metrics)
 
 	assert.Contains(t, metrics, "b001")
 	assert.Equal(t, uint64(327680), metrics["b001"].memAlloc)

nodes.go

@@ -1,4 +1,5 @@
 /* Copyright 2017 Victor Penso, Matteo Dessalvi
+   Copyright 2021 Rovanion Luckey
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by