From fba9c76114b771776da76db1be4dc850fe4180a8 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 16 Sep 2019 10:34:58 +0800 Subject: [PATCH 1/2] Migrate prometheus bucket functionality to metrics stability framework. --- pkg/proxy/metrics/metrics.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/proxy/metrics/metrics.go b/pkg/proxy/metrics/metrics.go index 4a0cc02d905..1e8c7af32dc 100644 --- a/pkg/proxy/metrics/metrics.go +++ b/pkg/proxy/metrics/metrics.go @@ -20,8 +20,6 @@ import ( "sync" "time" - "github.com/prometheus/client_golang/prometheus" - "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" ) @@ -35,7 +33,7 @@ var ( Subsystem: kubeProxySubsystem, Name: "sync_proxy_rules_duration_seconds", Help: "SyncProxyRules latency in seconds", - Buckets: prometheus.ExponentialBuckets(0.001, 2, 15), + Buckets: metrics.ExponentialBuckets(0.001, 2, 15), StabilityLevel: metrics.ALPHA, }, ) @@ -46,7 +44,7 @@ var ( Subsystem: kubeProxySubsystem, Name: "sync_proxy_rules_latency_microseconds", Help: "(Deprecated) SyncProxyRules latency in microseconds", - Buckets: prometheus.ExponentialBuckets(1000, 2, 15), + Buckets: metrics.ExponentialBuckets(1000, 2, 15), StabilityLevel: metrics.ALPHA, }, ) @@ -75,10 +73,10 @@ var ( Name: "network_programming_duration_seconds", Help: "In Cluster Network Programming Latency in seconds", Buckets: merge( - prometheus.LinearBuckets(0.25, 0.25, 2), // 0.25s, 0.50s - prometheus.LinearBuckets(1, 1, 59), // 1s, 2s, 3s, ... 59s - prometheus.LinearBuckets(60, 5, 12), // 60s, 65s, 70s, ... 115s - prometheus.LinearBuckets(120, 30, 7), // 2min, 2.5min, 3min, ..., 5min + metrics.LinearBuckets(0.25, 0.25, 2), // 0.25s, 0.50s + metrics.LinearBuckets(1, 1, 59), // 1s, 2s, 3s, ... 59s + metrics.LinearBuckets(60, 5, 12), // 60s, 65s, 70s, ... 115s + metrics.LinearBuckets(120, 30, 7), // 2min, 2.5min, 3min, ..., 5min ), StabilityLevel: metrics.ALPHA, }, From e9c5b06b794421be870117142633adbf2aa1c199 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 16 Sep 2019 10:36:20 +0800 Subject: [PATCH 2/2] Update bazel by hack/update-bazel.sh --- pkg/proxy/metrics/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/proxy/metrics/BUILD b/pkg/proxy/metrics/BUILD index 32c501a411a..712222f5d19 100644 --- a/pkg/proxy/metrics/BUILD +++ b/pkg/proxy/metrics/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", ], )