even out all subsystems for the metrics

This commit is contained in:
Kai Storbeck 2016-06-01 21:22:12 +02:00
parent d1cae68505
commit e24a5a51a6
1 changed files with 10 additions and 6 deletions

View File

@ -54,7 +54,8 @@ func NewPoolUsageCollector(conn Conn) *PoolUsageCollector {
UsedBytes: prometheus.NewGaugeVec( UsedBytes: prometheus.NewGaugeVec(
prometheus.GaugeOpts{ prometheus.GaugeOpts{
Namespace: cephNamespace, Namespace: cephNamespace,
Name: "pool_used_bytes", Subsystem: "pool",
Name: "used_bytes",
Help: "Capacity of the pool that is currently under use", Help: "Capacity of the pool that is currently under use",
}, },
[]string{"pool"}, []string{"pool"},
@ -62,8 +63,8 @@ func NewPoolUsageCollector(conn Conn) *PoolUsageCollector {
MaxAvail: prometheus.NewGaugeVec( MaxAvail: prometheus.NewGaugeVec(
prometheus.GaugeOpts{ prometheus.GaugeOpts{
Namespace: cephNamespace, Namespace: cephNamespace,
Subsystem: "df", Subsystem: "pool",
Name: "pool_available_bytes", Name: "available_bytes",
Help: "Free space for this ceph pool", Help: "Free space for this ceph pool",
}, },
[]string{"pool"}, []string{"pool"},
@ -71,7 +72,8 @@ func NewPoolUsageCollector(conn Conn) *PoolUsageCollector {
Objects: prometheus.NewGaugeVec( Objects: prometheus.NewGaugeVec(
prometheus.GaugeOpts{ prometheus.GaugeOpts{
Namespace: cephNamespace, Namespace: cephNamespace,
Name: "pool_objects_total", Subsystem: "pool",
Name: "objects_total",
Help: "Total no. of objects allocated within the pool", Help: "Total no. of objects allocated within the pool",
}, },
[]string{"pool"}, []string{"pool"},
@ -79,7 +81,8 @@ func NewPoolUsageCollector(conn Conn) *PoolUsageCollector {
ReadIO: prometheus.NewCounterVec( ReadIO: prometheus.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
Namespace: cephNamespace, Namespace: cephNamespace,
Name: "pool_read_total", Subsystem: "pool",
Name: "read_total",
Help: "Total read i/o calls the pool has been subject to", Help: "Total read i/o calls the pool has been subject to",
}, },
[]string{"pool"}, []string{"pool"},
@ -87,7 +90,8 @@ func NewPoolUsageCollector(conn Conn) *PoolUsageCollector {
WriteIO: prometheus.NewCounterVec( WriteIO: prometheus.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
Namespace: cephNamespace, Namespace: cephNamespace,
Name: "pool_write_total", Subsystem: "pool",
Name: "write_total",
Help: "Total write i/o calls the pool has been subject to", Help: "Total write i/o calls the pool has been subject to",
}, },
[]string{"pool"}, []string{"pool"},