diff --git a/docs/persistentvolume-metrics.md b/docs/persistentvolume-metrics.md index 310d6dedc9..28a9e7aea1 100644 --- a/docs/persistentvolume-metrics.md +++ b/docs/persistentvolume-metrics.md @@ -2,7 +2,7 @@ | Metric name| Metric type | Labels/tags | Status | | ---------- | ----------- | ----------- | ----------- | -| kube_persistentvolume_capacity | Gauge | `persistentvolume`=<pv-name> | STABLE | +| kube_persistentvolume_capacity_bytes | Gauge | `persistentvolume`=<pv-name> | STABLE | | kube_persistentvolume_status_phase | Gauge | `persistentvolume`=<pv-name>
`phase`=<Bound\|Failed\|Pending\|Available\|Released>| STABLE | | kube_persistentvolume_labels | Gauge | `persistentvolume`=<persistentvolume-name>
`label_PERSISTENTVOLUME_LABEL`=<PERSISTENTVOLUME_LABEL> | STABLE | | kube_persistentvolume_info | Gauge | `persistentvolume`=<pv-name>
`storageclass`=<storageclass-name> | STABLE | diff --git a/internal/collector/persistentvolume.go b/internal/collector/persistentvolume.go index 4989dd0b09..6adccca7ef 100644 --- a/internal/collector/persistentvolume.go +++ b/internal/collector/persistentvolume.go @@ -109,7 +109,7 @@ var ( }), }, { - Name: "kube_persistentvolume_capacity", + Name: "kube_persistentvolume_capacity_bytes", Type: metric.MetricTypeGauge, Help: "Persistentvolume capacity in bytes.", GenerateFunc: wrapPersistentVolumeFunc(func(p *v1.PersistentVolume) *metric.Family { diff --git a/internal/collector/persistentvolume_test.go b/internal/collector/persistentvolume_test.go index 49007de592..0e6a90395c 100644 --- a/internal/collector/persistentvolume_test.go +++ b/internal/collector/persistentvolume_test.go @@ -35,8 +35,8 @@ func TestPersistentVolumeCollector(t *testing.T) { # TYPE kube_persistentvolume_labels gauge # HELP kube_persistentvolume_info Information about persistentvolume. # TYPE kube_persistentvolume_info gauge - # HELP kube_persistentvolume_capacity The size of the Persistentvolume in bytes. - # TYPE kube_persistentvolume_capacity gauge + # HELP kube_persistentvolume_capacity_bytes The size of the Persistentvolume in bytes. + # TYPE kube_persistentvolume_capacity_bytes gauge ` cases := []generateMetricsTestCase{ // Verify phase enumerations. @@ -216,9 +216,9 @@ func TestPersistentVolumeCollector(t *testing.T) { }, }, Want: ` - kube_persistentvolume_capacity{persistentvolume="test-pv"} 5.36870912e+09 + kube_persistentvolume_capacity_bytes{persistentvolume="test-pv"} 5.36870912e+09 `, - MetricNames: []string{"kube_persistentvolume_capacity"}, + MetricNames: []string{"kube_persistentvolume_capacity_bytes"}, }, } for i, c := range cases {