Skip to content

Commit 9da6c6f

Browse files
authored
Merge pull request kubernetes#82736 from RainbowMango/pr_migrate_prom_bucket_for_proxy_metrics
Migrate prometheus bucket functionality to kube-metrics for proxy metrics
2 parents 31008f7 + e9c5b06 commit 9da6c6f

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

pkg/proxy/metrics/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ go_library(
88
deps = [
99
"//staging/src/k8s.io/component-base/metrics:go_default_library",
1010
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
11-
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
1211
],
1312
)
1413

pkg/proxy/metrics/metrics.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
"sync"
2121
"time"
2222

23-
"github.com/prometheus/client_golang/prometheus"
24-
2523
"k8s.io/component-base/metrics"
2624
"k8s.io/component-base/metrics/legacyregistry"
2725
)
@@ -35,7 +33,7 @@ var (
3533
Subsystem: kubeProxySubsystem,
3634
Name: "sync_proxy_rules_duration_seconds",
3735
Help: "SyncProxyRules latency in seconds",
38-
Buckets: prometheus.ExponentialBuckets(0.001, 2, 15),
36+
Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
3937
StabilityLevel: metrics.ALPHA,
4038
},
4139
)
@@ -46,7 +44,7 @@ var (
4644
Subsystem: kubeProxySubsystem,
4745
Name: "sync_proxy_rules_latency_microseconds",
4846
Help: "(Deprecated) SyncProxyRules latency in microseconds",
49-
Buckets: prometheus.ExponentialBuckets(1000, 2, 15),
47+
Buckets: metrics.ExponentialBuckets(1000, 2, 15),
5048
StabilityLevel: metrics.ALPHA,
5149
},
5250
)
@@ -75,10 +73,10 @@ var (
7573
Name: "network_programming_duration_seconds",
7674
Help: "In Cluster Network Programming Latency in seconds",
7775
Buckets: merge(
78-
prometheus.LinearBuckets(0.25, 0.25, 2), // 0.25s, 0.50s
79-
prometheus.LinearBuckets(1, 1, 59), // 1s, 2s, 3s, ... 59s
80-
prometheus.LinearBuckets(60, 5, 12), // 60s, 65s, 70s, ... 115s
81-
prometheus.LinearBuckets(120, 30, 7), // 2min, 2.5min, 3min, ..., 5min
76+
metrics.LinearBuckets(0.25, 0.25, 2), // 0.25s, 0.50s
77+
metrics.LinearBuckets(1, 1, 59), // 1s, 2s, 3s, ... 59s
78+
metrics.LinearBuckets(60, 5, 12), // 60s, 65s, 70s, ... 115s
79+
metrics.LinearBuckets(120, 30, 7), // 2min, 2.5min, 3min, ..., 5min
8280
),
8381
StabilityLevel: metrics.ALPHA,
8482
},

0 commit comments

Comments
 (0)