[rsyslog] Suppress duplicate messages from base image and all Docker …

…containers (#2497)
sonic-net · Apr 2, 2020 · cbf7c7d · cbf7c7d
1 parent a4dd0aa
commit cbf7c7d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 77 deletions.
diff --git a/dockers/docker-base/etc/rsyslog.conf b/dockers/docker-base/etc/rsyslog.conf
@@ -70,6 +70,10 @@ $WorkDirectory /var/spool/rsyslog
 #
 $IncludeConfig /etc/rsyslog.d/*.conf
 
+#
+# Suppress duplicate messages and report "message repeated n times"
+#
+$RepeatedMsgReduction on
 
 ###############
 #### RULES ####

diff --git a/files/image_config/rsyslog/rsyslog.conf.j2 b/files/image_config/rsyslog/rsyslog.conf.j2
@@ -64,6 +64,10 @@ $WorkDirectory /var/spool/rsyslog
 #
 $IncludeConfig /etc/rsyslog.d/*.conf
 
+#
+# Suppress duplicate messages and report "message repeated n times"
+#
+$RepeatedMsgReduction on
 
 ###############
 #### RULES ####

diff --git a/platform/p4/docker-sonic-p4/Dockerfile.j2 b/platform/p4/docker-sonic-p4/Dockerfile.j2
@@ -71,7 +71,6 @@ RUN sed -ri 's/^(save .*$)/# \1/g;
             ' /etc/redis/redis.conf
 
 ADD port_config.ini /port_config.ini
-ADD rsyslog.conf /etc/rsyslog.conf
 COPY ["start.sh", "orchagent.sh", "config_bm.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/configdb-load.sh", "/usr/bin/"]

diff --git a/platform/p4/docker-sonic-p4/rsyslog.conf b/platform/p4/docker-sonic-p4/rsyslog.conf