mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
kubelet: add cri metrics to server
Signed-off-by: Peter Hunt <pehunt@redhat.com>
This commit is contained in:
parent
1a7388c2ef
commit
95489a26d6
@ -388,9 +388,6 @@ func (s *Server) InstallDefaultHandlers() {
|
||||
s.addMetricsBucketMatcher("metrics/resource")
|
||||
s.restfulCont.Handle(metricsPath, legacyregistry.Handler())
|
||||
|
||||
// cAdvisor metrics are exposed under the secured handler as well
|
||||
r := compbasemetrics.NewKubeRegistry()
|
||||
|
||||
includedMetrics := cadvisormetrics.MetricSet{
|
||||
cadvisormetrics.CpuUsageMetrics: struct{}{},
|
||||
cadvisormetrics.MemoryUsageMetrics: struct{}{},
|
||||
@ -402,14 +399,19 @@ func (s *Server) InstallDefaultHandlers() {
|
||||
cadvisormetrics.ProcessMetrics: struct{}{},
|
||||
cadvisormetrics.OOMMetrics: struct{}{},
|
||||
}
|
||||
|
||||
cadvisorOpts := cadvisorv2.RequestOptions{
|
||||
IdType: cadvisorv2.TypeName,
|
||||
Count: 1,
|
||||
Recursive: true,
|
||||
}
|
||||
r.RawMustRegister(metrics.NewPrometheusCollector(prometheusHostAdapter{s.host}, containerPrometheusLabelsFunc(s.host), includedMetrics, clock.RealClock{}, cadvisorOpts))
|
||||
// cAdvisor metrics are exposed under the secured handler as well
|
||||
r := compbasemetrics.NewKubeRegistry()
|
||||
r.RawMustRegister(metrics.NewPrometheusMachineCollector(prometheusHostAdapter{s.host}, includedMetrics))
|
||||
if utilfeature.DefaultFeatureGate.Enabled(features.PodAndContainerStatsFromCRI) {
|
||||
r.CustomRegister(collectors.NewCRIMetricsCollector(context.TODO(), s.host.ListPodSandboxMetrics, s.host.ListMetricDescriptors))
|
||||
} else {
|
||||
cadvisorOpts := cadvisorv2.RequestOptions{
|
||||
IdType: cadvisorv2.TypeName,
|
||||
Count: 1,
|
||||
Recursive: true,
|
||||
}
|
||||
r.RawMustRegister(metrics.NewPrometheusCollector(prometheusHostAdapter{s.host}, containerPrometheusLabelsFunc(s.host), includedMetrics, clock.RealClock{}, cadvisorOpts))
|
||||
}
|
||||
s.restfulCont.Handle(cadvisorMetricsPath,
|
||||
compbasemetrics.HandlerFor(r, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}),
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user