From 2f2b018a3e33aa28d8fd56e37a0e09a7e3dccb8c Mon Sep 17 00:00:00 2001 From: Han Kang Date: Thu, 22 Sep 2022 11:09:19 -0700 Subject: [PATCH] change prefix to make it consistent with kubernetes_build_info Change-Id: Ia0f65bec6c0dc092c3db9b5b1c22059a0c8c9776 --- .../metrics/prometheus/feature/metrics.go | 2 +- .../prometheus/feature/metrics_test.go | 14 ++--- .../metrics/prometheus/health/metrics.go | 4 +- .../metrics/prometheus/health/metrics_test.go | 54 +++++++++---------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics.go b/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics.go index 5aecdc50db1..c1bee3c04c7 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics.go @@ -28,7 +28,7 @@ var ( // featureInfo is a Prometheus Gauge metrics used for recording the enablement of a k8s feature. featureInfo = k8smetrics.NewGaugeVec( &k8smetrics.GaugeOpts{ - Namespace: "k8s", + Namespace: "kubernetes", Name: "feature_info", Help: "This metric records the data about the stage and enablement of a k8s feature.", StabilityLevel: k8smetrics.ALPHA, diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics_test.go b/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics_test.go index 49f4b1274b4..0489fed8358 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics_test.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/feature/metrics_test.go @@ -26,7 +26,7 @@ import ( ) var ( - testedMetrics = []string{"k8s_feature_info"} + testedMetrics = []string{"kubernetes_feature_info"} ) func TestObserveHealthcheck(t *testing.T) { @@ -46,9 +46,9 @@ func TestObserveHealthcheck(t *testing.T) { stage: "ALPHA", enabled: true, want: ` - # HELP k8s_feature_info [ALPHA] This metric records the data about the stage and enablement of a k8s feature. - # TYPE k8s_feature_info gauge - k8s_feature_info{enabled="true",name="feature-a",stage="ALPHA"} 1 + # HELP kubernetes_feature_info [ALPHA] This metric records the data about the stage and enablement of a k8s feature. + # TYPE kubernetes_feature_info gauge + kubernetes_feature_info{enabled="true",name="feature-a",stage="ALPHA"} 1 `, }, { @@ -57,9 +57,9 @@ func TestObserveHealthcheck(t *testing.T) { stage: "BETA", enabled: false, want: ` - # HELP k8s_feature_info [ALPHA] This metric records the data about the stage and enablement of a k8s feature. - # TYPE k8s_feature_info gauge - k8s_feature_info{enabled="false",name="feature-b",stage="BETA"} 1 + # HELP kubernetes_feature_info [ALPHA] This metric records the data about the stage and enablement of a k8s feature. + # TYPE kubernetes_feature_info gauge + kubernetes_feature_info{enabled="false",name="feature-b",stage="BETA"} 1 `, }, } diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics.go b/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics.go index 4be16d7cb0b..7e429528b75 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics.go @@ -44,7 +44,7 @@ var ( // healthcheck is a Prometheus Gauge metrics used for recording the results of a k8s healthcheck. healthcheck = k8smetrics.NewGaugeVec( &k8smetrics.GaugeOpts{ - Namespace: "k8s", + Namespace: "kubernetes", Name: "healthcheck", Help: "This metric records the result of a single healthcheck.", StabilityLevel: k8smetrics.ALPHA, @@ -55,7 +55,7 @@ var ( // healthchecksTotal is a Prometheus Counter metrics used for counting the results of a k8s healthcheck. healthchecksTotal = k8smetrics.NewCounterVec( &k8smetrics.CounterOpts{ - Namespace: "k8s", + Namespace: "kubernetes", Name: "healthchecks_total", Help: "This metric records the results of all healthcheck.", StabilityLevel: k8smetrics.ALPHA, diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics_test.go b/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics_test.go index 9ba52a3099a..1910d4ec291 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics_test.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/health/metrics_test.go @@ -26,7 +26,7 @@ import ( ) var ( - testedMetrics = []string{"k8s_healthcheck", "k8s_healthchecks_total"} + testedMetrics = []string{"kubernetes_healthcheck", "kubernetes_healthchecks_total"} ) func TestObserveHealthcheck(t *testing.T) { @@ -35,14 +35,14 @@ func TestObserveHealthcheck(t *testing.T) { initialState := Error healthcheckName := "healthcheck-a" initialOutput := ` - # HELP k8s_healthcheck [ALPHA] This metric records the result of a single healthcheck. - # TYPE k8s_healthcheck gauge - k8s_healthcheck{name="healthcheck-a",status="error",type="healthz"} 1 - k8s_healthcheck{name="healthcheck-a",status="pending",type="healthz"} 0 - k8s_healthcheck{name="healthcheck-a",status="success",type="healthz"} 0 - # HELP k8s_healthchecks_total [ALPHA] This metric records the results of all healthcheck. - # TYPE k8s_healthchecks_total counter - k8s_healthchecks_total{name="healthcheck-a",status="error",type="healthz"} 1 + # HELP kubernetes_healthcheck [ALPHA] This metric records the result of a single healthcheck. + # TYPE kubernetes_healthcheck gauge + kubernetes_healthcheck{name="healthcheck-a",status="error",type="healthz"} 1 + kubernetes_healthcheck{name="healthcheck-a",status="pending",type="healthz"} 0 + kubernetes_healthcheck{name="healthcheck-a",status="success",type="healthz"} 0 + # HELP kubernetes_healthchecks_total [ALPHA] This metric records the results of all healthcheck. + # TYPE kubernetes_healthchecks_total counter + kubernetes_healthchecks_total{name="healthcheck-a",status="error",type="healthz"} 1 ` testCases := []struct { desc string @@ -57,15 +57,15 @@ func TestObserveHealthcheck(t *testing.T) { hcType: Healthz, hcStatus: Pending, want: ` - # HELP k8s_healthcheck [ALPHA] This metric records the result of a single healthcheck. - # TYPE k8s_healthcheck gauge - k8s_healthcheck{name="healthcheck-a",status="error",type="healthz"} 0 - k8s_healthcheck{name="healthcheck-a",status="pending",type="healthz"} 1 - k8s_healthcheck{name="healthcheck-a",status="success",type="healthz"} 0 - # HELP k8s_healthchecks_total [ALPHA] This metric records the results of all healthcheck. - # TYPE k8s_healthchecks_total counter - k8s_healthchecks_total{name="healthcheck-a",status="error",type="healthz"} 1 - k8s_healthchecks_total{name="healthcheck-a",status="pending",type="healthz"} 1 + # HELP kubernetes_healthcheck [ALPHA] This metric records the result of a single healthcheck. + # TYPE kubernetes_healthcheck gauge + kubernetes_healthcheck{name="healthcheck-a",status="error",type="healthz"} 0 + kubernetes_healthcheck{name="healthcheck-a",status="pending",type="healthz"} 1 + kubernetes_healthcheck{name="healthcheck-a",status="success",type="healthz"} 0 + # HELP kubernetes_healthchecks_total [ALPHA] This metric records the results of all healthcheck. + # TYPE kubernetes_healthchecks_total counter + kubernetes_healthchecks_total{name="healthcheck-a",status="error",type="healthz"} 1 + kubernetes_healthchecks_total{name="healthcheck-a",status="pending",type="healthz"} 1 `, }, { @@ -74,15 +74,15 @@ func TestObserveHealthcheck(t *testing.T) { hcType: Healthz, hcStatus: Success, want: ` - # HELP k8s_healthcheck [ALPHA] This metric records the result of a single healthcheck. - # TYPE k8s_healthcheck gauge - k8s_healthcheck{name="healthcheck-a",status="error",type="healthz"} 0 - k8s_healthcheck{name="healthcheck-a",status="pending",type="healthz"} 0 - k8s_healthcheck{name="healthcheck-a",status="success",type="healthz"} 1 - # HELP k8s_healthchecks_total [ALPHA] This metric records the results of all healthcheck. - # TYPE k8s_healthchecks_total counter - k8s_healthchecks_total{name="healthcheck-a",status="error",type="healthz"} 1 - k8s_healthchecks_total{name="healthcheck-a",status="success",type="healthz"} 1 + # HELP kubernetes_healthcheck [ALPHA] This metric records the result of a single healthcheck. + # TYPE kubernetes_healthcheck gauge + kubernetes_healthcheck{name="healthcheck-a",status="error",type="healthz"} 0 + kubernetes_healthcheck{name="healthcheck-a",status="pending",type="healthz"} 0 + kubernetes_healthcheck{name="healthcheck-a",status="success",type="healthz"} 1 + # HELP kubernetes_healthchecks_total [ALPHA] This metric records the results of all healthcheck. + # TYPE kubernetes_healthchecks_total counter + kubernetes_healthchecks_total{name="healthcheck-a",status="error",type="healthz"} 1 + kubernetes_healthchecks_total{name="healthcheck-a",status="success",type="healthz"} 1 `, }, }