github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82736 from RainbowMango/pr_migrate_prom_bucket_for_proxy_metrics

Browse Source 
Migrate prometheus bucket functionality to kube-metrics for proxy metrics
This commit is contained in:
Kubernetes Prow Robot
2019-09-16 23:16:36 -07:00
committed by GitHub
parent 31008f7efd e9c5b06b79
commit 9da6c6fe98
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/proxy/metrics/BUILD
View File

@@ -8,7 +8,6 @@ go_library(
deps = [ deps = [
"//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library",
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
], ],
) )

14
pkg/proxy/metrics/metrics.go
View File

@@ -20,8 +20,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/component-base/metrics" "k8s.io/component-base/metrics"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
) )
@@ -35,7 +33,7 @@ var (
Subsystem: kubeProxySubsystem, Subsystem: kubeProxySubsystem,
Name: "sync_proxy_rules_duration_seconds", Name: "sync_proxy_rules_duration_seconds",
Help: "SyncProxyRules latency in seconds", Help: "SyncProxyRules latency in seconds",
Buckets: prometheus.ExponentialBuckets(0.001, 2, 15), Buckets: metrics.ExponentialBuckets(0.001, 2, 15),
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
}, },
) )
@@ -46,7 +44,7 @@ var (
Subsystem: kubeProxySubsystem, Subsystem: kubeProxySubsystem,
Name: "sync_proxy_rules_latency_microseconds", Name: "sync_proxy_rules_latency_microseconds",
Help: "(Deprecated) SyncProxyRules latency in microseconds", Help: "(Deprecated) SyncProxyRules latency in microseconds",
Buckets: prometheus.ExponentialBuckets(1000, 2, 15), Buckets: metrics.ExponentialBuckets(1000, 2, 15),
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
}, },
) )
@@ -75,10 +73,10 @@ var (
Name: "network_programming_duration_seconds", Name: "network_programming_duration_seconds",
Help: "In Cluster Network Programming Latency in seconds", Help: "In Cluster Network Programming Latency in seconds",
Buckets: merge( Buckets: merge(
prometheus.LinearBuckets(0.25, 0.25, 2), // 0.25s, 0.50s metrics.LinearBuckets(0.25, 0.25, 2), // 0.25s, 0.50s
prometheus.LinearBuckets(1, 1, 59), // 1s, 2s, 3s, ... 59s metrics.LinearBuckets(1, 1, 59), // 1s, 2s, 3s, ... 59s
prometheus.LinearBuckets(60, 5, 12), // 60s, 65s, 70s, ... 115s metrics.LinearBuckets(60, 5, 12), // 60s, 65s, 70s, ... 115s
prometheus.LinearBuckets(120, 30, 7), // 2min, 2.5min, 3min, ..., 5min metrics.LinearBuckets(120, 30, 7), // 2min, 2.5min, 3min, ..., 5min
), ),
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
}, },