From: Otto <otto.moerbeek@open-xchange.com>
Date: Fri, 24 Sep 2021 08:56:20 +0000 (+0200)
Subject: Fixes in docs and metrics help texts
X-Git-Tag: rec-4.6.0-alpha1~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10669%2Fhead;p=thirdparty%2Fpdns.git

Fixes in docs and metrics help texts
---

diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index 4d93560d66..2343e6cc44 100644
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -1887,6 +1887,8 @@ The numerical value supplied is used as the queue size, 0 meaning disabled. See
 
 Enable TCP Fast Open Connect support, if available, on the outgoing connections to authoritative servers. See :ref:`tcp-fast-open-support`.
 
+.. _setting-tcp-out-max-idle-ms:
+
 ``tcp-out-max-idle-ms``
 -----------------------
 .. versionadded:: 4.6.0
@@ -1896,6 +1898,8 @@ Enable TCP Fast Open Connect support, if available, on the outgoing connections
 
 Time outgoing TCP/DoT connections are left idle in milliseconds or 0 if no limit. After having been idle for this time, the connection is eligible for closing.
 
+.. _setting-tcp-out-max-per-auth:
+
 ``tcp-out-max-idle-per-auth``
 -----------------------------
 .. versionadded:: 4.6.0
@@ -1905,6 +1909,8 @@ Time outgoing TCP/DoT connections are left idle in milliseconds or 0 if no limit
 
 Maximum number of idle outgoing TCP/DoT connections to a specific IP per thread, 0 means do not keep idle connections open.
 
+.. _setting-tcp-out-max-queries:
+
 ``tcp-out-max-queries``
 -----------------------
 -  Integer
@@ -1915,6 +1921,8 @@ closed and a new one will be created if needed.
 
 .. versionadded:: 4.6.0
 
+.. _setting-tcp-out-max-idle-per-thread:
+
 ``tcp-out-max-idle-per-thread``
 -------------------------------
 .. versionadded:: 4.6.0
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 2b0a87068d..97b968d5ab 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -1085,6 +1085,11 @@ const std::map<std::string, MetricDefinition> MetricDefinitionStorage::d_metrics
   { "policy-hits",
     MetricDefinition(PrometheusMetricType::multicounter,
                      "Number of filter or RPZ policy hits")},
+
+  { "idle-tcpout-connections",
+    MetricDefinition(PrometheusMetricType::gauge,
+                     "Number of connections in the TCP idle outgoing connections pool")},
+
 };
 
 #define CHECK_PROMETHEUS_METRICS 0