From 5e46d5b5450f7e7db87e860440f1bb1f8f523ffa Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 9 Sep 2017 14:01:52 -0400 Subject: [PATCH] Normalize WATCHLIST to WATCH in metrics This causes confusion and doesn't match what we authorize on --- staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go index a6bf6a862a1..3af97d7ccb4 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go @@ -106,6 +106,10 @@ func MonitorRequest(request *http.Request, verb, resource, subresource, scope, c } } } + // normalize the legacy WATCHLIST to WATCH to ensure users aren't surprised by metrics + if verb == "WATCHLIST" { + reportedVerb = "WATCH" + } client := cleanUserAgent(utilnet.GetHTTPClient(request)) Monitor(reportedVerb, resource, subresource, scope, client, contentType, httpCode, respSize, reqStart)