Value conversion & 4 nodes cluster support (#3)

* Support for more than 2 nodes cluster (HyperSwap...)

* Parsing total_drive_raw_capacity_bytes as a Bytes string or as a Float

---------

Co-authored-by: Charles <[email protected]>

Author: gaelatcheops

collector/node_stats_collector.go

@@ -169,15 +169,14 @@ func (c *nodeStatsCollector) Collect(sClient utils.SpectrumClient, ch chan<- pro
 	// ]
 
 	nodeStatsArray := gjson.Parse(nodeStatsResp).Array()
+	nodesNumber := len(nodeStatsArray) / len(nodeStats_metrics)
+
 	for i, nodeStats_metric := range nodeStats_metrics {
-		labelvalues := []string{sClient.Hostname, nodeStatsArray[i].Get("node_name").String()}
-		labelvalues_a := []string{sClient.Hostname, nodeStatsArray[len(nodeStatsArray)-len(nodeStats_metrics)+i].Get("node_name").String()}
-		if len(utils.ExtraLabelValues) > 0 {
-			labelvalues = append(labelvalues, utils.ExtraLabelValues...)
-			labelvalues_a = append(labelvalues_a, utils.ExtraLabelValues...)
+		for node := 0; node < nodesNumber; node++ {
+			index := len(nodeStats_metrics)*node + i
+			labelvalues := []string{sClient.Hostname, nodeStatsArray[index].Get("node_name").String()}
+			ch <- prometheus.MustNewConstMetric(nodeStats_metric, prometheus.GaugeValue, nodeStatsArray[index].Get("stat_current").Float(), labelvalues...)
 		}
-		ch <- prometheus.MustNewConstMetric(nodeStats_metric, prometheus.GaugeValue, nodeStatsArray[i].Get("stat_current").Float(), labelvalues...)
-		ch <- prometheus.MustNewConstMetric(nodeStats_metric, prometheus.GaugeValue, nodeStatsArray[len(nodeStatsArray)-len(nodeStats_metrics)+i].Get("stat_current").Float(), labelvalues_a...)
 	}
 	logger.Debugln("exit NodeStats collector")
 	return nil

collector/system_collector.go

@@ -304,9 +304,9 @@ func (c *systemCollector) Collect(sClient utils.SpectrumClient, ch chan<- promet
 	}
 	ch <- prometheus.MustNewConstMetric(compression_uncompressed_capacity, prometheus.GaugeValue, float64(compression_uncompressed_capacity_bytes), labelvalues...)
 
-	total_drive_raw_capacity_bytes, err := strconv.ParseFloat(gjson.Get(systemMetrics, "total_drive_raw_capacity").String(), 64)
+	total_drive_raw_capacity_bytes, err := utils.ToBytes(gjson.Get(systemMetrics, "total_drive_raw_capacity").String())
 	if err != nil {
-		logger.Errorf("Parsing string as float failed: %s", err.Error())
+		logger.Errorf("Converting capacity unit failed: %s", err.Error())
 	}
 	ch <- prometheus.MustNewConstMetric(total_drive_raw_capacity, prometheus.GaugeValue, float64(total_drive_raw_capacity_bytes), labelvalues...)