diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-09-12 21:32:03 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-09-30 14:58:41 +0000 |
| commit | 9a7d920ab7a9542fc3f3a4cddf50e6413a3c0198 (patch) | |
| tree | 44f9523cc6889faf90f8fb5a5408dae7efbf4dea /data/templates/rsyslog | |
| parent | 4d63611ea56389b8344efb97251a79c2d41bd565 (diff) | |
| download | vyos-1x-9a7d920ab7a9542fc3f3a4cddf50e6413a3c0198.tar.gz vyos-1x-9a7d920ab7a9542fc3f3a4cddf50e6413a3c0198.zip | |
syslog: T5367: add format option to include timezone in message
Add CLI option to include the systems timezone in the syslog message sent to
a collector. This can be enabled using:
set system syslog host <hostname> format include-timezone
(cherry picked from commit 042be39ccabb43a766e04a447207610ff017bd7d)
Diffstat (limited to 'data/templates/rsyslog')
| -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 0141812ac..7fd592d1f 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -58,12 +58,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 %} |