From 37caf87d6df6cb1aa532642b3bf532c3b3d68125 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 10 Sep 2021 08:35:00 -0700 Subject: [PATCH] Add exposed metrics listener instead of replacing loopback listener Signed-off-by: Brad Davidson --- pkg/etcd/etcd.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go index 7d31d7eacf..986e8d77c0 100644 --- a/pkg/etcd/etcd.go +++ b/pkg/etcd/etcd.go @@ -523,10 +523,11 @@ func (e *ETCD) clientURL() string { // metricsURL returns the metrics access address func (e *ETCD) metricsURL(expose bool) string { + address := "http://127.0.0.1:2381" if expose { - return fmt.Sprintf("http://%s:2381", e.address) + address = fmt.Sprintf("http://%s:2381,%s", e.address, address) } - return "http://127.0.0.1:2381" + return address } // cluster returns ETCDConfig for a cluster @@ -535,7 +536,7 @@ func (e *ETCD) cluster(ctx context.Context, forceNew bool, options executor.Init Name: e.name, InitialOptions: options, ForceNewCluster: forceNew, - ListenClientURLs: fmt.Sprintf(e.clientURL() + ",https://127.0.0.1:2379"), + ListenClientURLs: e.clientURL() + ",https://127.0.0.1:2379", ListenMetricsURLs: e.metricsURL(e.config.EtcdExposeMetrics), ListenPeerURLs: e.peerURL(), AdvertiseClientURLs: e.clientURL(),