github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128810 from googs1025/cleanup/scheduler/metrics

Browse Source 
chore: remove repeated scheduler prefix metrics for CacheSizeMetrics
This commit is contained in:
Kubernetes Prow Robot 2024-12-12 04:12:32 +00:00 committed by GitHub
commit 6c108faaf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/scheduler/backend/cache/cache.go vendored
View File

@ -757,4 +757,12 @@ func (cache *cacheImpl) updateMetrics() {
metrics.CacheSize.WithLabelValues("assumed_pods").Set(float64(len(cache.assumedPods))) metrics.CacheSize.WithLabelValues("assumed_pods").Set(float64(len(cache.assumedPods)))
metrics.CacheSize.WithLabelValues("pods").Set(float64(len(cache.podStates))) metrics.CacheSize.WithLabelValues("pods").Set(float64(len(cache.podStates)))
metrics.CacheSize.WithLabelValues("nodes").Set(float64(len(cache.nodes))) metrics.CacheSize.WithLabelValues("nodes").Set(float64(len(cache.nodes)))
// we intentionally keep them with the deprecation and will remove at v1.33.
//nolint:staticcheck
metrics.SchedulerCacheSize.WithLabelValues("assumed_pods").Set(float64(len(cache.assumedPods)))
//nolint:staticcheck
metrics.SchedulerCacheSize.WithLabelValues("pods").Set(float64(len(cache.podStates)))
//nolint:staticcheck
metrics.SchedulerCacheSize.WithLabelValues("nodes").Set(float64(len(cache.nodes)))
} }

19
pkg/scheduler/metrics/metrics.go
View File

@ -110,8 +110,11 @@ var (
FrameworkExtensionPointDuration *metrics.HistogramVec FrameworkExtensionPointDuration *metrics.HistogramVec
PluginExecutionDuration *metrics.HistogramVec PluginExecutionDuration *metrics.HistogramVec
PermitWaitDuration *metrics.HistogramVec PermitWaitDuration *metrics.HistogramVec
CacheSize *metrics.GaugeVec CacheSize *metrics.GaugeVec
// Deprecated: SchedulerCacheSize is deprecated,
// and will be removed at v1.33. Please use CacheSize instead.
SchedulerCacheSize *metrics.GaugeVec
unschedulableReasons *metrics.GaugeVec unschedulableReasons *metrics.GaugeVec
PluginEvaluationTotal *metrics.CounterVec PluginEvaluationTotal *metrics.CounterVec
@ -308,10 +311,19 @@ func InitMetrics() {
}, },
[]string{"result"}) []string{"result"})
SchedulerCacheSize = metrics.NewGaugeVec(
&metrics.GaugeOpts{
Subsystem: SchedulerSubsystem,
Name: "scheduler_cache_size",
Help: "Number of nodes, pods, and assumed (bound) pods in the scheduler cache.",
StabilityLevel: metrics.ALPHA,
DeprecatedVersion: "1.33.0",
}, []string{"type"})
CacheSize = metrics.NewGaugeVec( CacheSize = metrics.NewGaugeVec(
&metrics.GaugeOpts{ &metrics.GaugeOpts{
Subsystem: SchedulerSubsystem, Subsystem: SchedulerSubsystem,
Name: "scheduler_cache_size", Name: "cache_size",
Help: "Number of nodes, pods, and assumed (bound) pods in the scheduler cache.", Help: "Number of nodes, pods, and assumed (bound) pods in the scheduler cache.",
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
}, []string{"type"}) }, []string{"type"})
@ -368,6 +380,7 @@ func InitMetrics() {
Goroutines, Goroutines,
PermitWaitDuration, PermitWaitDuration,
CacheSize, CacheSize,
SchedulerCacheSize,
unschedulableReasons, unschedulableReasons,
PluginEvaluationTotal, PluginEvaluationTotal,
} }