From 10ab3fb8327f51ea42ce19f4163942d99ee49088 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Wed, 6 Mar 2019 15:23:46 +0800 Subject: [PATCH] clean the deprecated metrics which introduced recently --- pkg/proxy/iptables/proxier.go | 1 - pkg/proxy/ipvs/proxier.go | 1 - pkg/proxy/metrics/metrics.go | 13 ------------- 3 files changed, 15 deletions(-) diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 6f275d113d..a4f8dc8ef7 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -1356,7 +1356,6 @@ func (proxier *Proxier) syncProxyRules() { for _, lastChangeTriggerTime := range endpointUpdateResult.LastChangeTriggerTimes { latency := metrics.SinceInSeconds(lastChangeTriggerTime) metrics.NetworkProgrammingLatency.Observe(latency) - metrics.DeprecatedNetworkProgrammingLatency.Observe(latency) klog.V(4).Infof("Network programming took %f seconds", latency) } diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index bf07ff6b92..49c32a0ca8 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -1203,7 +1203,6 @@ func (proxier *Proxier) syncProxyRules() { for _, lastChangeTriggerTime := range endpointUpdateResult.LastChangeTriggerTimes { latency := metrics.SinceInSeconds(lastChangeTriggerTime) metrics.NetworkProgrammingLatency.Observe(latency) - metrics.DeprecatedNetworkProgrammingLatency.Observe(latency) klog.V(4).Infof("Network programming took %f seconds", latency) } diff --git a/pkg/proxy/metrics/metrics.go b/pkg/proxy/metrics/metrics.go index 4d7e755341..38924387ff 100644 --- a/pkg/proxy/metrics/metrics.go +++ b/pkg/proxy/metrics/metrics.go @@ -63,18 +63,6 @@ var ( Buckets: prometheus.ExponentialBuckets(0.001, 2, 20), }, ) - - // DeprecatedNetworkProgrammingLatency is deprecated, please use NetworkProgrammingLatency. - DeprecatedNetworkProgrammingLatency = prometheus.NewHistogram( - prometheus.HistogramOpts{ - Subsystem: kubeProxySubsystem, - Name: "network_programming_latency_seconds", - Help: "(Deprecated) In Cluster Network Programming Latency in seconds", - // TODO(mm4tt): Reevaluate buckets before 1.14 release. - // The last bucket will be [0.001s*2^20 ~= 17min, +inf) - Buckets: prometheus.ExponentialBuckets(0.001, 2, 20), - }, - ) ) var registerMetricsOnce sync.Once @@ -85,7 +73,6 @@ func RegisterMetrics() { prometheus.MustRegister(SyncProxyRulesLatency) prometheus.MustRegister(DeprecatedSyncProxyRulesLatency) prometheus.MustRegister(NetworkProgrammingLatency) - prometheus.MustRegister(DeprecatedNetworkProgrammingLatency) }) }