add tag support on syslog logger

dmachard · Oct 12, 2023 · ff45517 · ff45517
1 parent 2c3a6b1
commit ff45517
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/dnsutils/config.go b/dnsutils/config.go
@@ -352,6 +352,7 @@ type Config struct {
 			TlsMinVersion     string `yaml:"tls-min-version"`
 			Format            string `yaml:"format"`
 			ChannelBufferSize int    `yaml:"chan-buffer-size"`
+			Tag               string `yaml:"tag"`
 		} `yaml:"syslog"`
 		Fluentd struct {
 			Enable            bool   `yaml:"enable"`
@@ -662,6 +663,7 @@ func (c *Config) SetDefault() {
 	c.Loggers.Syslog.TlsInsecure = false
 	c.Loggers.Syslog.TlsMinVersion = TLS_v12
 	c.Loggers.Syslog.ChannelBufferSize = 65535
+	c.Loggers.Syslog.Tag = ""
 
 	c.Loggers.Fluentd.Enable = false
 	c.Loggers.Fluentd.RemoteAddress = LOCALHOST_IP

diff --git a/docs/loggers/logger_syslog.md b/docs/loggers/logger_syslog.md
@@ -18,8 +18,9 @@ Options:
 * `tls-support`: (boolean) enable tls
 * `tls-insecure`: (boolean) insecure skip verify
 * `tls-min-version`: (string) min tls version, default to 1.2
-* `format`: (string) Set syslog formatter between `unix` (default), [`rfc3164`](https://www.rfc-editor.org/rfc/)rfc3164 ) or [`rfc5424`](https://www.rfc-editor.org/rfc/rfc5424)
+* `format`: (string) Set syslog formatter between `unix` (default), [`rfc3164`](https://www.rfc-editor.org/rfc/)rfc3164 or [`rfc5424`](https://www.rfc-editor.org/rfc/rfc5424)
 * `chan-buffer-size`: (integer) channel buffer size used on incoming dns message, number of messages before to drop it.
+* `tag`: (string) syslog tag
 
 Default values:
 
@@ -36,4 +37,5 @@ syslog:
   tls-min-version: 1.2
   format: ""
   chan-buffer-size: 65535
+  tag: ""
 ```
diff --git a/loggers/syslog.go b/loggers/syslog.go
@@ -198,13 +198,16 @@ func (o *Syslog) Process() {
 			tlsConfig.MinVersion = dnsutils.TLS_VERSION[o.config.Loggers.Syslog.TlsMinVersion]
 
 			syslogconn, err = syslog.DialWithTLSConfig(o.config.Loggers.Syslog.Transport,
-				o.config.Loggers.Syslog.RemoteAddress, o.facility|o.severity, "", tlsConfig)
+				o.config.Loggers.Syslog.RemoteAddress, o.facility|o.severity,
+				o.config.Loggers.Syslog.Tag,
+				tlsConfig)
 			if err != nil {
 				o.logger.Fatal("failed to connect to the remote tls syslog:", err)
 			}
 		} else {
 			syslogconn, err = syslog.Dial(o.config.Loggers.Syslog.Transport,
-				o.config.Loggers.Syslog.RemoteAddress, o.facility|o.severity, "")
+				o.config.Loggers.Syslog.RemoteAddress, o.facility|o.severity,
+				o.config.Loggers.Syslog.Tag)
 			if err != nil {
 				o.logger.Fatal("failed to connect to the remote syslog:", err)
 			}