Merge pull request kubernetes#91448 from RainbowMango/pr_fix_metric_n…

…aming update metrics to conform promlint
sallyom · May 28, 2020 · 472a4e9 · 472a4e9
2 parents 2572066 + 4d8280a
commit 472a4e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go
@@ -145,7 +145,7 @@ var (
 	PreemptionAttempts = metrics.NewCounter(
 		&metrics.CounterOpts{
 			Subsystem:      SchedulerSubsystem,
-			Name:           "total_preemption_attempts",
+			Name:           "preemption_attempts_total",
 			Help:           "Total preemption attempts in the cluster till now",
 			StabilityLevel: metrics.ALPHA,
 		})

diff --git a/staging/src/k8s.io/component-base/metrics/testutil/promlint.go b/staging/src/k8s.io/component-base/metrics/testutil/promlint.go
@@ -53,9 +53,6 @@ var exceptionMetrics = []string{
 	// kube-proxy
 	"kubernetes_build_info",
 
-	// kube-scheduler
-	"scheduler_total_preemption_attempts",
-
 	// kubelet-resource-v1alpha1
 	"container_cpu_usage_seconds_total",
 	"node_cpu_usage_seconds_total",