diff options
author | hagbard <vyosdev@derith.de> | 2019-12-04 08:24:16 -0800 |
---|---|---|
committer | hagbard <vyosdev@derith.de> | 2019-12-04 15:36:12 -0800 |
commit | a93a1dbd7d18ff82246b4f7fb9a3757c14e6a9c7 (patch) | |
tree | 1af4bff652079a7d1c35ff0b76735829f24b7d30 /interface-definitions | |
parent | aceb4d7e187a571019e4bc24cd23efc7c2f624fe (diff) | |
download | vyos-1x-a93a1dbd7d18ff82246b4f7fb9a3757c14e6a9c7.tar.gz vyos-1x-a93a1dbd7d18ff82246b4f7fb9a3757c14e6a9c7.zip |
syslog: T1845: syslog host no longer accepts a port
- renamed interface xml
- renamed syslog.py to system-syslog.py
- moved protocol out of the facility node (bug)
- node port created
- migration script included
Diffstat (limited to 'interface-definitions')
-rw-r--r-- | interface-definitions/system-syslog.xml (renamed from interface-definitions/syslog.xml) | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/interface-definitions/syslog.xml b/interface-definitions/system-syslog.xml index d5ea4511e..504efd8fd 100644 --- a/interface-definitions/syslog.xml +++ b/interface-definitions/system-syslog.xml @@ -2,7 +2,7 @@ <interfaceDefinition> <node name="system"> <children> - <node name="syslog" owner="${vyos_conf_scripts_dir}/syslog.py"> + <node name="syslog" owner="${vyos_conf_scripts_dir}/system-syslog.py"> <properties> <help>System logging</help> <priority>400</priority> @@ -191,6 +191,39 @@ </valueHelp> </properties> <children> + <leafNode name="protocol"> + <properties> + <help>Syslog communication protocol</help> + <valueHelp> + <format>udp</format> + <description>Send log messages to remote syslog server over udp</description> + </valueHelp> + <valueHelp> + <format>tcp</format> + <description>Send log messages to remote syslog server over tcp</description> + </valueHelp> + <completionHelp> + <list>udp tcp</list> + </completionHelp> + <constraint> + <regex>(udp|tcp)</regex> + </constraint> + <constraintErrorMessage>Invalid protocol name</constraintErrorMessage> + </properties> + </leafNode> + <leafNode name="port"> + <properties> + <help>Destination port</help> + <valueHelp> + <format>1-65535</format> + <description>Protocol destination port</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + <constraintErrorMessage>Invalid destination port</constraintErrorMessage> + </properties> + </leafNode> <tagNode name="facility"> <properties> <help>Facility for logging</help> @@ -295,26 +328,6 @@ </valueHelp> </properties> <children> - <leafNode name="protocol"> - <properties> - <help>syslog communication protocol</help> - <valueHelp> - <format>udp</format> - <description>send log messages to remote syslog server over udp</description> - </valueHelp> - <valueHelp> - <format>tcp</format> - <description>send log messages to remote syslog server over tcp</description> - </valueHelp> - <completionHelp> - <list>udp tcp</list> - </completionHelp> - <constraint> - <regex>(udp|tcp)</regex> - </constraint> - <constraintErrorMessage>invalid protocol name</constraintErrorMessage> - </properties> - </leafNode> <leafNode name="level"> <properties> <help>Logging level</help> |