diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics.go b/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics.go index f7357aa955e..7fb4a8e064e 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics.go @@ -18,8 +18,6 @@ package slis import ( "context" - "errors" - k8smetrics "k8s.io/component-base/metrics" ) @@ -28,17 +26,10 @@ type HealthcheckStatus string const ( Success HealthcheckStatus = "success" Error HealthcheckStatus = "error" - Pending HealthcheckStatus = "pending" ) type HealthcheckType string -const ( - Livez HealthcheckType = "livez" - Readyz HealthcheckType = "readyz" - Healthz HealthcheckType = "healthz" -) - var ( // healthcheck is a Prometheus Gauge metrics used for recording the results of a k8s healthcheck. healthcheck = k8smetrics.NewGaugeVec( @@ -48,7 +39,7 @@ var ( Help: "This metric records the result of a single healthcheck.", StabilityLevel: k8smetrics.ALPHA, }, - []string{"name", "type", "status"}, + []string{"name", "type"}, ) // healthchecksTotal is a Prometheus Counter metrics used for counting the results of a k8s healthcheck. @@ -61,8 +52,6 @@ var ( }, []string{"name", "type", "status"}, ) - statuses = []HealthcheckStatus{Success, Error, Pending} - statusSet = map[HealthcheckStatus]struct{}{Success: {}, Error: {}, Pending: {}} ) func Register(registry k8smetrics.KubeRegistry) { @@ -76,15 +65,12 @@ func ResetHealthMetrics() { } func ObserveHealthcheck(ctx context.Context, name string, healthcheckType string, status HealthcheckStatus) error { - if _, ok := statusSet[status]; !ok { - return errors.New("not a valid healthcheck status") - } - for _, s := range statuses { - if status != s { - healthcheck.WithContext(ctx).WithLabelValues(name, healthcheckType, string(s)).Set(0) - } + if status == Success { + healthcheck.WithContext(ctx).WithLabelValues(name, healthcheckType).Set(1) + } else { + healthcheck.WithContext(ctx).WithLabelValues(name, healthcheckType).Set(0) } + healthchecksTotal.WithContext(ctx).WithLabelValues(name, healthcheckType, string(status)).Inc() - healthcheck.WithContext(ctx).WithLabelValues(name, healthcheckType, string(status)).Set(1) return nil } diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics_test.go b/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics_test.go index 40d5122e04b..b4f8df34046 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics_test.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/slis/metrics_test.go @@ -39,9 +39,7 @@ func TestObserveHealthcheck(t *testing.T) { initialOutput := ` # 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 + kubernetes_healthcheck{name="healthcheck-a",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 @@ -53,23 +51,6 @@ func TestObserveHealthcheck(t *testing.T) { hcStatus HealthcheckStatus want string }{ - { - desc: "test pending", - name: healthcheckName, - hcType: "healthz", - hcStatus: Pending, - want: ` - # 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 -`, - }, { desc: "test success", name: healthcheckName, @@ -78,9 +59,7 @@ func TestObserveHealthcheck(t *testing.T) { want: ` # 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 + kubernetes_healthcheck{name="healthcheck-a",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