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

Fix issue: rsyslog rate limit does not work on version 8.2110.0 (#11588)

Browse Source 
#### Why I did it

The default stable version of rsyslog on bullseye has a bug about rate limit. It causes rate limit not work. The bug has been fixed on backport version 8.2206.0-1~bpo11+1.

Buster has no such issue.

#### How I did it

Upgrade rsyslog from 8.2110.0 to 8.2206.0-1~bpo11+1

#### How to verify it

Manual test
This commit is contained in:
Junchao-Mellanox 2022-08-05 06:10:34 +08:00 committed by GitHub
parent 16eaece11d
commit 736c739bf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_debian.sh
View File

@ -331,7 +331,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
sysfsutils \ sysfsutils \
squashfs-tools \ squashfs-tools \
grub2-common \ grub2-common \
rsyslog \
screen \ screen \
hping3 \ hping3 \
tcptraceroute \ tcptraceroute \
@ -356,6 +355,10 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
jq \ jq \
auditd auditd
# default rsyslog version is 8.2110.0 which has a bug on log rate limit,
# use backport version
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -t bullseye-backports -y install rsyslog
# Have systemd create the auditd log directory # Have systemd create the auditd log directory
sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
sudo tee ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d/log-directory.conf >/dev/null <<EOF sudo tee ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d/log-directory.conf >/dev/null <<EOF

5
dockers/docker-base-bullseye/Dockerfile.j2
View File

@ -48,7 +48,6 @@ RUN apt-get update && \
python3 \ python3 \
python3-distutils \ python3-distutils \
python3-pip \ python3-pip \
rsyslog \
vim-tiny \ vim-tiny \
# Install redis-tools # Install redis-tools
redis-tools \ redis-tools \
@ -65,6 +64,10 @@ RUN apt-get update && \
libzmq5 \ libzmq5 \
libwrap0 libwrap0
# default rsyslog version is 8.2110.0 which has a bug on log rate limit,
# use backport version 8.2206.0-1~bpo11+1
RUN apt-get -t bullseye-backports -y install rsyslog
# Upgrade pip via PyPI and uninstall the Debian version # Upgrade pip via PyPI and uninstall the Debian version
RUN pip3 install --upgrade pip RUN pip3 install --upgrade pip
RUN apt-get purge -y python3-pip RUN apt-get purge -y python3-pip