Revert "[docker-base]: Rate limit priority INFO and lower in syslog" (#…

…5763) * This was a temporary fix for orchagent spamming log messages and causing rate limiting, leading to critical messages being dropped for the syslog. No longer needed since sonic-net/sonic-sairedis#680 was merged.
sonic-net · Nov 2, 2020 · 10ab46f · 10ab46f
1 parent 1be9c4a
commit 10ab46f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/dockers/docker-base-buster/etc/rsyslog.conf b/dockers/docker-base-buster/etc/rsyslog.conf
@@ -12,11 +12,10 @@
 $ModLoad imuxsock # provides support for local system logging
 
 #
-# Set a rate limit on messages from the container of priority INFO or lower (level 6 and above)
+# Set a rate limit on messages from the container
 #
 $SystemLogRateLimitInterval 300
 $SystemLogRateLimitBurst 20000
-$SystemLogRateLimitSeverity 6
 
 #$ModLoad imklog  # provides kernel logging support
 #$ModLoad immark  # provides --MARK-- message capability

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

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

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