From a4037d26849a1111aece7c4a479e5853d25edf9b Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Wed, 30 Sep 2020 16:22:42 -0700 Subject: [PATCH] Fix cadvisor machine metrics Signed-off-by: Ling Samuel --- pkg/kubelet/kubelet.go | 3 +++ pkg/kubelet/server/server.go | 1 + 2 files changed, 4 insertions(+) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index c5c6f0c9e4b..9cb92eda68f 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -551,6 +551,9 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, if err != nil { return nil, err } + // Avoid collector collects it as a timestamped metric + // See PR #95210 and #97006 for more details. + machineInfo.Timestamp = time.Time{} klet.setCachedMachineInfo(machineInfo) imageBackOff := flowcontrol.NewBackOff(backOffPeriod, MaxContainerBackOff) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index fb8c7e12e7c..2b033e2ca6f 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -367,6 +367,7 @@ func (s *Server) InstallDefaultHandlers(enableCAdvisorJSONEndpoints bool) { Recursive: true, } r.RawMustRegister(metrics.NewPrometheusCollector(prometheusHostAdapter{s.host}, containerPrometheusLabelsFunc(s.host), includedMetrics, clock.RealClock{}, cadvisorOpts)) + r.RawMustRegister(metrics.NewPrometheusMachineCollector(prometheusHostAdapter{s.host}, includedMetrics)) s.restfulCont.Handle(cadvisorMetricsPath, compbasemetrics.HandlerFor(r, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}), )