From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 20 Nov 2023 09:31:19 +0000 (+0100)
Subject: Document various outgoing query counters better
X-Git-Tag: rec-5.0.0-rc1~32^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98a8bbef8c25beb76db9c8ad501de1be2fc34b89;p=thirdparty%2Fpdns.git

Document various outgoing query counters better

In particular, all-outqueries was documented to count only UDP,
while it actually counts *all* outgoing queries.
---

diff --git a/pdns/recursordist/docs/metrics.rst b/pdns/recursordist/docs/metrics.rst
index a5ab35308f..6c20957165 100644
--- a/pdns/recursordist/docs/metrics.rst
+++ b/pdns/recursordist/docs/metrics.rst
@@ -170,7 +170,7 @@ number of answers synthesized from NSEC entries and wildcards by the NSEC3 aggre
 
 all-outqueries
 ^^^^^^^^^^^^^^
-counts the number of outgoing UDP queries since starting
+counts the number of outgoing queries since starting, this includes UDP, TCP, DoT queries both over IPv4 and IPv6
 
 answers-slow
 ^^^^^^^^^^^^
@@ -458,7 +458,7 @@ number of outgoing queries dropped because of   :ref:`setting-dont-query` settin
 
 dot-outqueries
 ^^^^^^^^^^^^^^
-counts the number of outgoing DoT queries since starting
+counts the number of outgoing DoT queries since starting, both using IPv4 and IPv6
 
 qname-min-fallback-success
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -513,11 +513,11 @@ counts the number of non-query packets received   on server sockets that should
 
 ipv6-outqueries
 ^^^^^^^^^^^^^^^
-number of outgoing queries over IPv6
+number of outgoing queries over IPv6 using UDP, since version 5.0.0 also including TCP and DoT
 
 ipv6-questions
 ^^^^^^^^^^^^^^
-counts all end-user initiated queries with the RD   bit set, received over IPv6 UDP
+counts all client initiated queries using IPv6
 
 maintenance-usec
 ^^^^^^^^^^^^^^^^
@@ -760,7 +760,7 @@ counts the number of currently active TCP/IP clients
 
 tcp-outqueries
 ^^^^^^^^^^^^^^
-counts the number of outgoing TCP queries since   starting
+counts the number of outgoing TCP queries since starting, both using IPv4 and IPV6
 
 tcp-questions
 ^^^^^^^^^^^^^
diff --git a/pdns/recursordist/ws-recursor.cc b/pdns/recursordist/ws-recursor.cc
index 64c027da55..4f51a87089 100644
--- a/pdns/recursordist/ws-recursor.cc
+++ b/pdns/recursordist/ws-recursor.cc
@@ -616,7 +616,7 @@ static void serveStuff(HttpRequest* req, HttpResponse* resp)
 const std::map<std::string, MetricDefinition> MetricDefinitionStorage::d_metrics = {
   {"all-outqueries",
    MetricDefinition(PrometheusMetricType::counter,
-                    "Number of outgoing UDP queries since starting")},
+                    "Number of outgoing queries since starting")},
 
   {"answers-slow",
    MetricDefinition(PrometheusMetricType::counter,