From 6f0e74a8a1987fda8383727db540868208f3f830 Mon Sep 17 00:00:00 2001 From: wuyafang Date: Wed, 23 Oct 2019 15:56:01 +0800 Subject: [PATCH] remove reference to promhttp in etcd-version-monitor --- cluster/images/etcd-version-monitor/BUILD | 1 - cluster/images/etcd-version-monitor/etcd-version-monitor.go | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cluster/images/etcd-version-monitor/BUILD b/cluster/images/etcd-version-monitor/BUILD index a6e612c9eeb..cd7ace3cc3e 100644 --- a/cluster/images/etcd-version-monitor/BUILD +++ b/cluster/images/etcd-version-monitor/BUILD @@ -18,7 +18,6 @@ go_library( deps = [ "//staging/src/k8s.io/component-base/metrics:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library", "//vendor/github.com/prometheus/client_model/go:go_default_library", "//vendor/github.com/prometheus/common/expfmt:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/cluster/images/etcd-version-monitor/etcd-version-monitor.go b/cluster/images/etcd-version-monitor/etcd-version-monitor.go index 772bffa3f15..854b3494949 100644 --- a/cluster/images/etcd-version-monitor/etcd-version-monitor.go +++ b/cluster/images/etcd-version-monitor/etcd-version-monitor.go @@ -26,7 +26,6 @@ import ( "time" "github.com/gogo/protobuf/proto" - "github.com/prometheus/client_golang/prometheus/promhttp" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" "github.com/spf13/pflag" @@ -402,6 +401,6 @@ func main() { // Serve our metrics on listenAddress/metricsPath. klog.Infof("Listening on: %v", listenAddress) - http.Handle(metricsPath, promhttp.HandlerFor(gatherer, promhttp.HandlerOpts{})) + http.Handle(metricsPath, metrics.HandlerFor(gatherer, metrics.HandlerOpts{})) klog.Errorf("Stopped listening/serving metrics: %v", http.ListenAndServe(listenAddress, nil)) }