Skip to content

Monitor rsyslog feature flag change and update rsyslog config by restart rsyslog-config service #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 5 commits into from
Apr 29, 2025
Merged

Monitor rsyslog feature flag change and update rsyslog config by restart rsyslog-config service #245

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c820cc
Monitor rsyslog feature flag change
liuh-80 Apr 22, 2025
89c330a
Update hostcfgd_test.py
liuh-80 Apr 22, 2025
54ec947
Update hostcfgd_test.py
liuh-80 Apr 22, 2025
c163f7b
Update hostcfgd
liuh-80 Apr 23, 2025
ba0d094
Update hostcfgd_test.py
liuh-80 Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions scripts/hostcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,27 @@ class DeviceMetaCfg(object):
syslog.syslog(syslog.LOG_INFO, 'DeviceMetaCfg: Restart rsyslog after '
'changing timezone')

def rsyslog_config(self, data):
"""
Apply syslog_with_osversion feature flag.
Run the following command in Linux: sudo systemctl restart rsyslog-config
Args:
data: Read table's key's data.
"""
syslog_with_osversion = data.get('syslog_with_osversion')
syslog.syslog(syslog.LOG_DEBUG,
f'DeviceMetaCfg: syslog with os version: {syslog_with_osversion}')

if syslog_with_osversion is None:
Copy link
Copy Markdown
Contributor

@qiluo-msft qiluo-msft Apr 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

syslog_with_osversion

Should we check the new config with current running config, if only changed, restart service ? #Closed

Copy link
Copy Markdown
Contributor Author

@liuh-80 liuh-80 Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

syslog.syslog(syslog.LOG_DEBUG,
f'DeviceMetaCfg: syslog with os version feature disabled')
return

run_cmd(['systemctl', 'restart', 'rsyslog-config'], True, False)
syslog.syslog(syslog.LOG_INFO, 'DeviceMetaCfg: Restart rsyslog-config after '
'feature flag change to {}'.format(syslog_with_osversion))


class MgmtIfaceCfg(object):
"""
MgmtIfaceCfg Config Daemon
Expand Down Expand Up @@ -2281,6 +2302,7 @@ class HostConfigDaemon:
syslog.syslog(syslog.LOG_INFO, 'DeviceMeta handler...')
self.devmetacfg.hostname_update(data)
self.devmetacfg.timezone_update(data)
self.devmetacfg.rsyslog_config(data)

def rsyslog_handler(self):
rsyslog_config = self.config_db.get_table(
Expand Down
16 changes: 16 additions & 0 deletions tests/hostcfgd/hostcfgd_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def test_devicemeta_event(self):
Test handling DEVICE_METADATA events.
1) Hostname reload
1) Timezone reload
1) syslog_with_osversion flag change
"""
MockConfigDb.set_config_db(HOSTCFG_DAEMON_CFG_DB)
MockConfigDb.event_queue = [(swsscommon.CFG_DEVICE_METADATA_TABLE_NAME,
Expand Down Expand Up @@ -306,6 +307,21 @@ def test_devicemeta_event(self):
]
mocked_syslog.syslog.assert_has_calls(expected)

HOSTCFG_DAEMON_CFG_DB["DEVICE_METADATA"]["localhost"]["syslog_with_osversion"] = 'true'
MockConfigDb.set_config_db(HOSTCFG_DAEMON_CFG_DB)
with mock.patch('hostcfgd.syslog') as mocked_syslog:
with mock.patch('hostcfgd.subprocess') as mocked_subprocess:
mocked_syslog.LOG_INFO = original_syslog.LOG_INFO
try:
daemon.start()
except TimeoutError:
pass

expected = [
call(original_syslog.LOG_INFO, 'DeviceMetaCfg: Restart rsyslog-config after feature flag change to true')
]
mocked_syslog.syslog.assert_has_calls(expected)

def test_mgmtiface_event(self):
"""
Test handling mgmt events.
Expand Down
Loading