Merge pull request #4098 from vyos/mergify/bp/sagitta/pr-4079

syslog: T6719: fix the behavior of "syslog global preserve-fqdn" (backport #4079)

1 files changed, 30 insertions, 3 deletions

diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py
index 45a5b4087..c802ceeeb 100755
--- a/smoketest/scripts/cli/test_system_syslog.py
+++ b/smoketest/scripts/cli/test_system_syslog.py
@@ -20,6 +20,7 @@ import unittest
 from base_vyostest_shim import VyOSUnitTestSHIM
 
 from vyos.utils.file import read_file
+from vyos.utils.process import cmd
 from vyos.utils.process import process_named_running
 
 PROCESS_NAME = 'rsyslogd'
@@ -61,19 +62,45 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase):
         self.cli_set(base_path + ['host', host2, 'facility', 'kern', 'level', 'err'])
         self.cli_set(base_path + ['console', 'facility', 'all', 'level', 'warning'])
 
-
         self.cli_commit()
         # verify log level and facilities in config file
         # *.warning /dev/console
         # *.* @198.51.100.1:999
         # kern.err @192.0.2.1:514
-        config = [get_config_value('\*.\*'), get_config_value('kern.err'), get_config_value('\*.warning')]
+        config = [
+            get_config_value('\*.\*'),
+            get_config_value('kern.err'),
+            get_config_value('\*.warning'),
+        ]
         expected = [f'@{host1}:999', f'@{host2}:514', '/dev/console']
 
-        for i in range(0,3):
+        for i in range(0, 3):
             self.assertIn(expected[i], config[i])
         # Check for running process
         self.assertTrue(process_named_running(PROCESS_NAME))
 
+    def test_syslog_global(self):
+        self.cli_set(['system', 'host-name', 'vyos'])
+        self.cli_set(['system', 'domain-name', 'example.local'])
+        self.cli_set(base_path + ['global', 'marker', 'interval', '600'])
+        self.cli_set(base_path + ['global', 'preserve-fqdn'])
+        self.cli_set(base_path + ['global', 'facility', 'kern', 'level', 'err'])
+
+        self.cli_commit()
+
+        config = cmd(f'sudo cat {RSYSLOG_CONF}')
+        expected = [
+            '$MarkMessagePeriod 600',
+            '$PreserveFQDN on',
+            'kern.err',
+            '$LocalHostName vyos.example.local',
+        ]
+
+        for e in expected:
+            self.assertIn(e, config)
+        # Check for running process
+        self.assertTrue(process_named_running(PROCESS_NAME))
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)