From fc05a294cca75c1660220a7e1f4c58fdd048880b Mon Sep 17 00:00:00 2001
From: Dan Winship <danwinship@redhat.com>
Date: Thu, 25 Apr 2024 18:40:58 -0400
Subject: [PATCH] Rename nftables sync failure metric

---
 pkg/proxy/metrics/metrics.go  | 14 ++++++++++++--
 pkg/proxy/nftables/proxier.go |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkg/proxy/metrics/metrics.go b/pkg/proxy/metrics/metrics.go
index 0a59bd80c80..45c196b63e6 100644
--- a/pkg/proxy/metrics/metrics.go
+++ b/pkg/proxy/metrics/metrics.go
@@ -185,6 +185,17 @@ var (
 		[]string{"table"},
 	)
 
+	// NFTablesSyncFailuresTotal is the number of nftables sync failures that the
+	// proxy has seen.
+	NFTablesSyncFailuresTotal = metrics.NewCounter(
+		&metrics.CounterOpts{
+			Subsystem:      kubeProxySubsystem,
+			Name:           "sync_proxy_rules_nftables_sync_failures_total",
+			Help:           "Cumulative proxy nftables sync failures",
+			StabilityLevel: metrics.ALPHA,
+		},
+	)
+
 	// ProxyHealthzTotal is the number of returned HTTP Status for each
 	// healthz probe.
 	ProxyHealthzTotal = metrics.NewCounterVec(
@@ -268,8 +279,7 @@ func RegisterMetrics(mode kubeproxyconfig.ProxyMode) {
 			legacyregistry.MustRegister(IPTablesRestoreFailuresTotal)
 
 		case kubeproxyconfig.ProxyModeNFTables:
-			// FIXME: should not use the iptables-specific metric
-			legacyregistry.MustRegister(IPTablesRestoreFailuresTotal)
+			legacyregistry.MustRegister(NFTablesSyncFailuresTotal)
 
 		case kubeproxyconfig.ProxyModeKernelspace:
 			// currently no winkernel-specific metrics
diff --git a/pkg/proxy/nftables/proxier.go b/pkg/proxy/nftables/proxier.go
index 0db33256a04..c921ccabccf 100644
--- a/pkg/proxy/nftables/proxier.go
+++ b/pkg/proxy/nftables/proxier.go
@@ -1620,7 +1620,7 @@ func (proxier *Proxier) syncProxyRules() {
 	err = proxier.nftables.Run(context.TODO(), tx)
 	if err != nil {
 		proxier.logger.Error(err, "nftables sync failed")
-		metrics.IPTablesRestoreFailuresTotal.Inc()
+		metrics.NFTablesSyncFailuresTotal.Inc()
 		return
 	}
 	success = true