diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-09-19 16:47:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 16:47:10 +0100 |
| commit | ac9f5b19604b5cbe45fcb76baae98eaa81adb7bc (patch) | |
| tree | 107502a111d5b73d1be176a6a6d29ddd2ee48ede /data | |
| parent | ff0c3b81df719c0ddcf6a3e435d393b8f193e5ec (diff) | |
| parent | 042be39ccabb43a766e04a447207610ff017bd7d (diff) | |
| download | vyos-1x-ac9f5b19604b5cbe45fcb76baae98eaa81adb7bc.tar.gz vyos-1x-ac9f5b19604b5cbe45fcb76baae98eaa81adb7bc.zip | |
Merge pull request #4061 from c-po/syslog-T5367
syslog: T5367: add format option to include timezone in message
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/rsyslog/rsyslog.conf.j2 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2 index 97e0ee0b7..effc2ea14 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -54,12 +54,10 @@ $outchannel {{ file_name }},/var/log/user/{{ file_name }},{{ file_options.archiv {% endif %} {% if host_options.protocol is vyos_defined('tcp') %} {% if host_options.format.octet_counted is vyos_defined %} -{{ tmp | join(';') }} @@(o){{ host_name | bracketize_ipv6 }}:{{ host_options.port }};RSYSLOG_SyslogProtocol23Format -{% else %} -{{ tmp | join(';') }} @@{{ host_name | bracketize_ipv6 }}:{{ host_options.port }} +{{ tmp | join(';') }} @@{{ '(o)' if host_options.format.octet_counted is vyos_defined }}{{ host_name | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.format.include_timezone is vyos_defined }} {% endif %} {% else %} -{{ tmp | join(';') }} @{{ host_name | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.format.octet_counted is vyos_defined }} +{{ tmp | join(';') }} @{{ host_name | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.format.include_timezone is vyos_defined }} {% endif %} {% endfor %} {% endif %} |