Skip to content

[containercfgd] Add multi ASIC support for syslog rate limit feature #18438

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
liat-grozovik merged 2 commits into from
Apr 15, 2024
Merged

[containercfgd] Add multi ASIC support for syslog rate limit feature #18438

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc29dd9
Add multi ASIC support for syslog rate limit feature
Junchao-Mellanox Mar 21, 2024
13442b6
Fix issue: use service name as key instead of container name
Junchao-Mellanox Apr 9, 2024
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
13 changes: 10 additions & 3 deletions src/sonic-containercfgd/containercfgd/containercfgd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

# Container name
container_name = None
service_name = None


def run_command(command):
Expand Down Expand Up @@ -117,7 +118,7 @@ def handle_config(self, table, key, data):
data (dict): Data of the entry: {<field_name>: <field_value>}
"""
try:
if key != container_name:
if key != service_name:
return
self.update_syslog_config(data)
except Exception as e:
Expand All @@ -130,8 +131,8 @@ def handle_init_data(self, init_data):
init_data (dict): Initial data when first time connecting to CONFIG DB. {<table_name>: {<field_name>: <field_value>}}
"""
if SYSLOG_CONFIG_FEATURE_TABLE in init_data:
if container_name in init_data[SYSLOG_CONFIG_FEATURE_TABLE]:
self.update_syslog_config(init_data[SYSLOG_CONFIG_FEATURE_TABLE][container_name])
if service_name in init_data[SYSLOG_CONFIG_FEATURE_TABLE]:
self.update_syslog_config(init_data[SYSLOG_CONFIG_FEATURE_TABLE][service_name])

def update_syslog_config(self, data):
"""Parse existing syslog conf and apply new syslog conf.
Expand Down Expand Up @@ -185,7 +186,13 @@ def parse_syslog_conf(self):

def main():
global container_name
global service_name
namespace_id = os.environ['NAMESPACE_ID']
container_name = os.environ['CONTAINER_NAME']
if not namespace_id:
service_name = container_name
else:
service_name = container_name.rstrip(namespace_id)
daemon = ContainerConfigDaemon()
daemon.run()

Expand Down
1 change: 1 addition & 0 deletions src/sonic-containercfgd/tests/test_syslog_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from containercfgd import containercfgd

containercfgd.container_name = 'swss'
containercfgd.service_name = 'swss'


def test_handle_config():
Expand Down