Changed cores to CPUs

Author: bedroge

Makefile

@@ -2,7 +2,7 @@ PROJECT_NAME = prometheus-slurm-exporter
 ifndef GOPATH
 	GOPATH=$(shell pwd):/usr/share/gocode
 endif
-GOFILES=cores.go main.go nodes.go queue.go scheduler.go
+GOFILES=cpus.go main.go nodes.go queue.go scheduler.go
 GOBIN=bin/$(PROJECT_NAME)
 
 build:

README.md

@@ -4,12 +4,12 @@ Prometheus collector and exporter for metrics extracted from the [Slurm](https:/
 
 ## Exported Metrics
 
-### State of the Cores
+### State of the CPUs
 
-* **Allocated**: cores which have been allocated to a job.
-* **Idle**: cores not allocated to a job and thus available for use.
-* **Other**: cores which are unavailable for use at the moment.
-* **Total**: total number of cores.
+* **Allocated**: CPUs which have been allocated to a job.
+* **Idle**: CPUs not allocated to a job and thus available for use.
+* **Other**: CPUs which are unavailable for use at the moment.
+* **Total**: total number of CPUs.
 
 [Information extracted from the SLURM **sinfo** command](https://slurm.schedmd.com/sinfo.html)
 

cpus.go

@@ -24,19 +24,19 @@ import (
 	"strings"
 )
 
-type CoresMetrics struct {
+type CPUsMetrics struct {
 	alloc float64
 	idle  float64
 	other float64
 	total float64
 }
 
-func CoresGetMetrics() *CoresMetrics {
-	return ParseCoresMetrics(CoresData())
+func CPUsGetMetrics() *CPUsMetrics {
+	return ParseCPUsMetrics(CPUsData())
 }
 
-func ParseCoresMetrics(input []byte) *CoresMetrics {
-	var cm CoresMetrics
+func ParseCPUsMetrics(input []byte) *CPUsMetrics {
+	var cm CPUsMetrics
 	if strings.Contains(string(input), "/") {
 	    splitted := strings.Split(strings.TrimSpace(string(input)), "/")
 	    cm.alloc, _ = strconv.ParseFloat(splitted[0], 64)
@@ -48,7 +48,7 @@ func ParseCoresMetrics(input []byte) *CoresMetrics {
 }
 
 // Execute the sinfo command and return its output
-func CoresData() []byte {
+func CPUsData() []byte {
 	cmd := exec.Command("sinfo", "-h", "-o %C")
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
@@ -70,33 +70,33 @@ func CoresData() []byte {
  * https://godoc.org/github.com/prometheus/client_golang/prometheus#Collector
  */
 
-func NewCoresCollector() *CoresCollector {
-	return &CoresCollector{
-		alloc: prometheus.NewDesc("slurm_cores_alloc", "Allocated cores", nil, nil),
-		idle:  prometheus.NewDesc("slurm_cores_idle", "Idle cores", nil, nil),
-		other: prometheus.NewDesc("slurm_cores_other", "Mix cores", nil, nil),
-		total: prometheus.NewDesc("slurm_cores_total", "Total cores", nil, nil),
+func NewCPUsCollector() *CPUsCollector {
+	return &CPUsCollector{
+		alloc: prometheus.NewDesc("slurm_cpus_alloc", "Allocated CPUs", nil, nil),
+		idle:  prometheus.NewDesc("slurm_cpus_idle", "Idle CPUs", nil, nil),
+		other: prometheus.NewDesc("slurm_cpus_other", "Mix CPUs", nil, nil),
+		total: prometheus.NewDesc("slurm_cpus_total", "Total CPUs", nil, nil),
 	}
 }
 
-type CoresCollector struct {
+type CPUsCollector struct {
 	alloc *prometheus.Desc
 	idle  *prometheus.Desc
 	other *prometheus.Desc
 	total *prometheus.Desc
 }
 
 // Send all metric descriptions
-func (cc *CoresCollector) Describe(ch chan<- *prometheus.Desc) {
+func (cc *CPUsCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- cc.alloc
 	ch <- cc.idle
 	ch <- cc.other
 	ch <- cc.total
 }
-func (cc *CoresCollector) Collect(ch chan<- prometheus.Metric) {
-	cm := CoresGetMetrics()
+func (cc *CPUsCollector) Collect(ch chan<- prometheus.Metric) {
+	cm := CPUsGetMetrics()
 	ch <- prometheus.MustNewConstMetric(cc.alloc, prometheus.GaugeValue, cm.alloc)
-	ch <- prometheus.MustNewConstMetric(cc.idle, prometheus.GaugeValue, cm.idle)
+	ch <- prometheus.MustNewConstMetric(cc.idle,  prometheus.GaugeValue, cm.idle)
 	ch <- prometheus.MustNewConstMetric(cc.other, prometheus.GaugeValue, cm.other)
 	ch <- prometheus.MustNewConstMetric(cc.total, prometheus.GaugeValue, cm.total)
 }

cpus_test.go

@@ -21,14 +21,14 @@ import (
   "io/ioutil"
 )
 
-func TestCoresMetrics(t *testing.T) {
+func TestCPUsMetrics(t *testing.T) {
   // Read the input data from a file
-  file, err := os.Open("test_data/sinfo_cores.txt")
+  file, err := os.Open("test_data/sinfo_cpus.txt")
   if err != nil { t.Fatalf("Can not open test data: %v", err) }
   data, err := ioutil.ReadAll(file)
-  t.Logf("%+v", ParseCoresMetrics(data))
+  t.Logf("%+v", ParseCPUsMetrics(data))
 }
 
-func TestCoresGetMetrics(t *testing.T) {
-  t.Logf("%+v", CoresGetMetrics())
+func TestCPUssGetMetrics(t *testing.T) {
+  t.Logf("%+v", CPUsGetMetrics())
 }

main.go

@@ -28,7 +28,7 @@ func init() {
   prometheus.MustRegister(NewSchedulerCollector()) // from scheduler.go
   prometheus.MustRegister(NewQueueCollector())     // from queue.go
   prometheus.MustRegister(NewNodesCollector())     // from nodes.go
-  prometheus.MustRegister(NewCoresCollector())     // from cores.go
+  prometheus.MustRegister(NewCPUsCollector())      // from cpus.go
 }
 
 var listenAddress = flag.String(