Merge pull request #16266 from smarterclayton/metrics

Automatic merge from submit-queue (batch tested with PRs 16362, 16266) Backport metrics fixes Fixes #16208 This needs to be in the next release drop UPSTREAM: 48583: Record 429 and timeout errors to prometheus UPSTREAM: 49117: Add apiserver metric for response sizes split by namespace scope UPSTREAM: 49678: Report non-resource URLs in max-in-flight correctly UPSTREAM: 49678: Timeout filter returns 504 and an inconsistent error body UPSTREAM: 50123: Report pod logs as CONNECT in metrics UPSTREAM: 52237: Add scope to all apiserver metrics and report resource scope
openshift · Sep 16, 2017 · 87f0882 · 87f0882
2 parents b79442b + 3959bdc
commit 87f0882
Show file tree

Hide file tree

Showing 10 changed files with 227 additions and 69 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/rest/log.go b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/rest/log.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/proxy.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/proxy.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go