github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47940 from Random-Liu/update-cadvisor

Browse Source 
Automatic merge from submit-queue

Update cadvisor to v0.26.1.

Fixes https://github.com/kubernetes/kubernetes/issues/47744.

Update cadvisor to v0.26.1 to fix https://github.com/kubernetes/kubernetes/issues/47744.

```release-note
Update cadvisor to v0.26.1
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-23 19:01:35 -07:00
committed by GitHub
parent ed3c50a755 1f37e2980a
commit d2309e2a04
2 changed files with 100 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/google/cadvisor/http/handlers.go generated vendored
View File

@@ -100,7 +100,7 @@ func RegisterPrometheusHandler(mux httpmux.Mux, containerManager manager.Manager
prometheus.NewGoCollector(),
prometheus.NewProcessCollector(os.Getpid(), ""),
)
mux.Handle(prometheusEndpoint, promhttp.HandlerFor(r, promhttp.HandlerOpts{}))
mux.Handle(prometheusEndpoint, promhttp.HandlerFor(r, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}))
}
func staticHandlerNoAuth(w http.ResponseWriter, r *http.Request) {