Skip to content

K
k3s
Commit 470a6a45 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45949 from NickrenREN/kubelet-metric

Automatic merge from submit-queue (batch tested with PRs 45949, 46009, 46320, 46423, 46437) Unregister some metrics delete some registered metrics since they are not observed **Release note**: ```release-note NONE ```
parents 749ac27e ec7bf948
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 43 deletions
pkg/kubelet/metrics/metrics.go
View file @ 470a6a45
...@@ -26,21 +26,18 @@ import ( ...@@ -26,21 +26,18 @@ import (
) )
const ( const (
KubeletSubsystem = "kubelet" KubeletSubsystem = "kubelet"
PodWorkerLatencyKey = "pod_worker_latency_microseconds" PodWorkerLatencyKey = "pod_worker_latency_microseconds"
SyncPodsLatencyKey = "sync_pods_latency_microseconds" PodStartLatencyKey = "pod_start_latency_microseconds"
PodStartLatencyKey = "pod_start_latency_microseconds" CgroupManagerOperationsKey = "cgroup_manager_latency_microseconds"
PodStatusLatencyKey = "generate_pod_status_latency_microseconds" DockerOperationsLatencyKey = "docker_operations_latency_microseconds"
ContainerManagerOperationsKey = "container_manager_latency_microseconds" DockerOperationsKey = "docker_operations"
CgroupManagerOperationsKey = "cgroup_manager_latency_microseconds" DockerOperationsErrorsKey = "docker_operations_errors"
DockerOperationsLatencyKey = "docker_operations_latency_microseconds" DockerOperationsTimeoutKey = "docker_operations_timeout"
DockerOperationsKey = "docker_operations" PodWorkerStartLatencyKey = "pod_worker_start_latency_microseconds"
DockerOperationsErrorsKey = "docker_operations_errors" PLEGRelistLatencyKey = "pleg_relist_latency_microseconds"
DockerOperationsTimeoutKey = "docker_operations_timeout" PLEGRelistIntervalKey = "pleg_relist_interval_microseconds"
PodWorkerStartLatencyKey = "pod_worker_start_latency_microseconds" EvictionStatsAgeKey = "eviction_stats_age_microseconds"
PLEGRelistLatencyKey = "pleg_relist_latency_microseconds"
PLEGRelistIntervalKey = "pleg_relist_interval_microseconds"
EvictionStatsAgeKey = "eviction_stats_age_microseconds"
// Metrics keys of remote runtime operations // Metrics keys of remote runtime operations
RuntimeOperationsKey = "runtime_operations" RuntimeOperationsKey = "runtime_operations"
RuntimeOperationsLatencyKey = "runtime_operations_latency_microseconds" RuntimeOperationsLatencyKey = "runtime_operations_latency_microseconds"
...@@ -63,13 +60,6 @@ var ( ...@@ -63,13 +60,6 @@ var (
}, },
[]string{"operation_type"}, []string{"operation_type"},
) )
SyncPodsLatency = prometheus.NewSummary(
prometheus.SummaryOpts{
Subsystem: KubeletSubsystem,
Name: SyncPodsLatencyKey,
Help: "Latency in microseconds to sync all pods.",
},
)
PodStartLatency = prometheus.NewSummary( PodStartLatency = prometheus.NewSummary(
prometheus.SummaryOpts{ prometheus.SummaryOpts{
Subsystem: KubeletSubsystem, Subsystem: KubeletSubsystem,
...@@ -77,21 +67,6 @@ var ( ...@@ -77,21 +67,6 @@ var (
Help: "Latency in microseconds for a single pod to go from pending to running. Broken down by podname.", Help: "Latency in microseconds for a single pod to go from pending to running. Broken down by podname.",
}, },
) )
PodStatusLatency = prometheus.NewSummary(
prometheus.SummaryOpts{
Subsystem: KubeletSubsystem,
Name: PodStatusLatencyKey,
Help: "Latency in microseconds to generate status for a single pod.",
},
)
ContainerManagerLatency = prometheus.NewSummaryVec(
prometheus.SummaryOpts{
Subsystem: KubeletSubsystem,
Name: ContainerManagerOperationsKey,
Help: "Latency in microseconds for container manager operations. Broken down by method.",
},
[]string{"operation_type"},
)
CgroupManagerLatency = prometheus.NewSummaryVec( CgroupManagerLatency = prometheus.NewSummaryVec(
prometheus.SummaryOpts{ prometheus.SummaryOpts{
Subsystem: KubeletSubsystem, Subsystem: KubeletSubsystem,
...@@ -197,11 +172,8 @@ func Register(containerCache kubecontainer.RuntimeCache) { ...@@ -197,11 +172,8 @@ func Register(containerCache kubecontainer.RuntimeCache) {
registerMetrics.Do(func() { registerMetrics.Do(func() {
prometheus.MustRegister(PodWorkerLatency) prometheus.MustRegister(PodWorkerLatency)
prometheus.MustRegister(PodStartLatency) prometheus.MustRegister(PodStartLatency)
prometheus.MustRegister(PodStatusLatency)
prometheus.MustRegister(DockerOperationsLatency) prometheus.MustRegister(DockerOperationsLatency)
prometheus.MustRegister(ContainerManagerLatency)
prometheus.MustRegister(CgroupManagerLatency) prometheus.MustRegister(CgroupManagerLatency)
prometheus.MustRegister(SyncPodsLatency)
prometheus.MustRegister(PodWorkerStartLatency) prometheus.MustRegister(PodWorkerStartLatency)
prometheus.MustRegister(ContainersPerPodCount) prometheus.MustRegister(ContainersPerPodCount)
prometheus.MustRegister(DockerOperations) prometheus.MustRegister(DockerOperations)
......
test/e2e/framework/kubelet_stats.go
View file @ 470a6a45
...@@ -103,10 +103,7 @@ func GetKubeletLatencyMetrics(ms metrics.KubeletMetrics) KubeletLatencyMetrics { ...@@ -103,10 +103,7 @@ func GetKubeletLatencyMetrics(ms metrics.KubeletMetrics) KubeletLatencyMetrics {
latencyMethods := sets.NewString( latencyMethods := sets.NewString(
kubeletmetrics.PodWorkerLatencyKey, kubeletmetrics.PodWorkerLatencyKey,
kubeletmetrics.PodWorkerStartLatencyKey, kubeletmetrics.PodWorkerStartLatencyKey,
kubeletmetrics.SyncPodsLatencyKey,
kubeletmetrics.PodStartLatencyKey, kubeletmetrics.PodStartLatencyKey,
kubeletmetrics.PodStatusLatencyKey,
kubeletmetrics.ContainerManagerOperationsKey,
kubeletmetrics.CgroupManagerOperationsKey, kubeletmetrics.CgroupManagerOperationsKey,
kubeletmetrics.DockerOperationsLatencyKey, kubeletmetrics.DockerOperationsLatencyKey,
kubeletmetrics.PodWorkerStartLatencyKey, kubeletmetrics.PodWorkerStartLatencyKey,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment