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

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

Browse Source
This commit is contained in:
Joe LeVeque 2019-01-29 03:41:40 -08:00 committed by lguohan
parent d1b72fdd28
commit 8f43cad061
4 changed files with 8 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,10 @@ $WorkDirectory /var/spool/rsyslog
# #
$IncludeConfig /etc/rsyslog.d/*.conf $IncludeConfig /etc/rsyslog.d/*.conf
#
# Suppress duplicate messages and report "message repeated n times"
#
$RepeatedMsgReduction on
############### ###############
#### RULES #### #### RULES ####

4
files/image_config/rsyslog/rsyslog.conf.j2
View File

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

1
platform/p4/docker-sonic-p4/Dockerfile.j2
View File

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

69
platform/p4/docker-sonic-p4/rsyslog.conf
View File

@ -1,69 +0,0 @@
###############################################################################
# Managed by Ansible
# file: ansible/roles/acs/templates/rsyslog.conf.j2
###############################################################################
#
# /etc/rsyslog.conf Configuration file for rsyslog.
#
# For more information see
# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
#################
#### MODULES ####
#################
$ModLoad imuxsock # provides support for local system logging
#$ModLoad imklog # provides kernel logging support
#$ModLoad immark # provides --MARK-- message capability
# provides UDP syslog reception
#$ModLoad imudp
#$UDPServerRun 514
# provides TCP syslog reception
#$ModLoad imtcp
#$InputTCPServerRun 514
###########################
#### GLOBAL DIRECTIVES ####
###########################
#Set remote syslog server
#*.* @172.17.0.1:514
#Set local syslog
*.* /var/log/messages
#
# Use traditional timestamp format.
# To enable high precision timestamps, comment out the following line.
#
#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
# Define a custom template
$template SONiCFileFormat,"%TIMESTAMP%.%timestamp:::date-subseconds% %HOSTNAME% %syslogseverity-text:::uppercase% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
$ActionFileDefaultTemplate SONiCFileFormat
#
# Set the default permissions for all log files.
#
$FileOwner root
$FileGroup adm
$FileCreateMode 0640
$DirCreateMode 0755
$Umask 0022
#
# Where to place spool and state files
#
$WorkDirectory /var/spool/rsyslog
#
# Include all config files in /etc/rsyslog.d/
#
$IncludeConfig /etc/rsyslog.d/*.conf
###############
#### RULES ####
###############