From 168c695e1ad1546f16c55cfc6a7fb339405c4785 Mon Sep 17 00:00:00 2001
From: RainbowMango <renhongcai@huawei.com>
Date: Tue, 23 Jun 2020 15:16:18 +0800
Subject: [PATCH] Update two metrics name to make promlint happy.

---
 pkg/kubelet/metrics/metrics.go                |  4 ++--
 pkg/kubelet/pleg/generic_test.go              | 20 +++++++++----------
 .../metrics/testutil/promlint.go              |  5 +----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go
index 7174242af52..96c83683fe8 100644
--- a/pkg/kubelet/metrics/metrics.go
+++ b/pkg/kubelet/metrics/metrics.go
@@ -349,7 +349,7 @@ var (
 	RunningPodCount = metrics.NewGauge(
 		&metrics.GaugeOpts{
 			Subsystem:      KubeletSubsystem,
-			Name:           "running_pod_count",
+			Name:           "running_pods",
 			Help:           "Number of pods currently running",
 			StabilityLevel: metrics.ALPHA,
 		},
@@ -358,7 +358,7 @@ var (
 	RunningContainerCount = metrics.NewGaugeVec(
 		&metrics.GaugeOpts{
 			Subsystem:      KubeletSubsystem,
-			Name:           "running_container_count",
+			Name:           "running_containers",
 			Help:           "Number of containers currently running",
 			StabilityLevel: metrics.ALPHA,
 		},
diff --git a/pkg/kubelet/pleg/generic_test.go b/pkg/kubelet/pleg/generic_test.go
index 3a02ead5aa0..8c4f17b2e77 100644
--- a/pkg/kubelet/pleg/generic_test.go
+++ b/pkg/kubelet/pleg/generic_test.go
@@ -682,22 +682,22 @@ func TestRunningPodAndContainerCount(t *testing.T) {
 	}{
 		{
 			name:        "test container count",
-			metricsName: "kubelet_running_container_count",
+			metricsName: "kubelet_running_containers",
 			wants: `
-# HELP kubelet_running_container_count [ALPHA] Number of containers currently running
-# TYPE kubelet_running_container_count gauge
-kubelet_running_container_count{container_state="exited"} 1
-kubelet_running_container_count{container_state="running"} 1
-kubelet_running_container_count{container_state="unknown"} 2
+# HELP kubelet_running_containers [ALPHA] Number of containers currently running
+# TYPE kubelet_running_containers gauge
+kubelet_running_containers{container_state="exited"} 1
+kubelet_running_containers{container_state="running"} 1
+kubelet_running_containers{container_state="unknown"} 2
 `,
 		},
 		{
 			name:        "test pod count",
-			metricsName: "kubelet_running_pod_count",
+			metricsName: "kubelet_running_pods",
 			wants: `
-# HELP kubelet_running_pod_count [ALPHA] Number of pods currently running
-# TYPE kubelet_running_pod_count gauge
-kubelet_running_pod_count 2
+# HELP kubelet_running_pods [ALPHA] Number of pods currently running
+# TYPE kubelet_running_pods gauge
+kubelet_running_pods 2
 `,
 		},
 	}
diff --git a/staging/src/k8s.io/component-base/metrics/testutil/promlint.go b/staging/src/k8s.io/component-base/metrics/testutil/promlint.go
index 2a8d19b7b3a..4e270c4089a 100644
--- a/staging/src/k8s.io/component-base/metrics/testutil/promlint.go
+++ b/staging/src/k8s.io/component-base/metrics/testutil/promlint.go
@@ -64,12 +64,9 @@ var exceptionMetrics = []string{
 	"node_collector_evictions_number",
 
 	// k8s.io/kubernetes/pkg/kubelet/server/stats
+	// The two metrics have been deprecated and will be removed in release v1.20+.
 	"container_cpu_usage_seconds_total", // non-counter metrics should not have "_total" suffix
 	"node_cpu_usage_seconds_total",      // non-counter metrics should not have "_total" suffix
-
-	// k8s.io/kubernetes/pkg/kubelet/pleg
-	"kubelet_running_container_count", // non-histogram and non-summary metrics should not have "_count" suffix
-	"kubelet_running_pod_count",       // non-histogram and non-summary metrics should not have "_count" suffix
 }
 
 // A Problem is an issue detected by a Linter.