From 5203af38497912a13fce0069d5363c48994bb39e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mr=C3=A1zek?= Date: Fri, 6 Jun 2025 13:01:21 +0200 Subject: [PATCH] datamodel: logging: dnstap: changed log-* defaults to false --- NEWS | 4 ++++ doc/_static/config.schema.json | 18 +++++++++--------- doc/user/config-logging-dnstap.rst | 2 +- .../knot_resolver/datamodel/logging_schema.py | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index 2e4cc110e..9085fef6c 100644 --- a/NEWS +++ b/NEWS @@ -36,6 +36,10 @@ https://www.knot-resolver.cz/documentation/v6.0.16/upgrading.html - /network/proxy_protocol -> /network/proxy_protocol/enable - /network/tls/files-watchdog -> /network/tls/watchdog - /rate-limiting -> /rate-limiting/enable +- Changed default values in declarative configuration model (YAML). (!1672) + - /logging/dnstap/log-queries: true -> false + - /logging/dnstap/log-responses: true -> false + - /logging/dnstap/log-tcp-rtt: true -> false Knot Resolver 6.0.15 (2025-07-17) diff --git a/doc/_static/config.schema.json b/doc/_static/config.schema.json index 785d91da4..d742850b1 100644 --- a/doc/_static/config.schema.json +++ b/doc/_static/config.schema.json @@ -1499,25 +1499,25 @@ "log-queries": { "type": "boolean", "description": "Log queries from downstream in wire format.", - "default": true + "default": false }, "log-responses": { "type": "boolean", "description": "Log responses to downstream in wire format.", - "default": true + "default": false }, "log-tcp-rtt": { "type": "boolean", "description": "Log TCP RTT (Round-trip time).", - "default": true + "default": false } }, "default": { "enable": false, "unix_socket": null, - "log_queries": true, - "log_responses": true, - "log_tcp_rtt": true + "log_queries": false, + "log_responses": false, + "log_tcp_rtt": false } } }, @@ -1528,9 +1528,9 @@ "dnstap": { "enable": false, "unix_socket": null, - "log_queries": true, - "log_responses": true, - "log_tcp_rtt": true + "log_queries": false, + "log_responses": false, + "log_tcp_rtt": false } } }, diff --git a/doc/user/config-logging-dnstap.rst b/doc/user/config-logging-dnstap.rst index c9de7bea3..e783a2dbe 100644 --- a/doc/user/config-logging-dnstap.rst +++ b/doc/user/config-logging-dnstap.rst @@ -31,6 +31,6 @@ Tunables: dnstap: enable: true unix-socket: /tmp/dnstap.sock - # by default log is enabled for all + # by default log is disabled for all log-queries: true log-responses: true diff --git a/python/knot_resolver/datamodel/logging_schema.py b/python/knot_resolver/datamodel/logging_schema.py index b6587584b..d0e610125 100644 --- a/python/knot_resolver/datamodel/logging_schema.py +++ b/python/knot_resolver/datamodel/logging_schema.py @@ -77,9 +77,9 @@ class DnstapSchema(ConfigSchema): enable: bool = False unix_socket: Optional[WritableFilePath] = None - log_queries: bool = True - log_responses: bool = True - log_tcp_rtt: bool = True + log_queries: bool = False + log_responses: bool = False + log_tcp_rtt: bool = False def _validate(self) -> None: if self.enable and self.unix_socket is None: -- 2.47.3