Skip to content

Commit

Permalink
[rsyslog] Suppress duplicate messages from base image and all Docker …
Browse files Browse the repository at this point in the history
…containers (#2497)
  • Loading branch information
jleveque authored and lguohan committed Jan 29, 2019
1 parent d1b72fd commit 8f43cad
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 70 deletions.
4 changes: 4 additions & 0 deletions dockers/docker-base/etc/rsyslog.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 ####
Expand Down
4 changes: 4 additions & 0 deletions files/image_config/rsyslog/rsyslog.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 ####
Expand Down
1 change: 0 additions & 1 deletion platform/p4/docker-sonic-p4/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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/"]
Expand Down
69 changes: 0 additions & 69 deletions platform/p4/docker-sonic-p4/rsyslog.conf

This file was deleted.

0 comments on commit 8f43cad

Please sign in to comment.