kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant metric field. 

Kubernetes-commit: 14f3c26842d69d300f1912b6cfb7f4af520d4fd9
This commit is contained in:
Cici Huang 2025-07-14 18:03:57 +00:00 committed by Kubernetes Publisher
parent cb7f41362b
commit fa2b77c7b9
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/admission/plugin/policy/mutating/metrics/metrics.go
View File

@ -65,7 +65,7 @@ func newMutationAdmissionMetrics() *MutatingAdmissionPolicyMetrics {
Help: "Mutation admission policy check total, labeled by policy and further identified by binding.",
StabilityLevel: metrics.ALPHA,
},
[]string{"policy", "policy_binding", "error_type", "mutation_action"},
[]string{"policy", "policy_binding", "error_type"},
)
latency := metrics.NewHistogramVec(&metrics.HistogramOpts{
Namespace: metricsNamespace,
@ -83,7 +83,7 @@ func newMutationAdmissionMetrics() *MutatingAdmissionPolicyMetrics {
Buckets: []float64{0.0000005, 0.001, 0.01, 0.1, 1.0},
StabilityLevel: metrics.ALPHA,
},
[]string{"policy", "policy_binding", "error_type", "mutation_action"},
[]string{"policy", "policy_binding", "error_type"},
)
legacyregistry.MustRegister(check)
@ -99,12 +99,12 @@ func (m *MutatingAdmissionPolicyMetrics) Reset() {
// ObserveAdmission observes a policy mutation, with an optional error to indicate the error that may occur but ignored.
func (m *MutatingAdmissionPolicyMetrics) ObserveAdmission(ctx context.Context, elapsed time.Duration, policy, binding string, errorType MutationErrorType) {
m.policyCheck.WithContext(ctx).WithLabelValues(policy, binding, string(errorType), "pass").Inc()
m.policyLatency.WithContext(ctx).WithLabelValues(policy, binding, string(errorType), "pass").Observe(elapsed.Seconds())
m.policyCheck.WithContext(ctx).WithLabelValues(policy, binding, string(errorType)).Inc()
m.policyLatency.WithContext(ctx).WithLabelValues(policy, binding, string(errorType)).Observe(elapsed.Seconds())
}
// ObserveRejection observes a policy mutation error that was at least one of the reasons for a deny.
func (m *MutatingAdmissionPolicyMetrics) ObserveRejection(ctx context.Context, elapsed time.Duration, policy, binding string, errorType MutationErrorType) {
m.policyCheck.WithContext(ctx).WithLabelValues(policy, binding, string(errorType), "error").Inc()
m.policyLatency.WithContext(ctx).WithLabelValues(policy, binding, string(errorType), "error").Observe(elapsed.Seconds())
m.policyCheck.WithContext(ctx).WithLabelValues(policy, binding, string(errorType)).Inc()
m.policyLatency.WithContext(ctx).WithLabelValues(policy, binding, string(errorType)).Observe(elapsed.Seconds())
}

36
pkg/admission/plugin/policy/mutating/metrics/metrics_test.go
View File

@ -45,17 +45,17 @@ func TestNoUtils(t *testing.T) {
want: `
# HELP apiserver_mutating_admission_policy_check_duration_seconds [ALPHA] Mutation admission latency for individual mutation expressions in seconds, labeled by policy and binding.
# TYPE apiserver_mutating_admission_policy_check_duration_seconds histogram
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com",le="0.0000005"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com",le="0.001"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com",le="0.01"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com",le="0.1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com",le="1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com",le="+Inf"} 1
apiserver_mutating_admission_policy_check_duration_seconds_sum{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com"} 10
apiserver_mutating_admission_policy_check_duration_seconds_count{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com"} 1
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.0000005"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.001"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.01"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="+Inf"} 1
apiserver_mutating_admission_policy_check_duration_seconds_sum{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 10
apiserver_mutating_admission_policy_check_duration_seconds_count{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1
# HELP apiserver_mutating_admission_policy_check_total [ALPHA] Mutation admission policy check total, labeled by policy and further identified by binding.
# TYPE apiserver_mutating_admission_policy_check_total counter
apiserver_mutating_admission_policy_check_total{error_type="invalid_error",mutation_action="pass",policy="policy.example.com",policy_binding="binding.example.com"} 1
apiserver_mutating_admission_policy_check_total{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1
`,
observer: func() {
Metrics.ObserveAdmission(context.TODO(), time.Duration(10)*time.Second, "policy.example.com", "binding.example.com", MutatingInvalidError)
@ -66,17 +66,17 @@ func TestNoUtils(t *testing.T) {
want: `
# HELP apiserver_mutating_admission_policy_check_duration_seconds [ALPHA] Mutation admission latency for individual mutation expressions in seconds, labeled by policy and binding.
# TYPE apiserver_mutating_admission_policy_check_duration_seconds histogram
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com",le="0.0000005"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com",le="0.001"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com",le="0.01"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com",le="0.1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com",le="1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com",le="+Inf"} 1
apiserver_mutating_admission_policy_check_duration_seconds_sum{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com"} 10
apiserver_mutating_admission_policy_check_duration_seconds_count{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com"} 1
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.0000005"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.001"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.01"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="0.1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="1"} 0
apiserver_mutating_admission_policy_check_duration_seconds_bucket{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com",le="+Inf"} 1
apiserver_mutating_admission_policy_check_duration_seconds_sum{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 10
apiserver_mutating_admission_policy_check_duration_seconds_count{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1
# HELP apiserver_mutating_admission_policy_check_total [ALPHA] Mutation admission policy check total, labeled by policy and further identified by binding.
# TYPE apiserver_mutating_admission_policy_check_total counter
apiserver_mutating_admission_policy_check_total{error_type="invalid_error",mutation_action="error",policy="policy.example.com",policy_binding="binding.example.com"} 1
apiserver_mutating_admission_policy_check_total{error_type="invalid_error",policy="policy.example.com",policy_binding="binding.example.com"} 1
`,
observer: func() {
Metrics.ObserveRejection(context.TODO(), time.Duration(10)*time.Second, "policy.example.com", "binding.example.com", MutatingInvalidError)