From ba6b468982f0c0d879454cac4117777307729976 Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Thu, 6 Oct 2022 14:15:07 +0200 Subject: [PATCH] node: metrics: register podresources metrics Because of a bug in the commit 1e7bb20c52e452a7ca061ca1dda1936e9df1f266, podresources metrics were added, they are updated in the right places, but they are never exported, so they cannot be consumed. Fix trivially registering the metrics. Signed-off-by: Francesco Romani --- pkg/kubelet/metrics/metrics.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index 17267b888d7..99217eb8103 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -527,6 +527,16 @@ func Register(collectors ...metrics.StableCollector) { legacyregistry.MustRegister(RunningContainerCount) legacyregistry.MustRegister(RunningPodCount) legacyregistry.MustRegister(ManagedEphemeralContainers) + if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPodResources) { + legacyregistry.MustRegister(PodResourcesEndpointRequestsTotalCount) + + if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPodResourcesGetAllocatable) { + legacyregistry.MustRegister(PodResourcesEndpointRequestsListCount) + legacyregistry.MustRegister(PodResourcesEndpointRequestsGetAllocatableCount) + legacyregistry.MustRegister(PodResourcesEndpointErrorsListCount) + legacyregistry.MustRegister(PodResourcesEndpointErrorsGetAllocatableCount) + } + } legacyregistry.MustRegister(StartedPodsTotal) legacyregistry.MustRegister(StartedPodsErrorsTotal) legacyregistry.MustRegister(StartedContainersTotal) @@ -537,6 +547,7 @@ func Register(collectors ...metrics.StableCollector) { } legacyregistry.MustRegister(RunPodSandboxDuration) legacyregistry.MustRegister(RunPodSandboxErrors) + for _, collector := range collectors { legacyregistry.CustomMustRegister(collector) }