From: Remi Gacogne Date: Thu, 14 Mar 2019 10:26:59 +0000 (+0100) Subject: rec: Rename the stats blacklist settings to 'stats-$TYPE-blacklist' X-Git-Tag: dnsdist-1.4.0-alpha1~58^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=563517f3f80e1c6b7f8d7ca1e271ba44a3048def;p=pdns rec: Rename the stats blacklist settings to 'stats-$TYPE-blacklist' --- diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 02ec7ecfd..494138f75 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -3857,10 +3857,10 @@ static int serviceMain(int argc, char*argv[]) g_tcpMaxQueriesPerConn=::arg().asNum("max-tcp-queries-per-connection"); s_maxUDPQueriesPerRound=::arg().asNum("max-udp-queries-per-round"); - blacklistStats(StatComponent::API, ::arg()["blacklisted-stats-api"]); - blacklistStats(StatComponent::Carbon, ::arg()["blacklisted-stats-carbon"]); - blacklistStats(StatComponent::RecControl, ::arg()["blacklisted-stats-rec-control"]); - blacklistStats(StatComponent::SNMP, ::arg()["blacklisted-stats-snmp"]); + blacklistStats(StatComponent::API, ::arg()["stats-api-blacklist"]); + blacklistStats(StatComponent::Carbon, ::arg()["stats-carbon-blacklist"]); + blacklistStats(StatComponent::RecControl, ::arg()["stats-rec-control-blacklist"]); + blacklistStats(StatComponent::SNMP, ::arg()["stats-snmp-blacklist"]); if (::arg().mustDo("snmp-agent")) { g_snmpAgent = std::make_shared("recursor", ::arg()["snmp-master-socket"]); @@ -4292,10 +4292,10 @@ int main(int argc, char **argv) for (size_t idx = 0; idx < 128; idx++) { defaultBlacklistedStats += ", ecs-v6-response-bits-" + std::to_string(idx + 1); } - ::arg().set("blacklisted-stats-api", "List of statistics that are disabled when retrieving the complete list of statistics via the API")=defaultBlacklistedStats; - ::arg().set("blacklisted-stats-carbon", "List of statistics that are prevented from being exported via Carbon")=defaultBlacklistedStats; - ::arg().set("blacklisted-stats-rec-control", "List of statistics that are prevented from being exported via rec_control get-all")=defaultBlacklistedStats; - ::arg().set("blacklisted-stats-snmp", "List of statistics that are prevented from being exported via SNMP")=defaultBlacklistedStats; + ::arg().set("stats-api-blacklist", "List of statistics that are disabled when retrieving the complete list of statistics via the API")=defaultBlacklistedStats; + ::arg().set("stats-carbon-blacklist", "List of statistics that are prevented from being exported via Carbon")=defaultBlacklistedStats; + ::arg().set("stats-rec-control-blacklist", "List of statistics that are prevented from being exported via rec_control get-all")=defaultBlacklistedStats; + ::arg().set("stats-snmp-blacklist", "List of statistics that are prevented from being exported via SNMP")=defaultBlacklistedStats; ::arg().set("tcp-fast-open", "Enable TCP Fast Open support on the listening sockets, using the supplied numerical value as the queue size")="0"; ::arg().set("nsec3-max-iterations", "Maximum number of iterations allowed for an NSEC3 record")="2500"; diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst index 646a28970..102f003c1 100644 --- a/pdns/recursordist/docs/settings.rst +++ b/pdns/recursordist/docs/settings.rst @@ -126,46 +126,6 @@ DNSSEC is not supported. Example: auth-zones=example.org=/var/zones/example.org, powerdns.com=/var/zones/powerdns.com -.. _setting-blacklisted-stats-api: - -``blacklisted-stats-api`` -------------------------- -.. versionadded:: 4.2.0 - -- String -- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" - -A list of comma-separated statistic names, that are disabled when retrieving the complete list of statistics via the API for performance reasons. -These statistics can still be retrieved individually by specifically asking for it. - -``blacklisted-stats-carbon`` ---------------------------- -.. versionadded:: 4.2.0 - -- String -- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" - -A list of comma-separated statistic names, that are prevented from being exported via carbon for performance reasons. - -``blacklisted-stats-rec-control`` ---------------------------------- -.. versionadded:: 4.2.0 - -- String -- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" - -A list of comma-separated statistic names, that are disabled when retrieving the complete list of statistics via `rec_control get-all`, for performance reasons. -These statistics can still be retrieved individually. - -``blacklisted-stats-snmp`` --------------------------- -.. versionadded:: 4.2.0 - -- String -- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" - -A list of comma-separated statistic names, that are prevented from being exported via SNMP, for performance reasons. - .. _setting-carbon-interval: ``carbon-interval`` @@ -1322,6 +1282,41 @@ Size of the stack per thread. Interval between logging statistical summary on recursor performance. Use 0 to disable. +.. _setting-stats-api-blacklist: + +``stats-api-blacklist`` +----------------------- +.. versionadded:: 4.2.0 + +- String +- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" + +A list of comma-separated statistic names, that are disabled when retrieving the complete list of statistics via the API for performance reasons. +These statistics can still be retrieved individually by specifically asking for it. + +.. _setting-stats-carbon-blacklist: + +``stats-carbon-blacklist`` +-------------------------- +.. versionadded:: 4.2.0 + +- String +- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" + +A list of comma-separated statistic names, that are prevented from being exported via carbon for performance reasons. + +.. _setting-stats-rec-control-blacklist: + +``stats-rec-control-blacklist`` +------------------------------- +.. versionadded:: 4.2.0 + +- String +- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" + +A list of comma-separated statistic names, that are disabled when retrieving the complete list of statistics via `rec_control get-all`, for performance reasons. +These statistics can still be retrieved individually. + .. _setting-stats-ringbuffer-entries: ``stats-ringbuffer-entries`` @@ -1332,6 +1327,17 @@ Use 0 to disable. Number of entries in the remotes ringbuffer, which keeps statistics on who is querying your server. Can be read out using ``rec_control top-remotes``. +.. _setting-stats-snmp-blacklist: + +``stats-snmp-blacklist`` +------------------------ +.. versionadded:: 4.2.0 + +- String +- Default: "cache-bytes, packetcache-bytes, ecs-v4-response-bits-*, ecs-v6-response-bits-*" + +A list of comma-separated statistic names, that are prevented from being exported via SNMP, for performance reasons. + .. _setting-tcp-fast-open: ``tcp-fast-open``