dotOutqueries metrics: docs, Prometheus and SNMP

diff --git a/pdns/rec-snmp.cc b/pdns/rec-snmp.cc
index e7e894010f347f7529bc64dcd4517f62ac4f2cab..cc6b5541aac15c56dc4a1cc55cca551b78506ac1 100644 (file)
--- a/pdns/rec-snmp.cc
+++ b/pdns/rec-snmp.cc
@@ -130,6 +130,7 @@ static const oid aggressiveNSECCacheNSECHitsOID[] = { RECURSOR_STATS_OID, 109 };
 static const oid aggressiveNSECCacheNSEC3HitsOID[] = { RECURSOR_STATS_OID, 110 };
 static const oid aggressiveNSECCacheNSECWCHitsOID[] = { RECURSOR_STATS_OID, 111 };
 static const oid aggressiveNSECCacheNSEC3WCHitsOID[] = { RECURSOR_STATS_OID, 112 };
+static const oid dotOutqueriesOID [] = { RECURSOR_STATS_OID, 113 };
 
 static std::unordered_map<oid, std::string> s_statsMap;
 
@@ -351,5 +352,6 @@ RecursorSNMPAgent::RecursorSNMPAgent(const std::string& name, const std::string&
   registerCounter64Stat("aggressive-nsec-cache-nsec3-hits", aggressiveNSECCacheNSEC3HitsOID, OID_LENGTH(aggressiveNSECCacheNSEC3HitsOID));
   registerCounter64Stat("aggressive-nsec-cache-nsec-wc-hits", aggressiveNSECCacheNSECWCHitsOID, OID_LENGTH(aggressiveNSECCacheNSECWCHitsOID));
   registerCounter64Stat("aggressive-nsec-cache-nsec-wc3-hits", aggressiveNSECCacheNSEC3WCHitsOID, OID_LENGTH(aggressiveNSECCacheNSEC3WCHitsOID));
+  registerCounter64Stat("dot-outqueries", dotOutqueriesOID, OID_LENGTH(dotOutqueriesOID));
 #endif /* HAVE_NET_SNMP */
 }

diff --git a/pdns/recursordist/RECURSOR-MIB.txt b/pdns/recursordist/RECURSOR-MIB.txt
index 49724d6fdb9d3b5382338f6022d77daa92e6c4aa..cc7ad62b84e8002d540badfc6beb8f8bef4360f8 100644 (file)
--- a/pdns/recursordist/RECURSOR-MIB.txt
+++ b/pdns/recursordist/RECURSOR-MIB.txt
@@ -938,6 +938,14 @@ aggressiveNSECCacheNSEC3WcHits OBJECT-TYPE
         "Number of answers synthesized from the NSEC3 aggressive cache"
     ::= { stats 112 }
 
+dotOutqueries OBJECT-TYPE
+    SYNTAX Counter64
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of outgoing DoT queries since starting"
+    ::= { stats 113 }
+
 ---
 --- Traps / Notifications
 ---
@@ -1093,7 +1101,8 @@ recGroup OBJECT-GROUP
         aggressiveNSECCacheNSECHits,
         aggressiveNSECCacheNSEC3Hits,
         aggressiveNSECCacheNSECWcHits,
-        aggressiveNSECCacheNSEC3WcHits
+        aggressiveNSECCacheNSEC3WcHits,
+        dotOutqueries
     }
     STATUS current
     DESCRIPTION "Objects conformance group for PowerDNS Recursor"

diff --git a/pdns/recursordist/docs/metrics.rst b/pdns/recursordist/docs/metrics.rst
index f97deee77fb019a5d51ea378be4c4ae4b50c7795..aa067b4f38b97c2e4bc71889c3280d914c0462ac 100644 (file)
--- a/pdns/recursordist/docs/metrics.rst
+++ b/pdns/recursordist/docs/metrics.rst
@@ -405,6 +405,10 @@ dont-outqueries
 ^^^^^^^^^^^^^^^
 number of outgoing queries dropped because of   :ref:`setting-dont-query` setting (since 3.3)
 
+dot-outqueries
+^^^^^^^^^^^^^^
+counts the number of outgoing DoT queries since starting
+
 qname-min-fallback-success
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. versionadded:: 4.3.0

diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 066460f32bb0780637f4d137e05062d956839f20..a65e60795da4e40e9325ea8374d724e599166d0c 100644 (file)
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -1025,6 +1025,10 @@ const std::map<std::string, MetricDefinition> MetricDefinitionStorage::metrics =
     MetricDefinition(PrometheusMetricType::gauge,
                      "number of tasks currently in the taskqueue")},
 
+  { "dot-outqueries",
+    MetricDefinition(PrometheusMetricType::counter,
+                     "Number of outgoing DoT queries since starting")},
+
 };
 
 #define CHECK_PROMETHEUS_METRICS 0