diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-12-27 12:25:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 12:25:26 +0100 |
| commit | 3f05c880ba4b0edfc4238ce15e6508473d30b379 (patch) | |
| tree | bc626c6f542610631da1569bbd09e1f701da7a03 | |
| parent | a455cdcb06d527d43cbd2979eb2c646597d88ae6 (diff) | |
| parent | cd8015a4b60e486f465aef9abfd0861988e4f32d (diff) | |
| download | vyos-1x-3f05c880ba4b0edfc4238ce15e6508473d30b379.tar.gz vyos-1x-3f05c880ba4b0edfc4238ce15e6508473d30b379.zip | |
Merge pull request #1116 from sever-sever/T4039
syslog: T4039: Add protocol23format logging for UDP
| -rw-r--r-- | data/templates/syslog/rsyslog.conf.tmpl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/data/templates/syslog/rsyslog.conf.tmpl b/data/templates/syslog/rsyslog.conf.tmpl index e25ef48d4..2fb621760 100644 --- a/data/templates/syslog/rsyslog.conf.tmpl +++ b/data/templates/syslog/rsyslog.conf.tmpl @@ -25,12 +25,18 @@ $outchannel {{ file }},{{ file_options['log-file'] }},{{ file_options['max-size' {% if host_options.proto == 'tcp' %} {% if host_options.port is defined %} {% if host_options.oct_count is defined %} -{{ host_options.selectors }} @@(o){{ host }}:{{ host_options.port }};RSYSLOG_SyslogProtocol23Format +{{ host_options.selectors }} @@(o){{ host | bracketize_ipv6 }}:{{ host_options.port }};RSYSLOG_SyslogProtocol23Format {% else %} -{{ host_options.selectors }} @@{{ host }}:{{ host_options.port }} +{{ host_options.selectors }} @@{{ host | bracketize_ipv6 }}:{{ host_options.port }} {% endif %} {% else %} -{{ host_options.selectors }} @@{{ host }} +{{ host_options.selectors }} @@{{ host | bracketize_ipv6 }} +{% endif %} +{% elif host_options.proto == 'udp' %} +{% if host_options.port is defined %} +{{ host_options.selectors }} @{{ host | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.oct_count is sameas true }} +{% else %} +{{ host_options.selectors }} @{{ host | bracketize_ipv6 }} {% endif %} {% else %} {% if host_options['port'] %} |