Skip to content

Commit e631f42

Browse files
Junchao-MellanoxJunchao-Mellanox
authored
[infra] Support syslog rate limit configuration (sonic-net#12490) (sonic-net#13535)
Backport of sonic-net#12490 into 202211 - Why I did it Support syslog rate limit configuration feature - How I did it Remove unused rsyslog.conf from containers Modify docker startup script to generate rsyslog.conf from template files Add metadata/init data for syslog rate limit configuration - How to verify it Manual test New sonic-mgmt regression cases
1 parent e50123b commit e631f42

File tree

47 files changed

+41
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+41
-283
lines changed

‎dockers/docker-base-buster/etc/rsyslog.conf

-76
This file was deleted.

‎dockers/docker-base-stretch/etc/rsyslog.conf

-76
This file was deleted.

‎dockers/docker-base/etc/rsyslog.conf

-80
This file was deleted.

‎dockers/docker-database/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
# Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-dhcp-relay/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version
6-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
76

87
# Make apt-get non-interactive
98
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-fpm-frr/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ARG docker_container_name
55
ARG frr_user_uid
66
ARG frr_user_gid
77

8-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
98

109
# Make apt-get non-interactive
1110
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-iccpd/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
## Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-lldp/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version
6-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
76

87
# Make apt-get non-interactive
98
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-macsec/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
## Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-mux/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
## Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-nat/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
RUN echo
87

‎dockers/docker-orchagent/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
# Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-pde/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33
ARG docker_container_name
44
ENV PYTHONPATH=/usr/share/sonic/platform
55

6-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
76

87
# Make apt-get non-interactive
98
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-platform-monitor/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version
6-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
76

87
# Make apt-get non-interactive
98
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-sflow/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
## Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-snmp/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version
6-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
76

87
# Enable -O for all Python calls
98
ENV PYTHONOPTIMIZE 1

‎dockers/docker-sonic-mgmt-framework/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
22

33
ARG docker_container_name
4-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
54

65
## Make apt-get non-interactive
76
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-sonic-restapi/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
## Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-sonic-telemetry/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55
ARG image_version
6-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
76

87
## Make apt-get non-interactive
98
ENV DEBIAN_FRONTEND=noninteractive

‎dockers/docker-teamd/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
5-
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
65

76
## Make apt-get non-interactive
87
ENV DEBIAN_FRONTEND=noninteractive

‎files/build_templates/init_cfg.json.j2

+15
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
"has_per_asic_scope": {% if feature + '@.service' in installer_services.split(' ') %}"True"{% else %}"False"{% endif %},
6868
{%- endif %}
6969
"auto_restart": "{{autorestart}}",
70+
"support_syslog_rate_limit" : "true",
7071
{# Set check_up_status to true here when app readiness will be marked in state db #}
7172
{# For now, to support the infrastrucure, setting the check_up_status to false for bgp,swss,pmon #}
7273
{# Once apps like bgp,synd supports app readiness, then bgp,syncd can set check_up_status to true #}
@@ -103,6 +104,20 @@
103104
"rate_limit_interval" : "600",
104105
"available_mem_threshold": "10.0"
105106
}{%if not loop.last %},{% endif -%}
107+
{% endfor %}
108+
},
109+
"SYSLOG_CONFIG": {
110+
"GLOBAL": {
111+
"rate_limit_interval" : "0",
112+
"rate_limit_burst" : "0"
113+
}
114+
},
115+
"SYSLOG_CONFIG_FEATURE": {
116+
{%- for feature, _, _, _ in features %}
117+
"{{feature}}": {
118+
"rate_limit_interval" : "300",
119+
"rate_limit_burst": "20000"
120+
}{%if not loop.last %},{% endif -%}
106121
{% endfor %}
107122
},
108123
"PASSW_HARDENING": {

0 commit comments

Comments
 (0)