From aaac96c6605625f9ba0a6825e0f4d5cb04b5cb77 Mon Sep 17 00:00:00 2001 From: Han Kang Date: Wed, 17 Apr 2019 15:59:46 -0700 Subject: [PATCH 1/2] Two bug fixes: (1) at least log something out if we fail to register our health check, (2) actually register a prometheus metric. I delete the deprecated metric in this block because there isn't any point to it, since no one can be broken by changing a metric that doesn't get collected --- pkg/master/master.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkg/master/master.go b/pkg/master/master.go index 972397da8b1..8c24f3d3df7 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -469,15 +469,10 @@ func (m *Master) InstallLegacyAPI(c *completedConfig, restOptionsGetter generic. func (m *Master) installTunneler(nodeTunneler tunneler.Tunneler, nodeClient corev1client.NodeInterface) { nodeTunneler.Run(nodeAddressProvider{nodeClient}.externalAddresses) - m.GenericAPIServer.AddHealthChecks(healthz.NamedCheck("SSH Tunnel Check", tunneler.TunnelSyncHealthChecker(nodeTunneler))) - prometheus.NewGaugeFunc(prometheus.GaugeOpts{ - Name: "apiserver_proxy_tunnel_sync_duration_seconds", - Help: "The time since the last successful synchronization of the SSH tunnels for proxy requests.", - }, func() float64 { return float64(nodeTunneler.SecondsSinceSync()) }) - prometheus.NewGaugeFunc(prometheus.GaugeOpts{ - Name: "apiserver_proxy_tunnel_sync_latency_secs", - Help: "(Deprecated) The time since the last successful synchronization of the SSH tunnels for proxy requests.", - }, func() float64 { return float64(nodeTunneler.SecondsSinceSync()) }) + err := m.GenericAPIServer.AddHealthChecks(healthz.NamedCheck("SSH Tunnel Check", tunneler.TunnelSyncHealthChecker(nodeTunneler))) + if err != nil { + klog.Errorf("Failed adding ssh tunnel health check %v\n", err) + } } // RESTStorageProvider is a factory type for REST storage. From 6de70829784c031190b05b52bf5c1331d1d6e9e4 Mon Sep 17 00:00:00 2001 From: Han Kang Date: Mon, 29 Apr 2019 10:45:08 -0700 Subject: [PATCH 2/2] remove two unused metrics --- pkg/master/BUILD | 1 - pkg/master/master.go | 1 - 2 files changed, 2 deletions(-) diff --git a/pkg/master/BUILD b/pkg/master/BUILD index cfe4d5f7c4f..8352c992662 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -129,7 +129,6 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1beta1:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/integer:go_default_library", "//vendor/k8s.io/utils/net:go_default_library", diff --git a/pkg/master/master.go b/pkg/master/master.go index 8c24f3d3df7..769376ec1f4 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -89,7 +89,6 @@ import ( "k8s.io/kubernetes/pkg/serviceaccount" nodeutil "k8s.io/kubernetes/pkg/util/node" - "github.com/prometheus/client_golang/prometheus" "k8s.io/klog" // RESTStorage installers