From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 9 Jun 2021 09:44:42 +0000 (+0200)
Subject: dotOutqueries metrics: docs, Prometheus and SNMP
X-Git-Tag: dnsdist-1.7.0-alpha1~138^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cbc21cb353af863ae11ab3f4b1e12ded26022e;p=thirdparty%2Fpdns.git

dotOutqueries metrics: docs, Prometheus and SNMP
---

diff --git a/pdns/rec-snmp.cc b/pdns/rec-snmp.cc
index e7e894010f..cc6b5541aa 100644
--- 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 49724d6fdb..cc7ad62b84 100644
--- 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 f97deee77f..aa067b4f38 100644
--- 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 066460f32b..a65e60795d 100644
--- 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