[rsyslog] Suppress duplicate messages from base image and all Docker containers (#2497)

jleveque · lguohan · commit 8f43cad06123 · 2019-01-29T03:41:40.000-08:00
diff --git a/dockers/docker-base/etc/rsyslog.conf b/dockers/docker-base/etc/rsyslog.conf
@@ -63,6 +63,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

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ $WorkDirectory /var/spool/rsyslog`
`63`	`63`	`#`
`64`	`64`	`$IncludeConfig /etc/rsyslog.d/*.conf`
`65`	`65`
	`66`	`+#`
	`67`	`+# Suppress duplicate messages and report "message repeated n times"`
	`68`	`+#`
	`69`	`+$RepeatedMsgReduction on`
`66`	`70`
`67`	`71`	`###############`
`68`	`72`	`#### RULES ####`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ $WorkDirectory /var/spool/rsyslog`
`64`	`64`	`#`
`65`	`65`	`$IncludeConfig /etc/rsyslog.d/*.conf`
`66`	`66`
	`67`	`+#`
	`68`	`+# Suppress duplicate messages and report "message repeated n times"`
	`69`	`+#`
	`70`	`+$RepeatedMsgReduction on`
`67`	`71`
`68`	`72`	`###############`
`69`	`73`	`#### RULES ####`