add the other metric for partitions

Author: vpenso

partitions.go

@@ -20,7 +20,7 @@ import (
         "os/exec"
         "log"
         "strings"
-	"strconv"
+        "strconv"
         "github.com/prometheus/client_golang/prometheus"
 )
 
@@ -59,26 +59,41 @@ func ParsePartitionsMetrics(input []byte) map[string]*PartitionMetrics {
                                 partitions[partition] = &PartitionMetrics{0,0,0,0}
                         }
                         states := strings.Split(line,",")[1]
-			allocated,_ := strconv.ParseFloat(strings.Split(states,"/")[0],64)
+                        allocated,_ := strconv.ParseFloat(strings.Split(states,"/")[0],64)
+                        idle,_ := strconv.ParseFloat(strings.Split(states,"/")[1],64)
+                        other,_ := strconv.ParseFloat(strings.Split(states,"/")[2],64)
+                        total,_ := strconv.ParseFloat(strings.Split(states,"/")[3],64)
                         partitions[partition].allocated = allocated
+                        partitions[partition].idle = idle
+                        partitions[partition].other = other
+                        partitions[partition].total = total
                 }
         }
         return partitions
 }
 
 type PartitionsCollector struct {
         allocated *prometheus.Desc
+        idle *prometheus.Desc
+        other *prometheus.Desc
+        total *prometheus.Desc
 }
 
 func NewPartitionsCollector() *PartitionsCollector {
         labels := []string{"partition"}
         return &PartitionsCollector{
                 allocated: prometheus.NewDesc("slurm_partition_cpus_allocated", "Allocated CPUs for partition", labels,nil),
+		idle: prometheus.NewDesc("slurm_partition_cpus_idle", "Idle CPUs for partition", labels,nil),
+		other: prometheus.NewDesc("slurm_partition_cpus_other", "Other CPUs for partition", labels,nil),
+		total: prometheus.NewDesc("slurm_partition_cpus_total", "Total CPUs for partition", labels,nil),
         }
 }
 
 func (pc *PartitionsCollector) Describe(ch chan<- *prometheus.Desc) {
         ch <- pc.allocated
+        ch <- pc.idle
+        ch <- pc.other
+        ch <- pc.total
 }
 
 func (pc *PartitionsCollector) Collect(ch chan<- prometheus.Metric) {
@@ -87,5 +102,14 @@ func (pc *PartitionsCollector) Collect(ch chan<- prometheus.Metric) {
                 if pm[p].allocated > 0 {
                         ch <- prometheus.MustNewConstMetric(pc.allocated, prometheus.GaugeValue, pm[p].allocated, p)
                 }
+                if pm[p].idle > 0 {
+                        ch <- prometheus.MustNewConstMetric(pc.idle, prometheus.GaugeValue, pm[p].idle, p)
+                }
+                if pm[p].other > 0 {
+                        ch <- prometheus.MustNewConstMetric(pc.other, prometheus.GaugeValue, pm[p].other, p)
+                }
+                if pm[p].total > 0 {
+                        ch <- prometheus.MustNewConstMetric(pc.total, prometheus.GaugeValue, pm[p].total, p)
+                }
         }
 }