auth: Add IPv6 UDP error metrics

diff --git a/docs/performance.rst b/docs/performance.rst
index 71aced02f3a1f298459fee1adc1927f30aa58007..980f6338c28fd676c927d9997234804920166767 100644 (file)
--- a/docs/performance.rst
+++ b/docs/performance.rst
@@ -473,12 +473,42 @@ udp6-answers
 ^^^^^^^^^^^^
 Number of answers sent out over UDPv6
 
+.. _stat-udp6-in-csum-errors:
+
+udp6-in-csum-errors
+^^^^^^^^^^^^^^^^^^^
+Number of IPv6 UDP packets received with an invalid checksum
+
+.. _stat-udp6-in-errors:
+
+udp6-in-errors
+^^^^^^^^^^^^^^
+Number of IPv6 UDP packets received faster than the OS could process them
+
+.. _stat-udp6-noport-errors:
+
+udp6-noport-errors
+^^^^^^^^^^^^^^^^^^
+Number of IPv6 UDP packets where an ICMP response was received that the remote port was not listening
+
 .. _stat-udp6-queries:
 
 udp6-queries
 ^^^^^^^^^^^^
 Number of questions received over UDPv6
 
+.. _stat-udp6-recvbuf-errors:
+
+udp6-recvbuf-errors
+^^^^^^^^^^^^^^^^^^^
+Number of errors caused in the IPv6 UDP receive buffer
+
+.. _stat-udp6-sndbuf-errors:
+
+udp6-sndbuf-errors
+^^^^^^^^^^^^^^^^^^
+Number of errors caused in the IPv6 UDP send buffer
+
 .. _stat-uptime:
 
 uptime

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 0269ac122da70248dc3055932b1557877a2afb6c..39dab491603b5af27a8e8f88b40274fb520d145b 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -371,6 +371,11 @@ void declareStats()
   S.declare("udp-noport-errors", "UDP 'noport' errors", udpErrorStats, StatType::counter);
   S.declare("udp-in-errors", "UDP 'in' errors", udpErrorStats, StatType::counter);
   S.declare("udp-in-csum-errors", "UDP 'in checksum' errors", udpErrorStats, StatType::counter);
+  S.declare("udp6-in-errors", "UDP 'in' errors over IPv6", udp6ErrorStats, StatType::counter);
+  S.declare("udp6-recvbuf-errors", "UDP 'recvbuf' errors over IPv6", udp6ErrorStats, StatType::counter);
+  S.declare("udp6-sndbuf-errors", "UDP 'sndbuf' errors over IPv6", udp6ErrorStats, StatType::counter);
+  S.declare("udp6-noport-errors", "UDP 'noport' errors over IPv6", udp6ErrorStats, StatType::counter);
+  S.declare("udp6-in-csum-errors", "UDP 'in checksum' errors over IPv6", udp6ErrorStats, StatType::counter);
 #endif
 
   S.declare("sys-msec", "Number of msec spent in system time", getSysUserTimeMsec, StatType::counter);

diff --git a/regression-tests.nobackend/counters/command b/regression-tests.nobackend/counters/command
index ed98aa16abf49d790e98d72aa9223a9219715b69..a88d4a46e46a30617c6778b64bbf4a5316be6742 100755 (executable)
--- a/regression-tests.nobackend/counters/command
+++ b/regression-tests.nobackend/counters/command
@@ -36,7 +36,7 @@ $SDIG 127.0.0.1 $port test.com SRV >&2 >/dev/null
 $SDIG 127.0.0.1 $port test.com.invalid MX >&2 >/dev/null
 
 $PDNSCONTROL --config-name= --no-config --socket-dir=./ 'show *' | \
-  tr ',' '\n'| grep -v -E '(user-msec|sys-msec|cpu-iowait|cpu-steal|uptime|udp-noport-errors|udp-in-csum-errors|udp-in-errors|real-memory-usage|special-memory-usage|udp-recvbuf-errors|udp-sndbuf-errors|-hit|-miss|fd-usage|latency|backend-queries)' | LC_ALL=C sort
+  tr ',' '\n'| grep -v -E '(user-msec|sys-msec|cpu-iowait|cpu-steal|uptime|udp-noport-errors|udp-in-csum-errors|udp-in-errors|udp-recvbuf-errors|udp-sndbuf-errors|real-memory-usage|special-memory-usage|udp6-recvbuf-errors|udp6-sndbuf-errors|udp6-noport-errors|udp6-in-csum-errors|udp6-in-errors|-hit|-miss|fd-usage|latency|backend-queries)' | LC_ALL=C sort
 
 kill $(cat pdns*.pid)
 rm pdns*.pid