From 96acd67fbd568d3d5a6e5fd3c3cd4ff66ae0afe0 Mon Sep 17 00:00:00 2001 From: Denis Machard <5562930+dmachard@users.noreply.github.com> Date: Tue, 26 Dec 2023 17:42:21 +0100 Subject: [PATCH] Rename dnstap logger - breaking changes (#526) --- config.yml | 2 +- docs/_examples/use-case-12.yml | 4 ++-- docs/_examples/use-case-16.yml | 2 +- docs/_examples/use-case-5.yml | 2 +- docs/loggers/logger_dnstap.md | 2 +- pkgconfig/loggers.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config.yml b/config.yml index b6f684d7..7a8e6ed9 100644 --- a/config.yml +++ b/config.yml @@ -306,7 +306,7 @@ multiplexer: # chan-buffer-size: 65535 # # resend captured dns traffic to another dnstap collector or to unix socket -# dnstap: +# dnstapclient: # # network transport to use: unix|tcp|tcp+tls # transport: tcp # # remote address diff --git a/docs/_examples/use-case-12.yml b/docs/_examples/use-case-12.yml index b4997c3a..e8de3220 100644 --- a/docs/_examples/use-case-12.yml +++ b/docs/_examples/use-case-12.yml @@ -20,11 +20,11 @@ multiplexer: # Redirect DNSTap to two destinations loggers: - name: relay-out1 - dnstap: + dnstapclient: remote-address: 127.0.0.1 remote-port: 6001 - name: relay-out2 - dnstap: + dnstapclient: remote-address: 127.0.0.1 remote-port: 6002 diff --git a/docs/_examples/use-case-16.yml b/docs/_examples/use-case-16.yml index d2895b79..a3a1c5c0 100644 --- a/docs/_examples/use-case-16.yml +++ b/docs/_examples/use-case-16.yml @@ -16,7 +16,7 @@ multiplexer: # Redirect output to a remote DNStap collector loggers: - name: tap - dnstap: + dnstapclient: remote-address: 127.0.0.1 remote-port: 6002 diff --git a/docs/_examples/use-case-5.yml b/docs/_examples/use-case-5.yml index 9772c47d..75614e99 100644 --- a/docs/_examples/use-case-5.yml +++ b/docs/_examples/use-case-5.yml @@ -20,7 +20,7 @@ multiplexer: # Sends to another DNSTap collector with TLS loggers: - name: tap_tls - dnstap: + dnstapclient: remote-address: 127.0.0.1 remote-port: 6000 tls-support: true diff --git a/docs/loggers/logger_dnstap.md b/docs/loggers/logger_dnstap.md index a44f6959..e9a60ff8 100644 --- a/docs/loggers/logger_dnstap.md +++ b/docs/loggers/logger_dnstap.md @@ -25,7 +25,7 @@ Options: Default values: ```yaml -dnstap: +dnstapclient: transport: tcp remote-address: 10.0.0.1 remote-port: 6000 diff --git a/pkgconfig/loggers.go b/pkgconfig/loggers.go index fdb1a263..333abb46 100644 --- a/pkgconfig/loggers.go +++ b/pkgconfig/loggers.go @@ -77,7 +77,7 @@ type ConfigLoggers struct { OverwriteIdentity bool `yaml:"overwrite-identity"` BufferSize int `yaml:"buffer-size"` ChannelBufferSize int `yaml:"chan-buffer-size"` - } `yaml:"dnstap"` + } `yaml:"dnstapclient"` TCPClient struct { Enable bool `yaml:"enable"` RemoteAddress string `yaml:"remote-address"`