From e906f59f2e89cb5d34bbdfa2ae12a200fb4f93f3 Mon Sep 17 00:00:00 2001
From: Ben Woods <git@ben.woods.am>
Date: Fri, 21 Mar 2025 19:01:30 +0800
Subject: syslog: T7270: fix octed-counted typo in rsyslog.conf

---
 data/templates/rsyslog/rsyslog.conf.j2      | 2 +-
 smoketest/scripts/cli/test_system_syslog.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2
index 68e34f3f8..bf1f76ee4 100644
--- a/data/templates/rsyslog/rsyslog.conf.j2
+++ b/data/templates/rsyslog/rsyslog.conf.j2
@@ -105,7 +105,7 @@ if prifilt("{{ tmp | join(',') }}") then {
 {%             if remote_options.format.include_timezone is vyos_defined %}
         template="SyslogProtocol23Format"
 {%             endif %}
-        TCP_Framing="{{ 'octed-counted' if remote_options.format.octet_counted is vyos_defined else 'traditional' }}"
+        TCP_Framing="{{ 'octet-counted' if remote_options.format.octet_counted is vyos_defined else 'traditional' }}"
 {%             if remote_options.source_address is vyos_defined %}
         Address="{{ remote_options.source_address }}"
 {%             endif %}
diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py
index ba325ced8..e2cf1cab8 100755
--- a/smoketest/scripts/cli/test_system_syslog.py
+++ b/smoketest/scripts/cli/test_system_syslog.py
@@ -226,7 +226,7 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase):
                     self.assertIn( '        template="SyslogProtocol23Format"', config)
 
                 if 'octet-counted' in remote_options['format']:
-                    self.assertIn( '        TCP_Framing="octed-counted"', config)
+                    self.assertIn( '        TCP_Framing="octet-counted"', config)
                 else:
                     self.assertIn( '        TCP_Framing="traditional"', config)
 
-- 
cgit v1.2.3


From 39f5da93e538c8a8666d9efcdf702ac4151da319 Mon Sep 17 00:00:00 2001
From: Ben Woods <git@ben.woods.am>
Date: Fri, 21 Mar 2025 19:41:18 +0800
Subject: syslog: T7270: fix SyslogProtocol23Format typo in rsyslog.conf

---
 data/templates/rsyslog/rsyslog.conf.j2      | 2 +-
 smoketest/scripts/cli/test_system_syslog.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2
index bf1f76ee4..a67e596fc 100644
--- a/data/templates/rsyslog/rsyslog.conf.j2
+++ b/data/templates/rsyslog/rsyslog.conf.j2
@@ -103,7 +103,7 @@ if prifilt("{{ tmp | join(',') }}") then {
         port="{{ remote_options.port }}"
         protocol="{{ remote_options.protocol }}"
 {%             if remote_options.format.include_timezone is vyos_defined %}
-        template="SyslogProtocol23Format"
+        template="RSYSLOG_SyslogProtocol23Format"
 {%             endif %}
         TCP_Framing="{{ 'octet-counted' if remote_options.format.octet_counted is vyos_defined else 'traditional' }}"
 {%             if remote_options.source_address is vyos_defined %}
diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py
index e2cf1cab8..6eae3f19d 100755
--- a/smoketest/scripts/cli/test_system_syslog.py
+++ b/smoketest/scripts/cli/test_system_syslog.py
@@ -223,7 +223,7 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase):
 
             if 'format' in remote_options:
                 if 'include-timezone' in remote_options['format']:
-                    self.assertIn( '        template="SyslogProtocol23Format"', config)
+                    self.assertIn( '        template="RSYSLOG_SyslogProtocol23Format"', config)
 
                 if 'octet-counted' in remote_options['format']:
                     self.assertIn( '        TCP_Framing="octet-counted"', config)
-- 
cgit v1.2.3


From e669a53dadc0f319b2e089337330b59a8cb23457 Mon Sep 17 00:00:00 2001
From: Ben Woods <git@ben.woods.am>
Date: Tue, 25 Mar 2025 17:23:13 +0800
Subject: syslog: T7270: improve descriptions of format options

---
 interface-definitions/system_syslog.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface-definitions/system_syslog.xml.in b/interface-definitions/system_syslog.xml.in
index 8b2d9cab7..116cbde73 100644
--- a/interface-definitions/system_syslog.xml.in
+++ b/interface-definitions/system_syslog.xml.in
@@ -46,13 +46,13 @@
                 <children>
                   <leafNode name="octet-counted">
                     <properties>
-                      <help>Allows for the transmission of all characters inside a syslog message</help>
+                      <help>Allows for the transmission of multi-line messages (TCP only)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="include-timezone">
                     <properties>
-                      <help>Include system timezone in syslog message</help>
+                      <help>Use RFC 5424 format (with RFC 3339 timestamp and timezone)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
-- 
cgit v1.2.3