Merge pull request #41807 from shyamjvs/remove-fart-metrics

Automatic merge from submit-queue (batch tested with PRs 41797, 41793, 41795, 41807, 41781) Remove unnecessary metrics (http/process/go) from being exposed by etcd-version-monitor Unregister metrics we do not want from the etcd version metrics handler. cc @wojtek-t @piosz

Merge pull request #41807 from shyamjvs/remove-fart-metrics
8fc311c9 · Kubernetes Submit Queue · GitHub · e6483568 · d5a28b36 · 8fc311c9
Commit 8fc311c9 authored Feb 22, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

etcd-version-monitor.go cluster/images/etcd-version-monitor/etcd-version-monitor.go +2 -2

No files found.
--- a/cluster/images/etcd-version-monitor/etcd-version-monitor.go
+++ b/cluster/images/etcd-version-monitor/etcd-version-monitor.go
@@ -218,7 +218,7 @@ func main() {
 	// Register the metrics we defined above with prometheus.
 	prometheus.MustRegister(etcdVersion)
 	prometheus.MustRegister(etcdGRPCRequestsTotal)
-	prometheus.Unregister(prometheus.NewGoCollector()) // Unregister go metrics.
+	prometheus.Unregister(prometheus.NewGoCollector())
 	// Spawn threads for periodically scraping etcd version metrics.
 	stopCh := make(chan struct{})
@@ -228,6 +228,6 @@ func main() {
 	// Serve our metrics on listenAddress/metricsPath.
 	glog.Infof("Listening on: %v", listenAddress)
-	http.Handle(metricsPath, prometheus.Handler())
+	http.Handle(metricsPath, prometheus.UninstrumentedHandler())
 	glog.Errorf("Stopped listening/serving metrics: %v", http.ListenAndServe(listenAddress, nil))
 }