diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-09-30 17:23:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-30 17:23:22 +0200 |
| commit | 69517137cf56516f270e8db46c9fcfc61a96c74a (patch) | |
| tree | 0279c95341f505c1b271fa40c384367b30320133 /src | |
| parent | 679c67e53cda6189e8add0d39988304935162071 (diff) | |
| parent | 1621d841aced7bdc295a572a412613be1ec404c0 (diff) | |
| download | vyos-1x-69517137cf56516f270e8db46c9fcfc61a96c74a.tar.gz vyos-1x-69517137cf56516f270e8db46c9fcfc61a96c74a.zip | |
Merge pull request #4114 from vyos/mergify/bp/sagitta/pr-4061
syslog: T5367: add format option to include timezone in message (backport #4061)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/system_syslog.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/conf_mode/system_syslog.py b/src/conf_mode/system_syslog.py index 476f403bd..eb2f02eb3 100755 --- a/src/conf_mode/system_syslog.py +++ b/src/conf_mode/system_syslog.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2023 VyOS maintainers and contributors +# Copyright (C) 2018-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -18,6 +18,7 @@ import os from sys import exit +from vyos.base import Warning from vyos.config import Config from vyos.configdict import is_node_changed from vyos.configverify import verify_vrf @@ -69,6 +70,12 @@ def verify(syslog): if not syslog: return None + if 'host' in syslog: + for host, host_options in syslog['host'].items(): + if 'protocol' in host_options and host_options['protocol'] == 'udp': + if 'format' in host_options and 'octet_counted' in host_options['format']: + Warning(f'Syslog UDP transport for "{host}" should not use octet-counted format!') + verify_vrf(syslog) def generate(syslog): |