diff --git a/pkg/kubelet/metrics/collectors/volume_stats.go b/pkg/kubelet/metrics/collectors/volume_stats.go index 2fed2f3d0aa..e580bdb1516 100644 --- a/pkg/kubelet/metrics/collectors/volume_stats.go +++ b/pkg/kubelet/metrics/collectors/volume_stats.go @@ -63,7 +63,7 @@ var ( ) volumeStatsHealthAbnormalDesc = metrics.NewDesc( - metrics.BuildFQName("", kubeletmetrics.KubeletSubsystem, kubeletmetrics.VolumeStatsHealthAbnormalKey), + metrics.BuildFQName("", kubeletmetrics.KubeletSubsystem, kubeletmetrics.VolumeStatsHealthStatusKey), "Volume health status. The count is either 1 or 0", []string{"namespace", "persistentvolumeclaim"}, nil, metrics.ALPHA, "") @@ -127,7 +127,7 @@ func (collector *volumeStatsCollector) CollectWithStability(ch chan<- metrics.Me addGauge(volumeStatsInodesDesc, pvcRef, float64(*volumeStat.Inodes)) addGauge(volumeStatsInodesFreeDesc, pvcRef, float64(*volumeStat.InodesFree)) addGauge(volumeStatsInodesUsedDesc, pvcRef, float64(*volumeStat.InodesUsed)) - addGauge(volumeStatsHealthAbnormalDesc, pvcRef, float64(convertBoolToFloat64(volumeStat.Abnormal))) + addGauge(volumeStatsHealthAbnormalDesc, pvcRef, convertBoolToFloat64(volumeStat.Abnormal)) allPVCs.Insert(pvcUniqStr) } } diff --git a/pkg/kubelet/metrics/collectors/volume_stats_test.go b/pkg/kubelet/metrics/collectors/volume_stats_test.go index 2cbeff4e37b..c9d9e1b89bb 100644 --- a/pkg/kubelet/metrics/collectors/volume_stats_test.go +++ b/pkg/kubelet/metrics/collectors/volume_stats_test.go @@ -47,8 +47,8 @@ func TestVolumeStatsCollector(t *testing.T) { # TYPE kubelet_volume_stats_inodes_used gauge # HELP kubelet_volume_stats_used_bytes [ALPHA] Number of used bytes in the volume # TYPE kubelet_volume_stats_used_bytes gauge - # HELP kubelet_volume_stats_health_abnormal [ALPHA] Volume health status. The count is either 1 or 0 - # TYPE kubelet_volume_stats_health_abnormal gauge + # HELP kubelet_volume_stats_health_status [ALPHA] Volume health status. The count is either 1 or 0 + # TYPE kubelet_volume_stats_health_status gauge ` var ( @@ -126,7 +126,7 @@ func TestVolumeStatsCollector(t *testing.T) { kubelet_volume_stats_inodes_free{namespace="testns",persistentvolumeclaim="testpvc"} 655344 kubelet_volume_stats_inodes_used{namespace="testns",persistentvolumeclaim="testpvc"} 16 kubelet_volume_stats_used_bytes{namespace="testns",persistentvolumeclaim="testpvc"} 4.21789696e+09 - kubelet_volume_stats_health_abnormal{namespace="testns",persistentvolumeclaim="testpvc"} 1 + kubelet_volume_stats_health_status{namespace="testns",persistentvolumeclaim="testpvc"} 1 ` metrics = []string{ @@ -136,7 +136,7 @@ func TestVolumeStatsCollector(t *testing.T) { "kubelet_volume_stats_inodes_free", "kubelet_volume_stats_inodes_used", "kubelet_volume_stats_used_bytes", - "kubelet_volume_stats_health_abnormal", + "kubelet_volume_stats_health_status", } ) diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index 7187e8d84d6..c0c31c6645a 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -53,7 +53,7 @@ const ( VolumeStatsInodesKey = "volume_stats_inodes" VolumeStatsInodesFreeKey = "volume_stats_inodes_free" VolumeStatsInodesUsedKey = "volume_stats_inodes_used" - VolumeStatsHealthAbnormalKey = "volume_stats_health_abnormal" + VolumeStatsHealthStatusKey = "volume_stats_health_status" RunningPodsKey = "running_pods" RunningContainersKey = "running_containers" // Metrics keys of remote runtime operations diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index 704476a672c..cdb5302c38d 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -230,6 +230,9 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() { "test-empty-dir": gstruct.MatchAllFields(gstruct.Fields{ "Name": gomega.Equal("test-empty-dir"), "PVCRef": gomega.BeNil(), + "VolumeHealthStats": gstruct.MatchAllFields(gstruct.Fields{ + "Abnormal": gomega.BeTrue(), + }), "FsStats": gstruct.MatchAllFields(gstruct.Fields{ "Time": recent(maxStatsAge), "AvailableBytes": fsCapacityBounds,