matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[docker-base]: Rate limit priority INFO and lower in syslog (#5666)

Browse Source 
There is currently a bug where messages from swss with priority lower than the current log level are still being counted against the syslog rate limiting threshhold. This leads to rate-limiting in syslog when the rate-limiting conditions have not been met, which causes several sonic-mgmt tests to fail since they are dependent on LogAnalyzer. It also omits potentially useful information from the syslog. Only rate-limiting messages of level INFO and lower allows these tests to pass successfully.

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
This commit is contained in:
Lawrence Lee 2020-10-20 11:52:46 -07:00 committed by GitHub
parent 38bd6be609
commit 207587d97c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dockers/docker-base-buster/etc/rsyslog.conf
View File

@ -12,10 +12,11 @@
$ModLoad imuxsock # provides support for local system logging $ModLoad imuxsock # provides support for local system logging
# #
# Set a rate limit on messages from the container # Set a rate limit on messages from the container of priority INFO or lower (level 6 and above)
# #
$SystemLogRateLimitInterval 300 $SystemLogRateLimitInterval 300
$SystemLogRateLimitBurst 20000 $SystemLogRateLimitBurst 20000
$SystemLogRateLimitSeverity 6
#$ModLoad imklog # provides kernel logging support #$ModLoad imklog # provides kernel logging support
#$ModLoad immark # provides --MARK-- message capability #$ModLoad immark # provides --MARK-- message capability

3
dockers/docker-base-stretch/etc/rsyslog.conf
View File

@ -12,10 +12,11 @@
$ModLoad imuxsock # provides support for local system logging $ModLoad imuxsock # provides support for local system logging
# #
# Set a rate limit on messages from the container # Set a rate limit on messages from the container of priority INFO or lower (level 6 and above)
# #
$SystemLogRateLimitInterval 300 $SystemLogRateLimitInterval 300
$SystemLogRateLimitBurst 20000 $SystemLogRateLimitBurst 20000
$SystemLogRateLimitSeverity 6
#$ModLoad imklog # provides kernel logging support #$ModLoad imklog # provides kernel logging support
#$ModLoad immark # provides --MARK-- message capability #$ModLoad immark # provides --MARK-- message capability

3
dockers/docker-base/etc/rsyslog.conf
View File

@ -16,10 +16,11 @@
$ModLoad imuxsock # provides support for local system logging $ModLoad imuxsock # provides support for local system logging
# #
# Set a rate limit on messages from the container # Set a rate limit on messages from the container of priority INFO or lower (level 6 and above)
# #
$SystemLogRateLimitInterval 300 $SystemLogRateLimitInterval 300
$SystemLogRateLimitBurst 20000 $SystemLogRateLimitBurst 20000
$SystemLogRateLimitSeverity 6
#$ModLoad imklog # provides kernel logging support #$ModLoad imklog # provides kernel logging support
#$ModLoad immark # provides --MARK-- message capability #$ModLoad immark # provides --MARK-- message capability

3
files/image_config/rsyslog/rsyslog-container.conf.j2
View File

@ -12,10 +12,11 @@
$ModLoad imuxsock # provides support for local system logging $ModLoad imuxsock # provides support for local system logging
# #
# Set a rate limit on messages from the container # Set a rate limit on messages from the container of priority INFO or lower (level 6 and above)
# #
$SystemLogRateLimitInterval 300 $SystemLogRateLimitInterval 300
$SystemLogRateLimitBurst 20000 $SystemLogRateLimitBurst 20000
$SystemLogRateLimitSeverity 6
#$ModLoad imklog # provides kernel logging support #$ModLoad imklog # provides kernel logging support
#$ModLoad immark # provides --MARK-- message capability #$ModLoad immark # provides --MARK-- message capability