metrics: disk size for <collection, normal/EC>

1 files changed, 6 insertions, 13 deletions

diff --git a/weed/stats/metrics.go b/weed/stats/metrics.go
index 2408b607a..d487768af 100644
--- a/weed/stats/metrics.go
+++ b/weed/stats/metrics.go
@@ -60,23 +60,17 @@ var (
 		prometheus.GaugeOpts{
 			Namespace: "SeaweedFS",
 			Subsystem: "volumeServer",
-			Name:      "ecShards",
+			Name:      "ec_shards",
 			Help:      "Number of EC shards.",
 		})
-	VolumeServerVolumeSizeGauge = prometheus.NewGauge(
+
+	VolumeServerDiskSizeGauge = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Namespace: "SeaweedFS",
 			Subsystem: "volumeServer",
-			Name:      "totalVolumeSize",
+			Name:      "total_disk_size",
 			Help:      "Actual disk size used by volumes.",
-		})
-	VolumeServerEcShardSizeGauge = prometheus.NewGauge(
-		prometheus.GaugeOpts{
-			Namespace: "SeaweedFS",
-			Subsystem: "volumeServer",
-			Name:      "totalEcShardSize",
-			Help:      "Actual disk size used by ec shards.",
-		})
+		}, []string{"collection", "type"})
 )
 
 func init() {
@@ -88,8 +82,7 @@ func init() {
 	VolumeServerGather.MustRegister(VolumeServerRequestHistogram)
 	VolumeServerGather.MustRegister(VolumeServerVolumeCounter)
 	VolumeServerGather.MustRegister(VolumeServerEcShardCounter)
-	VolumeServerGather.MustRegister(VolumeServerVolumeSizeGauge)
-	VolumeServerGather.MustRegister(VolumeServerEcShardSizeGauge)
+	VolumeServerGather.MustRegister(VolumeServerDiskSizeGauge)
 
 }