Merge pull request #3 from willgorman/deletedvols

Label cluster_volume_count by status

Author: MCBrandenburg

pkg/prom/collector.go

@@ -182,19 +182,25 @@ func (c *SolidfireCollector) collectVolumeMeta(ctx context.Context, ch chan<- pr
 	mu.Lock()
 	defer mu.Unlock()
 
-	ch <- prometheus.MustNewConstMetric(
-		MetricDescriptions.VolumeCount,
-		prometheus.CounterValue,
-		float64(len(volumes.Result.Volumes)),
-	)
+	volumeCntByStatus := map[string]int{}
 
 	for _, vol := range volumes.Result.Volumes {
 		c.volumeNamesByID[vol.VolumeID] = vol.Name
+		volumeCntByStatus[vol.Status]++
+	}
+
+	for status, count := range volumeCntByStatus {
+		ch <- prometheus.MustNewConstMetric(
+			MetricDescriptions.VolumeCount,
+			prometheus.CounterValue,
+			float64(count),
+			status,
+		)
 	}
 	return nil
 }
-func (c *SolidfireCollector) collectNodeMeta(ctx context.Context, ch chan<- prometheus.Metric) error {
 
+func (c *SolidfireCollector) collectNodeMeta(ctx context.Context, ch chan<- prometheus.Metric) error {
 	nodes, err := c.client.ListAllNodes(ctx)
 	if err != nil {
 		return err
@@ -410,6 +416,7 @@ func (c *SolidfireCollector) collectVolumeStats(ctx context.Context, ch chan<- p
 	}
 	return nil
 }
+
 func (c *SolidfireCollector) collectClusterCapacity(ctx context.Context, ch chan<- prometheus.Metric) error {
 	clusterCapacity, err := c.client.GetClusterCapacity(ctx)
 	if err != nil {
@@ -562,6 +569,7 @@ func (c *SolidfireCollector) collectClusterCapacity(ctx context.Context, ch chan
 		clusterThinProvisioningFactor*clusterDeDuplicationFactor*clusterCompressionFactor)
 	return nil
 }
+
 func (c *SolidfireCollector) collectClusterFaults(ctx context.Context, ch chan<- prometheus.Metric) error {
 	ClusterActiveFaults, err := c.client.ListClusterFaults(ctx)
 	if err != nil {
@@ -588,6 +596,7 @@ func (c *SolidfireCollector) collectClusterFaults(ctx context.Context, ch chan<-
 	}
 	return nil
 }
+
 func (c *SolidfireCollector) collectClusterNodeStats(ctx context.Context, ch chan<- prometheus.Metric) error {
 	ClusterNodeStats, err := c.client.ListNodeStats(ctx)
 	if err != nil {
@@ -752,6 +761,7 @@ func (c *SolidfireCollector) collectClusterNodeStats(ctx context.Context, ch cha
 	}
 	return nil
 }
+
 func (c *SolidfireCollector) collectVolumeQosHistograms(ctx context.Context, ch chan<- prometheus.Metric) error {
 	VolumeQoSHistograms, err := c.client.ListVolumeQoSHistograms(ctx)
 	if err != nil {
@@ -871,6 +881,7 @@ func (c *SolidfireCollector) collectVolumeQosHistograms(ctx context.Context, ch
 	}
 	return nil
 }
+
 func (c *SolidfireCollector) collectClusterStats(ctx context.Context, ch chan<- prometheus.Metric) error {
 	clusterStats, err := c.client.GetClusterStats(ctx)
 	if err != nil {
@@ -1192,6 +1203,7 @@ func (c *SolidfireCollector) collectClusterFullThreshold(ctx context.Context, ch
 	)
 	return nil
 }
+
 func (c *SolidfireCollector) collectDriveDetails(ctx context.Context, ch chan<- prometheus.Metric) error {
 	ListDrives, err := c.client.ListDrives(ctx)
 	if err != nil {
@@ -1233,6 +1245,7 @@ func (c *SolidfireCollector) collectDriveDetails(ctx context.Context, ch chan<-
 	}
 	return nil
 }
+
 func (c *SolidfireCollector) collectISCSISessions(ctx context.Context, ch chan<- prometheus.Metric) error {
 	ListISCSISessions, err := c.client.ListISCSISessions(ctx)
 	if err != nil {
@@ -1294,6 +1307,7 @@ func (c *SolidfireCollector) collectInitiators(ctx context.Context, ch chan<- pr
 	)
 	return nil
 }
+
 func (c *SolidfireCollector) collectVolumeAccessGroups(ctx context.Context, ch chan<- prometheus.Metric) error {
 	volumeAccessGroups, err := c.client.ListVolumeAccessGroups(ctx)
 	if err != nil {

pkg/prom/metrics.go

@@ -65,7 +65,7 @@ type Descriptions struct {
 	ClusterUsedMetadataSpaceInSnapshotsBytes *prometheus.Desc
 	ClusterUsedSpaceBytes                    *prometheus.Desc
 	ClusterZeroBlocks                        *prometheus.Desc
-	//The following metrics are Calculated by us:
+	// The following metrics are Calculated by us:
 	ClusterCompressionFactor      *prometheus.Desc
 	ClusterDeDuplicationFactor    *prometheus.Desc
 	ClusterEfficiencyFactor       *prometheus.Desc
@@ -140,7 +140,7 @@ type Descriptions struct {
 	DriveCapacityBytes *prometheus.Desc
 
 	NodeISCSISessions *prometheus.Desc
-	//NodeISCSIVolumes       *prometheus.Desc
+	// NodeISCSIVolumes       *prometheus.Desc
 
 	InitiatorCount         *prometheus.Desc
 	AccountCount           *prometheus.Desc
@@ -936,7 +936,7 @@ func NewMetricDescriptions(namespace string) *Descriptions {
 	d.VolumeCount = prometheus.NewDesc(
 		prometheus.BuildFQName(namespace, "", "cluster_volume_count"),
 		"The total number of volumes in cluster",
-		nil,
+		[]string{"status"},
 		nil,
 	)
 

pkg/testutils/collector.go

@@ -145,7 +145,7 @@ solidfire_volume_burst_iops_credit{volume_id="1",volume_name="test-volume1"} 600
 solidfire_volume_burst_iops_credit{volume_id="2",volume_name="test-volume2"} 0
 solidfire_volume_client_queue_depth{volume_id="1",volume_name="test-volume1"} 0
 solidfire_volume_client_queue_depth{volume_id="2",volume_name="test-volume2"} 0
-solidfire_cluster_volume_count 2
+solidfire_cluster_volume_count{status="active"} 2
 solidfire_volume_last_sample_read_bytes{volume_id="1",volume_name="test-volume1"} 0
 solidfire_volume_last_sample_read_bytes{volume_id="2",volume_name="test-volume2"} 0
 solidfire_volume_last_sample_read_ops{volume_id="1",volume_name="test-volume1"} 0
@@ -427,7 +427,7 @@ solidfire_node_used_memory_bytes{node_id="1",node_name="n01"} 9.000198144e+09
 solidfire_node_write_latency_seconds_total{node_id="1",node_name="n01"} 0
 solidfire_node_write_ops_total{node_id="1",node_name="n01"} 1.3089387e+07
 solidfire_up 0
-solidfire_cluster_volume_count 2
+solidfire_cluster_volume_count{status="active"} 2
 solidfire_volume_qos_below_min_iops_percentage_bucket{volume_id="1",volume_name="test-volume1",le="19"} 32
 solidfire_volume_qos_below_min_iops_percentage_bucket{volume_id="1",volume_name="test-volume1",le="39"} 6
 solidfire_volume_qos_below_min_iops_percentage_bucket{volume_id="1",volume_name="test-volume1",le="59"} 4