From 47f621d970563432b4ccaaae80186ba2aedfef5b Mon Sep 17 00:00:00 2001
From: Markus Lehtonen <markus.lehtonen@intel.com>
Date: Fri, 28 Jul 2023 18:03:54 +0300
Subject: [PATCH] metrics: improve the node updates gauge

Rename the metric, better describe what we're measuring and better
comply with prometheus naming conventions. Also change it to represent
actual updates of the node object on the Kubernetes apiserver.
---
 pkg/nfd-master/metrics.go    | 8 ++++----
 pkg/nfd-master/nfd-master.go | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/nfd-master/metrics.go b/pkg/nfd-master/metrics.go
index cb653500d..9b409720d 100644
--- a/pkg/nfd-master/metrics.go
+++ b/pkg/nfd-master/metrics.go
@@ -29,7 +29,7 @@ import (
 // When adding metric names, see https://prometheus.io/docs/practices/naming/#metric-names
 const (
 	buildInfoQuery         = "nfd_master_build_info"
-	updatedNodesQuery      = "nfd_updated_nodes"
+	nodeUpdatesQuery       = "nfd_node_updates_total"
 	nfrProcessingTimeQuery = "nfd_nodefeaturerule_processing_duration_seconds"
 )
 
@@ -43,8 +43,8 @@ var (
 			"version": version.Get(),
 		},
 	})
-	updatedNodes = prometheus.NewCounter(prometheus.CounterOpts{
-		Name: updatedNodesQuery,
+	nodeUpdates = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: nodeUpdatesQuery,
 		Help: "Number of nodes updated by the master.",
 	})
 	nfrProcessingTime = prometheus.NewHistogramVec(
@@ -69,7 +69,7 @@ func registerVersion(version string) {
 func runMetricsServer(port int) {
 	r := prometheus.NewRegistry()
 	r.MustRegister(buildInfo,
-		updatedNodes,
+		nodeUpdates,
 		nfrProcessingTime)
 
 	mux := http.NewServeMux()
diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
index 1ae65ae33..701a40083 100644
--- a/pkg/nfd-master/nfd-master.go
+++ b/pkg/nfd-master/nfd-master.go
@@ -854,7 +854,6 @@ func (m *nfdMaster) refreshNodeFeatures(cli *kubernetes.Clientset, nodeName stri
 		return err
 	}
 
-	updatedNodes.Inc()
 	return nil
 }
 
@@ -1073,6 +1072,7 @@ func (m *nfdMaster) updateNodeObject(cli *kubernetes.Clientset, nodeName string,
 	}
 
 	if len(patches) > 0 || len(statusPatches) > 0 {
+		nodeUpdates.Inc()
 		klog.InfoS("node updated", "nodeName", nodeName)
 	} else {
 		klog.V(1).InfoS("no updates to node", "nodeName", nodeName)