diff options
| -rw-r--r-- | weed/stats/metrics.go | 2 | ||||
| -rw-r--r-- | weed/topology/volume_layout.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/weed/stats/metrics.go b/weed/stats/metrics.go index 4393c280c..faf87ff09 100644 --- a/weed/stats/metrics.go +++ b/weed/stats/metrics.go @@ -76,7 +76,7 @@ var ( Subsystem: "master", Name: "volume_layout_total", Help: "Number of volumes in volume layouts", - }, []string{"collection", "replica", "type"}) + }, []string{"collection", "dataCenter", "type"}) MasterLeaderChangeCounter = prometheus.NewCounterVec( prometheus.CounterOpts{ diff --git a/weed/topology/volume_layout.go b/weed/topology/volume_layout.go index 66f7118c9..f2c341b7c 100644 --- a/weed/topology/volume_layout.go +++ b/weed/topology/volume_layout.go @@ -356,9 +356,9 @@ func (vl *VolumeLayout) DoneGrowRequest() { func (vl *VolumeLayout) ShouldGrowVolumes(option *VolumeGrowOption) bool { total, active, crowded := vl.GetActiveVolumeCount(option) - stats.MasterVolumeLayout.WithLabelValues(option.Collection, option.ReplicaPlacement.String(), "total").Set(float64(total)) - stats.MasterVolumeLayout.WithLabelValues(option.Collection, option.ReplicaPlacement.String(), "active").Set(float64(active)) - stats.MasterVolumeLayout.WithLabelValues(option.Collection, option.ReplicaPlacement.String(), "crowded").Set(float64(crowded)) + stats.MasterVolumeLayout.WithLabelValues(option.Collection, option.DataCenter, "total").Set(float64(total)) + stats.MasterVolumeLayout.WithLabelValues(option.Collection, option.DataCenter, "active").Set(float64(active)) + stats.MasterVolumeLayout.WithLabelValues(option.Collection, option.DataCenter, "crowded").Set(float64(crowded)) //glog.V(0).Infof("active volume: %d, high usage volume: %d\n", active, high) return active <= crowded } |