rename pvc capacity

kubernetes · Feb 21, 2019 · 37f5206 · 37f5206
1 parent 418427a
commit 37f5206
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Documentation/persistentvolume-metrics.md b/Documentation/persistentvolume-metrics.md
@@ -2,7 +2,7 @@
 
 | Metric name| Metric type | Labels/tags | Status |
 | ---------- | ----------- | ----------- | ----------- |
-| kube_persistentvolume_capacity | Gauge | `persistentvolume`=&lt;pv-name&gt; | STABLE |
+| kube_persistentvolume_capacity_bytes | Gauge | `persistentvolume`=&lt;pv-name&gt; | STABLE |
 | kube_persistentvolume_status_phase | Gauge | `persistentvolume`=&lt;pv-name&gt; <br>`phase`=&lt;Bound\|Failed\|Pending\|Available\|Released&gt;| STABLE |
 | kube_persistentvolume_labels | Gauge | `persistentvolume`=&lt;persistentvolume-name&gt; <br> `label_PERSISTENTVOLUME_LABEL`=&lt;PERSISTENTVOLUME_LABEL&gt;  | STABLE |
 | kube_persistentvolume_info | Gauge | `persistentvolume`=&lt;pv-name&gt; <br> `storageclass`=&lt;storageclass-name&gt; | STABLE |

diff --git 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
@@ -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 {