mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 03:11:40 +00:00
Merge pull request #113030 from Richabanker/kubelet-metrics-slis
add metrics/slis to kubelet health checks
This commit is contained in:
commit
a497c56c33
@ -63,7 +63,9 @@ import (
|
|||||||
"k8s.io/component-base/configz"
|
"k8s.io/component-base/configz"
|
||||||
"k8s.io/component-base/logs"
|
"k8s.io/component-base/logs"
|
||||||
compbasemetrics "k8s.io/component-base/metrics"
|
compbasemetrics "k8s.io/component-base/metrics"
|
||||||
|
metricsfeatures "k8s.io/component-base/metrics/features"
|
||||||
"k8s.io/component-base/metrics/legacyregistry"
|
"k8s.io/component-base/metrics/legacyregistry"
|
||||||
|
"k8s.io/component-base/metrics/prometheus/slis"
|
||||||
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
|
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
|
||||||
podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1"
|
podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1"
|
||||||
podresourcesapiv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1"
|
podresourcesapiv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1"
|
||||||
@ -84,6 +86,10 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/kubelet/util"
|
"k8s.io/kubernetes/pkg/kubelet/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
utilruntime.Must(metricsfeatures.AddFeatureGates(utilfeature.DefaultMutableFeatureGate))
|
||||||
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
metricsPath = "/metrics"
|
metricsPath = "/metrics"
|
||||||
cadvisorMetricsPath = "/metrics/cadvisor"
|
cadvisorMetricsPath = "/metrics/cadvisor"
|
||||||
@ -358,6 +364,9 @@ func (s *Server) InstallDefaultHandlers() {
|
|||||||
healthz.NamedCheck("syncloop", s.syncLoopHealthCheck),
|
healthz.NamedCheck("syncloop", s.syncLoopHealthCheck),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if utilfeature.DefaultFeatureGate.Enabled(metricsfeatures.ComponentSLIs) {
|
||||||
|
slis.SLIMetricsWithReset{}.Install(s.restfulCont)
|
||||||
|
}
|
||||||
s.addMetricsBucketMatcher("pods")
|
s.addMetricsBucketMatcher("pods")
|
||||||
ws := new(restful.WebService)
|
ws := new(restful.WebService)
|
||||||
ws.
|
ws.
|
||||||
|
Loading…
Reference in New Issue
Block a user