From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Thu, 8 Jun 2023 11:22:43 +0000 (+0200)
Subject: Prometheus does not like counter names ending in -count
X-Git-Tag: rec-4.10.0-alpha0~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e40f5385175f4a1b344ee371aeb27fab7da58d4;p=thirdparty%2Fpdns.git

Prometheus does not like counter names ending in -count
---

diff --git a/pdns/recursordist/RECURSOR-MIB.txt b/pdns/recursordist/RECURSOR-MIB.txt
index 318e9bfcf6..f80eab30c0 100644
--- a/pdns/recursordist/RECURSOR-MIB.txt
+++ b/pdns/recursordist/RECURSOR-MIB.txt
@@ -1234,7 +1234,7 @@ packetCacheAcquired OBJECT-TYPE
         "Number of packet cache lock acquisitions"
     ::= { stats 146 }
 
-nodCount OBJECT-TYPE
+nodEvents OBJECT-TYPE
     SYNTAX Counter64
     MAX-ACCESS read-only
     STATUS current
@@ -1242,7 +1242,7 @@ nodCount OBJECT-TYPE
         "Count of NOD events"
     ::= { stats 147 }
 
-udrCount OBJECT-TYPE
+udrEvents OBJECT-TYPE
     SYNTAX Counter64
     MAX-ACCESS read-only
     STATUS current
@@ -1444,8 +1444,8 @@ recGroup OBJECT-GROUP
         authrcode15Count,
         packetCacheContended,
         packetCacheAcquired,
-        nodCount,
-        udrCount
+        nodEvents,
+        udrEvents
     }
     STATUS current
     DESCRIPTION "Objects conformance group for PowerDNS Recursor"
diff --git a/pdns/recursordist/docs/metrics.rst b/pdns/recursordist/docs/metrics.rst
index 7a4508df40..9247a9955c 100644
--- a/pdns/recursordist/docs/metrics.rst
+++ b/pdns/recursordist/docs/metrics.rst
@@ -551,12 +551,12 @@ no-packet-error
 ^^^^^^^^^^^^^^^
 number of erroneous received packets
 
-nod-count
+nod-events
 ^^^^^^^^^
 .. versionadded:: 4.9.0
 Count of NOD events
 
-udr-count
+udr-events
 ^^^^^^^^^
 .. versionadded:: 4.9.0
 Count of UDR events
diff --git a/pdns/recursordist/rec-snmp.cc b/pdns/recursordist/rec-snmp.cc
index 162fb3bf66..8773a158f1 100644
--- a/pdns/recursordist/rec-snmp.cc
+++ b/pdns/recursordist/rec-snmp.cc
@@ -170,8 +170,8 @@ static const oid rcode15AnswersOID[] = {RECURSOR_STATS_OID, 144};
 static const oid packetCacheContendedOID[] = {RECURSOR_STATS_OID, 145};
 static const oid packetCacheAcquiredOID[] = {RECURSOR_STATS_OID, 146};
 
-static const std::array<oid, 10> nodCountOID = {RECURSOR_STATS_OID, 147};
-static const std::array<oid, 10> udrCountOID = {RECURSOR_STATS_OID, 148};
+static const std::array<oid, 10> nodEventsOID = {RECURSOR_STATS_OID, 147};
+static const std::array<oid, 10> udrEventsOID = {RECURSOR_STATS_OID, 148};
 
 static std::unordered_map<oid, std::string> s_statsMap;
 
@@ -428,8 +428,8 @@ RecursorSNMPAgent::RecursorSNMPAgent(const std::string& name, const std::string&
   RCODE(14);
   RCODE(15);
 
-  registerCounter64Stat("nod-count", nodCountOID.data(), nodCountOID.size());
-  registerCounter64Stat("udr-count", udrCountOID.data(), udrCountOID.size());
+  registerCounter64Stat("nod-events", nodEventsOID.data(), nodEventsOID.size());
+  registerCounter64Stat("udr-events", udrEventsOID.data(), udrEventsOID.size());
 
 #endif /* HAVE_NET_SNMP */
 }
diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc
index ce807e542c..f49243b6ba 100644
--- a/pdns/recursordist/rec_channel_rec.cc
+++ b/pdns/recursordist/rec_channel_rec.cc
@@ -1501,8 +1501,8 @@ static void registerAllStats1()
   addGetStat("maintenance-usec", [] { return g_Counters.sum(rec::Counter::maintenanceUsec); });
   addGetStat("maintenance-calls", [] { return g_Counters.sum(rec::Counter::maintenanceCalls); });
 
-  addGetStat("nod-count", [] { return g_Counters.sum(rec::Counter::nodCount); });
-  addGetStat("udr-count", [] { return g_Counters.sum(rec::Counter::udrCount); });
+  addGetStat("nod-events", [] { return g_Counters.sum(rec::Counter::nodCount); });
+  addGetStat("udr-events", [] { return g_Counters.sum(rec::Counter::udrCount); });
 
   /* make sure that the ECS stats are properly initialized */
   SyncRes::clearECSStats();
diff --git a/pdns/recursordist/ws-recursor.cc b/pdns/recursordist/ws-recursor.cc
index 2b7c288e87..46efe7a8c4 100644
--- a/pdns/recursordist/ws-recursor.cc
+++ b/pdns/recursordist/ws-recursor.cc
@@ -1190,11 +1190,11 @@ const std::map<std::string, MetricDefinition> MetricDefinitionStorage::d_metrics
   {"remote-logger-count-o-0",
    MetricDefinition(PrometheusMetricType::multicounter,
                     "Number of remote logging events")},
-  {"nod-count",
+  {"nod-events",
    MetricDefinition(PrometheusMetricType::counter,
                     "Count of NOD events")},
 
-  {"udr-count",
+  {"udr-events",
    MetricDefinition(PrometheusMetricType::counter,
                     "Count of UDR events")},
 };