github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove deprecated metrics of proxy

Browse Source
This commit is contained in:
danielqsj 2019-04-12 16:19:40 +08:00
parent 8ae3f80048
commit a8f2feaeb5
5 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/proxy/iptables/proxier.go
View File

@ -793,7 +793,6 @@ func (proxier *Proxier) syncProxyRules() {
start := time.Now() start := time.Now()
defer func() { defer func() {
metrics.SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start)) metrics.SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start))
metrics.DeprecatedSyncProxyRulesLatency.Observe(metrics.SinceInMicroseconds(start))
klog.V(4).Infof("syncProxyRules took %v", time.Since(start)) klog.V(4).Infof("syncProxyRules took %v", time.Since(start))
}() }()

1
pkg/proxy/ipvs/proxier.go
View File

@ -1020,7 +1020,6 @@ func (proxier *Proxier) syncProxyRules() {
start := time.Now() start := time.Now()
defer func() { defer func() {
metrics.SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start)) metrics.SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start))
metrics.DeprecatedSyncProxyRulesLatency.Observe(metrics.SinceInMicroseconds(start))
klog.V(4).Infof("syncProxyRules took %v", time.Since(start)) klog.V(4).Infof("syncProxyRules took %v", time.Since(start))
}() }()

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

@ -38,18 +38,6 @@ var (
}, },
) )
// DeprecatedSyncProxyRulesLatency is the latency of one round of kube-proxy syncing proxy rules.
DeprecatedSyncProxyRulesLatency = metrics.NewHistogram(
&metrics.HistogramOpts{
Subsystem: kubeProxySubsystem,
Name: "sync_proxy_rules_latency_microseconds",
Help: "SyncProxyRules latency in microseconds",
Buckets: metrics.ExponentialBuckets(1000, 2, 15),
StabilityLevel: metrics.ALPHA,
DeprecatedVersion: "1.14.0",
},
)
// SyncProxyRulesLastTimestamp is the timestamp proxy rules were last // SyncProxyRulesLastTimestamp is the timestamp proxy rules were last
// successfully synced. // successfully synced.
SyncProxyRulesLastTimestamp = metrics.NewGauge( SyncProxyRulesLastTimestamp = metrics.NewGauge(
@ -145,7 +133,6 @@ var registerMetricsOnce sync.Once
func RegisterMetrics() { func RegisterMetrics() {
registerMetricsOnce.Do(func() { registerMetricsOnce.Do(func() {
legacyregistry.MustRegister(SyncProxyRulesLatency) legacyregistry.MustRegister(SyncProxyRulesLatency)
legacyregistry.MustRegister(DeprecatedSyncProxyRulesLatency)
legacyregistry.MustRegister(SyncProxyRulesLastTimestamp) legacyregistry.MustRegister(SyncProxyRulesLastTimestamp)
legacyregistry.MustRegister(NetworkProgrammingLatency) legacyregistry.MustRegister(NetworkProgrammingLatency)
legacyregistry.MustRegister(EndpointChangesPending) legacyregistry.MustRegister(EndpointChangesPending)

12
pkg/proxy/winkernel/metrics.go
View File

@ -36,17 +36,6 @@ var (
}, },
) )
DeprecatedSyncProxyRulesLatency = metrics.NewHistogram(
&metrics.HistogramOpts{
Subsystem: kubeProxySubsystem,
Name: "sync_proxy_rules_latency_microseconds",
Help: "SyncProxyRules latency in microseconds",
Buckets: metrics.ExponentialBuckets(1000, 2, 15),
StabilityLevel: metrics.ALPHA,
DeprecatedVersion: "1.14.0",
},
)
// SyncProxyRulesLastTimestamp is the timestamp proxy rules were last // SyncProxyRulesLastTimestamp is the timestamp proxy rules were last
// successfully synced. // successfully synced.
SyncProxyRulesLastTimestamp = metrics.NewGauge( SyncProxyRulesLastTimestamp = metrics.NewGauge(
@ -64,7 +53,6 @@ var registerMetricsOnce sync.Once
func RegisterMetrics() { func RegisterMetrics() {
registerMetricsOnce.Do(func() { registerMetricsOnce.Do(func() {
legacyregistry.MustRegister(SyncProxyRulesLatency) legacyregistry.MustRegister(SyncProxyRulesLatency)
legacyregistry.MustRegister(DeprecatedSyncProxyRulesLatency)
legacyregistry.MustRegister(SyncProxyRulesLastTimestamp) legacyregistry.MustRegister(SyncProxyRulesLastTimestamp)
}) })
} }

1
pkg/proxy/winkernel/proxier.go
View File

@ -1002,7 +1002,6 @@ func (proxier *Proxier) syncProxyRules() {
start := time.Now() start := time.Now()
defer func() { defer func() {
SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start)) SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start))
DeprecatedSyncProxyRulesLatency.Observe(metrics.SinceInMicroseconds(start))
klog.V(4).Infof("syncProxyRules took %v", time.Since(start)) klog.V(4).Infof("syncProxyRules took %v", time.Since(start))
}() }()
// don't sync rules till we've received services and endpoints // don't sync rules till we've received services and endpoints