github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

promote the following APF metrics to beta:

Browse Source 
apiserver_flowcontrol_request_wait_duration_seconds
apiserver_flowcontrol_request_concurrency_in_use
apiserver_flowcontrol_request_concurrency_limit
apiserver_flowcontrol_rejected_requests_total
apiserver_flowcontrol_dispatched_requests_total
apiserver_flowcontrol_current_inqueue_requests
apiserver_flowcontrol_current_executing_requests

Signed-off-by: Andrew Sy Kim <andrewsy@google.com>
This commit is contained in:
Andrew Sy Kim 2023-07-05 18:19:36 +00:00
parent 4fa97eae1b
commit 0bb419b149
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go
View File

@ -379,7 +379,7 @@ func (uss *uniformScenarioState) finalReview() {
} }
if uss.evalInqueueMetrics { if uss.evalInqueueMetrics {
e := ` e := `
# HELP apiserver_flowcontrol_current_inqueue_requests [ALPHA] Number of requests currently pending in queues of the API Priority and Fairness subsystem # HELP apiserver_flowcontrol_current_inqueue_requests [BETA] Number of requests currently pending in queues of the API Priority and Fairness subsystem
# TYPE apiserver_flowcontrol_current_inqueue_requests gauge # TYPE apiserver_flowcontrol_current_inqueue_requests gauge
` + uss.expectedInqueue ` + uss.expectedInqueue
err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_current_inqueue_requests") err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_current_inqueue_requests")
@ -402,7 +402,7 @@ func (uss *uniformScenarioState) finalReview() {
} }
if uss.evalExecutingMetrics && len(uss.expectedExecuting) > 0 { if uss.evalExecutingMetrics && len(uss.expectedExecuting) > 0 {
e := ` e := `
# HELP apiserver_flowcontrol_current_executing_requests [ALPHA] Number of requests in initial (for a WATCH) or any (for a non-WATCH) execution stage in the API Priority and Fairness subsystem # HELP apiserver_flowcontrol_current_executing_requests [BETA] Number of requests in initial (for a WATCH) or any (for a non-WATCH) execution stage in the API Priority and Fairness subsystem
# TYPE apiserver_flowcontrol_current_executing_requests gauge # TYPE apiserver_flowcontrol_current_executing_requests gauge
` + uss.expectedExecuting ` + uss.expectedExecuting
err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_current_executing_requests") err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_current_executing_requests")
@ -426,7 +426,7 @@ func (uss *uniformScenarioState) finalReview() {
} }
if uss.evalExecutingMetrics && len(expectedRejects) > 0 { if uss.evalExecutingMetrics && len(expectedRejects) > 0 {
e := ` e := `
# HELP apiserver_flowcontrol_rejected_requests_total [ALPHA] Number of requests rejected by API Priority and Fairness subsystem # HELP apiserver_flowcontrol_rejected_requests_total [BETA] Number of requests rejected by API Priority and Fairness subsystem
# TYPE apiserver_flowcontrol_rejected_requests_total counter # TYPE apiserver_flowcontrol_rejected_requests_total counter
` + expectedRejects ` + expectedRejects
err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_rejected_requests_total") err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_rejected_requests_total")

14
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/metrics/metrics.go
View File

@ -94,7 +94,7 @@ var (
Subsystem: subsystem, Subsystem: subsystem,
Name: "rejected_requests_total", Name: "rejected_requests_total",
Help: "Number of requests rejected by API Priority and Fairness subsystem", Help: "Number of requests rejected by API Priority and Fairness subsystem",
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.BETA,
}, },
[]string{priorityLevel, flowSchema, "reason"}, []string{priorityLevel, flowSchema, "reason"},
) )
@ -104,7 +104,7 @@ var (
Subsystem: subsystem, Subsystem: subsystem,
Name: "dispatched_requests_total", Name: "dispatched_requests_total",
Help: "Number of requests executed by API Priority and Fairness subsystem", Help: "Number of requests executed by API Priority and Fairness subsystem",
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.BETA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
@ -206,7 +206,7 @@ var (
Subsystem: subsystem, Subsystem: subsystem,
Name: "current_inqueue_requests", Name: "current_inqueue_requests",
Help: "Number of requests currently pending in queues of the API Priority and Fairness subsystem", Help: "Number of requests currently pending in queues of the API Priority and Fairness subsystem",
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.BETA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
@ -237,7 +237,7 @@ var (
Subsystem: subsystem, Subsystem: subsystem,
Name: "current_executing_requests", Name: "current_executing_requests",
Help: "Number of requests in initial (for a WATCH) or any (for a non-WATCH) execution stage in the API Priority and Fairness subsystem", Help: "Number of requests in initial (for a WATCH) or any (for a non-WATCH) execution stage in the API Priority and Fairness subsystem",
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.BETA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
@ -247,7 +247,7 @@ var (
Subsystem: subsystem, Subsystem: subsystem,
Name: "current_executing_seats", Name: "current_executing_seats",
Help: "Concurrency (number of seats) occupied by the currently executing (initial stage for a WATCH, any stage otherwise) requests in the API Priority and Fairness subsystem", Help: "Concurrency (number of seats) occupied by the currently executing (initial stage for a WATCH, any stage otherwise) requests in the API Priority and Fairness subsystem",
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.BETA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
@ -269,7 +269,7 @@ var (
Name: "request_wait_duration_seconds", Name: "request_wait_duration_seconds",
Help: "Length of time a request spent waiting in its queue", Help: "Length of time a request spent waiting in its queue",
Buckets: requestDurationSecondsBuckets, Buckets: requestDurationSecondsBuckets,
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.BETA,
}, },
[]string{priorityLevel, flowSchema, "execute"}, []string{priorityLevel, flowSchema, "execute"},
) )
@ -334,7 +334,7 @@ var (
Subsystem: subsystem, Subsystem: subsystem,
Name: "nominal_limit_seats", Name: "nominal_limit_seats",
Help: "Nominal number of execution seats configured for each priority level", Help: "Nominal number of execution seats configured for each priority level",
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.BETA,
}, },
[]string{priorityLevel}, []string{priorityLevel},
) )