Skip to content

Commit e4b6971

Browse files
LiuQhahahLiuQhahah
committed
fix: rename volume metrics to comply with Prometheus naming conventions
1 parent 4810efd commit e4b6971

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎docs/metrics/cluster/node-metrics.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
| kube_node_status_condition | Gauge | The condition of a cluster node | | `node`=&lt;node-address&gt; <br> `condition`=&lt;node-condition&gt; <br> `status`=&lt;true\|false\|unknown&gt; | STABLE |
1515
| kube_node_created | Gauge | Unix creation timestamp | seconds | `node`=&lt;node-address&gt; | STABLE |
1616
| kube_node_deletion_timestamp | Gauge | Unix deletion timestamp | seconds | `node`=&lt;node-address&gt; | EXPERIMENTAL |
17-
| kube_node_volumes_in_use_count | Gauge | Number of volumes in use on the node | | `node`=&lt;node-address&gt; | STABLE |
18-
| kube_node_volumes_attached_count | Gauge | Number of volumes attached to the node | | `node`=&lt;node-address&gt; | STABLE |
17+
| kube_node_volumes_in_use | Gauge | Number of volumes in use on the node | | `node`=&lt;node-address&gt; | STABLE |
18+
| kube_node_volumes_attached | Gauge | Number of volumes attached to the node | | `node`=&lt;node-address&gt; | STABLE |

‎internal/store/node.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ func createNodeStatusConditionFamilyGenerator() generator.FamilyGenerator {
510510

511511
func createNodeVolumeCountGenerator() generator.FamilyGenerator {
512512
return *generator.NewFamilyGeneratorWithStability(
513-
"kube_node_volumes_attached_count",
513+
"kube_node_volumes_attached",
514514
"Number of volumes attached to the node",
515515
metric.Gauge,
516516
basemetrics.STABLE,
@@ -529,7 +529,7 @@ func createNodeVolumeCountGenerator() generator.FamilyGenerator {
529529

530530
func createNodeVolumeInUseGenerator() generator.FamilyGenerator {
531531
return *generator.NewFamilyGeneratorWithStability(
532-
"kube_node_volumes_in_use_count",
532+
"kube_node_volumes_in_use",
533533
"Number of volumes in use on the node",
534534
metric.Gauge,
535535
basemetrics.STABLE,

‎internal/store/node_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,11 +399,11 @@ func TestNodeStore(t *testing.T) {
399399
},
400400
},
401401
Want: `
402-
# HELP kube_node_volumes_attached_count [STABLE] Number of volumes attached to the node
403-
# TYPE kube_node_volumes_attached_count gauge
404-
kube_node_volumes_attached_count{node="127.0.0.1"} 2
402+
# HELP kube_node_volumes_attached [STABLE] Number of volumes attached to the node
403+
# TYPE kube_node_volumes_attached gauge
404+
kube_node_volumes_attached{node="127.0.0.1"} 2
405405
`,
406-
MetricNames: []string{"kube_node_volumes_attached_count"},
406+
MetricNames: []string{"kube_node_volumes_attached"},
407407
},
408408
{
409409
Obj: &v1.Node{
@@ -417,11 +417,11 @@ func TestNodeStore(t *testing.T) {
417417
},
418418
},
419419
Want: `
420-
# HELP kube_node_volumes_in_use_count [STABLE] Number of volumes in use on the node
421-
# TYPE kube_node_volumes_in_use_count gauge
422-
kube_node_volumes_in_use_count{node="127.0.0.1"} 1
420+
# HELP kube_node_volumes_in_use [STABLE] Number of volumes in use on the node
421+
# TYPE kube_node_volumes_in_use gauge
422+
kube_node_volumes_in_use{node="127.0.0.1"} 1
423423
`,
424-
MetricNames: []string{"kube_node_volumes_in_use_count"},
424+
MetricNames: []string{"kube_node_volumes_in_use"},
425425
},
426426
}
427427
for i, c := range cases {

0 commit comments

Comments
 (0)