Add disk type to prometheus metrics (#4736)

* Add disk type to prometheus metrics

* Del metrics

* Disk type as readable string

---------

Co-authored-by: Dima Mishin <dimm@dimm.dev>

1 files changed, 3 insertions, 5 deletions

diff --git a/weed/stats/metrics.go b/weed/stats/metrics.go
index dda4d95e5..af4f26e4c 100644
--- a/weed/stats/metrics.go
+++ b/weed/stats/metrics.go
@@ -176,7 +176,7 @@ var (
 			Subsystem: "volumeServer",
 			Name:      "volumes",
 			Help:      "Number of volumes or shards.",
-		}, []string{"collection", "type"})
+		}, []string{"collection", "type", "disk"})
 
 	VolumeServerReadOnlyVolumeGauge = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
@@ -299,7 +299,6 @@ func JoinHostPort(host string, port int) string {
 	return net.JoinHostPort(host, portStr)
 }
 
-
 func StartMetricsServer(ip string, port int) {
 	if port == 0 {
 		return
@@ -316,11 +315,10 @@ func SourceName(port uint32) string {
 	return net.JoinHostPort(hostname, strconv.Itoa(int(port)))
 }
 
-// todo - can be changed to DeletePartialMatch when https://github.com/prometheus/client_golang/pull/1013 gets released
 func DeleteCollectionMetrics(collection string) {
 	VolumeServerDiskSizeGauge.DeleteLabelValues(collection, "normal")
 	for _, volume_type := range readOnlyVolumeTypes {
-		VolumeServerReadOnlyVolumeGauge.DeleteLabelValues(collection, volume_type)
+		VolumeServerReadOnlyVolumeGauge.DeletePartialMatch(prometheus.Labels{"collection": collection, "type": volume_type})
 	}
-	VolumeServerVolumeCounter.DeleteLabelValues(collection, "volume")
+	VolumeServerVolumeCounter.DeletePartialMatch(prometheus.Labels{"collection": collection, "type": "volume"})
 }