From: bert hubert <bert.hubert@powerdns.com>
Date: Mon, 8 Oct 2018 15:24:08 +0000 (+0200)
Subject: document variable-responses counter + SNMP it up
X-Git-Tag: rec-4.2.0-alpha1~42^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e58ff50ba6e2501efe27cb442d623363cbfc3be;p=pdns

document variable-responses counter + SNMP it up
---

diff --git a/pdns/rec-snmp.cc b/pdns/rec-snmp.cc
index 930eca530..8fa346b74 100644
--- a/pdns/rec-snmp.cc
+++ b/pdns/rec-snmp.cc
@@ -112,6 +112,7 @@ static const oid truncatedDropsOID[] = { RECURSOR_STATS_OID, 93 };
 static const oid emptyQueriesOID[] = { RECURSOR_STATS_OID, 94 };
 static const oid dnssecAuthenticDataQueriesOID[] = { RECURSOR_STATS_OID, 95 };
 static const oid dnssecCheckDisabledQueriesOID[] = { RECURSOR_STATS_OID, 96 };
+static const oid variableResponsesOID[] = { RECURSOR_STATS_OID, 97 };
 
 static std::unordered_map<oid, std::string> s_statsMap;
 
@@ -226,6 +227,7 @@ RecursorSNMPAgent::RecursorSNMPAgent(const std::string& name, const std::string&
   registerCounter64Stat("query-pipe-full-drops", queryPipeFullDropsOID, OID_LENGTH(queryPipeFullDropsOID));
   registerCounter64Stat("truncated-drops", truncatedDropsOID, OID_LENGTH(truncatedDropsOID));
   registerCounter64Stat("empty-queries", emptyQueriesOID, OID_LENGTH(emptyQueriesOID));
+  registerCounter64Stat("variable-responses", variableResponsesOID, OID_LENGTH(variableResponsesOID));
   registerCounter64Stat("answers0-1", answers01OID, OID_LENGTH(answers01OID));
   registerCounter64Stat("answers1-10", answers110OID, OID_LENGTH(answers110OID));
   registerCounter64Stat("answers10-100", answers10100OID, OID_LENGTH(answers10100OID));
diff --git a/pdns/recursordist/RECURSOR-MIB.txt b/pdns/recursordist/RECURSOR-MIB.txt
index c1d74c97e..23f4287a8 100644
--- a/pdns/recursordist/RECURSOR-MIB.txt
+++ b/pdns/recursordist/RECURSOR-MIB.txt
@@ -801,6 +801,14 @@ dnssecCheckDisabledQueries OBJECT-TYPE
         "Number of queries received with the CD bit set"
     ::= { stats 96 }
 
+variableResponses OBJECT-TYPE
+    SYNTAX Counter64
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of variable responses"
+    ::= { stats 97 }
+
 ---
 --- Traps / Notifications
 ---
@@ -938,7 +946,8 @@ recGroup OBJECT-GROUP
         truncatedDrops,
         emptyQueries,
         dnssecAuthenticDataQueries,
-        dnssecCheckDisabledQueries
+        dnssecCheckDisabledQueries,
+        variableResponses,
         trapReason
     }
     STATUS current
diff --git a/pdns/recursordist/docs/metrics.rst b/pdns/recursordist/docs/metrics.rst
index 569fcd469..e3f7b4c60 100644
--- a/pdns/recursordist/docs/metrics.rst
+++ b/pdns/recursordist/docs/metrics.rst
@@ -476,6 +476,14 @@ number of CPU milliseconds spent in 'user' mode
 
 .. _stat-x-our-latency:
 
+variable-responses
+^^^^^^^^^^^^^
+.. versionadded:: 4.2
+
+Reponses that were marked as 'variable'. This could be because of EDNS
+Client Subnet or Lua rules that indicate this variable status (dependent on
+time or who is asking, for example).
+
 x-our-latency
 ^^^^^^^^^^^^^
 .. versionadded:: 4.1