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 /src/conf_mode | |
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 'src/conf_mode')
-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 07fbb0734..2497c5bb6 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 @@ -58,6 +59,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): |