From 1bc5ed4515e7f92a1c40b2edb61b6a355513fb95 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Fri, 5 Jun 2020 11:37:23 +0800 Subject: [PATCH] update metric kubernetes_build_info labels from camelCase to snake_case. --- .../component-base/metrics/prometheus/version/metrics.go | 2 +- .../src/k8s.io/component-base/metrics/testutil/promlint.go | 4 ---- staging/src/k8s.io/component-base/metrics/version.go | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/version/metrics.go b/staging/src/k8s.io/component-base/metrics/prometheus/version/metrics.go index 408812bab2b..c74f31f958d 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/version/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/version/metrics.go @@ -29,7 +29,7 @@ var ( Help: "A metric with a constant '1' value labeled by major, minor, git version, git commit, git tree state, build date, Go version, and compiler from which Kubernetes was built, and platform on which it is running.", StabilityLevel: metrics.ALPHA, }, - []string{"major", "minor", "gitVersion", "gitCommit", "gitTreeState", "buildDate", "goVersion", "compiler", "platform"}, + []string{"major", "minor", "git_version", "git_commit", "git_tree_state", "build_date", "go_version", "compiler", "platform"}, ) ) 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 e5575b72cb2..9e9e479520b 100644 --- a/staging/src/k8s.io/component-base/metrics/testutil/promlint.go +++ b/staging/src/k8s.io/component-base/metrics/testutil/promlint.go @@ -47,12 +47,8 @@ var exceptionMetrics = []string{ "authentication_attempts", "get_token_count", "get_token_fail_count", - "kubernetes_build_info", "node_collector_evictions_number", - // kube-proxy - "kubernetes_build_info", - // kubelet-resource-v1alpha1 "container_cpu_usage_seconds_total", "node_cpu_usage_seconds_total", diff --git a/staging/src/k8s.io/component-base/metrics/version.go b/staging/src/k8s.io/component-base/metrics/version.go index 63cc606e4c1..f963e205eb6 100644 --- a/staging/src/k8s.io/component-base/metrics/version.go +++ b/staging/src/k8s.io/component-base/metrics/version.go @@ -25,7 +25,7 @@ var ( Help: "A metric with a constant '1' value labeled by major, minor, git version, git commit, git tree state, build date, Go version, and compiler from which Kubernetes was built, and platform on which it is running.", StabilityLevel: ALPHA, }, - []string{"major", "minor", "gitVersion", "gitCommit", "gitTreeState", "buildDate", "goVersion", "compiler", "platform"}, + []string{"major", "minor", "git_version", "git_commit", "git_tree_state", "build_date", "go_version", "compiler", "platform"}, ) )