github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81377 from sjenning/add-eviction-metrics

Browse Source 
kubelet: add eviction counter to kubelet metrics
This commit is contained in:
Kubernetes Prow Robot 2019-08-15 02:32:46 -07:00 committed by GitHub
commit 3645041af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/eviction/eviction_manager.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/klog" "k8s.io/klog"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/clock"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
@ -376,6 +376,7 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act
} }
message, annotations := evictionMessage(resourceToReclaim, pod, statsFunc) message, annotations := evictionMessage(resourceToReclaim, pod, statsFunc)
if m.evictPod(pod, gracePeriodOverride, message, annotations) { if m.evictPod(pod, gracePeriodOverride, message, annotations) {
metrics.Evictions.WithLabelValues(string(thresholdToReclaim.Signal)).Inc()
return []*v1.Pod{pod} return []*v1.Pod{pod}
} }
} }

12
pkg/kubelet/metrics/metrics.go
View File

@ -42,6 +42,7 @@ const (
PLEGRelistDurationKey = "pleg_relist_duration_seconds" PLEGRelistDurationKey = "pleg_relist_duration_seconds"
PLEGDiscardEventsKey = "pleg_discard_events" PLEGDiscardEventsKey = "pleg_discard_events"
PLEGRelistIntervalKey = "pleg_relist_interval_seconds" PLEGRelistIntervalKey = "pleg_relist_interval_seconds"
EvictionsKey = "evictions"
EvictionStatsAgeKey = "eviction_stats_age_seconds" EvictionStatsAgeKey = "eviction_stats_age_seconds"
DeprecatedPodWorkerLatencyKey = "pod_worker_latency_microseconds" DeprecatedPodWorkerLatencyKey = "pod_worker_latency_microseconds"
DeprecatedPodStartLatencyKey = "pod_start_latency_microseconds" DeprecatedPodStartLatencyKey = "pod_start_latency_microseconds"
@ -205,6 +206,16 @@ var (
}, },
[]string{"operation_type"}, []string{"operation_type"},
) )
// Evictions is a Counter that tracks the cumulative number of pod evictions initiated by the kubelet.
// Broken down by eviction signal.
Evictions = prometheus.NewCounterVec(
prometheus.CounterOpts{
Subsystem: KubeletSubsystem,
Name: EvictionsKey,
Help: "Cumulative number of pod evictions by eviction signal",
},
[]string{"eviction_signal"},
)
// EvictionStatsAge is a Histogram that tracks the time (in seconds) between when stats are collected and when a pod is evicted // EvictionStatsAge is a Histogram that tracks the time (in seconds) between when stats are collected and when a pod is evicted
// based on those stats. Broken down by eviction signal. // based on those stats. Broken down by eviction signal.
EvictionStatsAge = prometheus.NewHistogramVec( EvictionStatsAge = prometheus.NewHistogramVec(
@ -435,6 +446,7 @@ func Register(containerCache kubecontainer.RuntimeCache, collectors ...prometheu
prometheus.MustRegister(RuntimeOperations) prometheus.MustRegister(RuntimeOperations)
prometheus.MustRegister(RuntimeOperationsDuration) prometheus.MustRegister(RuntimeOperationsDuration)
prometheus.MustRegister(RuntimeOperationsErrors) prometheus.MustRegister(RuntimeOperationsErrors)
prometheus.MustRegister(Evictions)
prometheus.MustRegister(EvictionStatsAge) prometheus.MustRegister(EvictionStatsAge)
prometheus.MustRegister(DevicePluginRegistrationCount) prometheus.MustRegister(DevicePluginRegistrationCount)
prometheus.MustRegister(DevicePluginAllocationDuration) prometheus.MustRegister(DevicePluginAllocationDuration)