diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/meta/metrics.go b/staging/src/k8s.io/component-base/metrics/prometheus/meta/metrics.go index d422f010e0d..66306ba2bbe 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/meta/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/meta/metrics.go @@ -23,7 +23,7 @@ import ( var ( RegisteredMetrics = k8smetrics.NewCounterVec( &k8smetrics.CounterOpts{ - Name: "registered_metric_total", + Name: "registered_metrics_total", Help: "The count of registered metrics broken by stability level and deprecation version.", StabilityLevel: k8smetrics.BETA, }, @@ -32,7 +32,7 @@ var ( DisabledMetricsTotal = k8smetrics.NewCounter( &k8smetrics.CounterOpts{ - Name: "disabled_metric_total", + Name: "disabled_metrics_total", Help: "The count of disabled metrics.", StabilityLevel: k8smetrics.BETA, }, @@ -40,7 +40,7 @@ var ( HiddenMetricsTotal = k8smetrics.NewCounter( &k8smetrics.CounterOpts{ - Name: "hidden_metric_total", + Name: "hidden_metrics_total", Help: "The count of hidden metrics.", StabilityLevel: k8smetrics.BETA, }, diff --git a/staging/src/k8s.io/component-base/metrics/registry.go b/staging/src/k8s.io/component-base/metrics/registry.go index e8fc429c058..1942f9958d2 100644 --- a/staging/src/k8s.io/component-base/metrics/registry.go +++ b/staging/src/k8s.io/component-base/metrics/registry.go @@ -39,7 +39,7 @@ var ( registeredMetrics = NewCounterVec( &CounterOpts{ - Name: "registered_metric_total", + Name: "registered_metrics_total", Help: "The count of registered metrics broken by stability level and deprecation version.", StabilityLevel: BETA, }, @@ -48,7 +48,7 @@ var ( disabledMetricsTotal = NewCounter( &CounterOpts{ - Name: "disabled_metric_total", + Name: "disabled_metrics_total", Help: "The count of disabled metrics.", StabilityLevel: BETA, }, @@ -56,7 +56,7 @@ var ( hiddenMetricsTotal = NewCounter( &CounterOpts{ - Name: "hidden_metric_total", + Name: "hidden_metrics_total", Help: "The count of hidden metrics.", StabilityLevel: BETA, }, diff --git a/test/instrumentation/testdata/stable-metrics-list.yaml b/test/instrumentation/testdata/stable-metrics-list.yaml index 968ca87f8a1..0dc8ac811eb 100644 --- a/test/instrumentation/testdata/stable-metrics-list.yaml +++ b/test/instrumentation/testdata/stable-metrics-list.yaml @@ -491,6 +491,22 @@ - 10 - 15 - 30 +- name: disabled_metrics_total + help: The count of disabled metrics. + type: Counter + stabilityLevel: BETA +- name: hidden_metrics_total + help: The count of hidden metrics. + type: Counter + stabilityLevel: BETA +- name: feature_enabled + namespace: kubernetes + help: This metric records the data about the stage and enablement of a k8s feature. + type: Gauge + stabilityLevel: BETA + labels: + - name + - stage - name: healthcheck namespace: kubernetes help: This metric records the result of a single healthcheck. @@ -508,3 +524,11 @@ - name - status - type +- name: registered_metrics_total + help: The count of registered metrics broken by stability level and deprecation + version. + type: Counter + stabilityLevel: BETA + labels: + - deprecated_version + - stability_level