github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Update two metrics name to make promlint happy.

Browse Source
This commit is contained in:
RainbowMango 2020-06-23 15:16:18 +08:00
parent 981f6751f8
commit 168c695e1a
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/metrics/metrics.go
View File

@ -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,
},

20
pkg/kubelet/pleg/generic_test.go
View File

@ -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
`,
},
}

5
staging/src/k8s.io/component-base/metrics/testutil/promlint.go
View File

@ -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.