[System logs]: Dynamically calculate file rotation thresholds based on /var/log/ partition size

files/build_templates/sonic_debian_extension.j2

@@ -105,8 +105,13 @@ sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog-config.sh $FILESYSTEM_ROOT/usr/bin/
 sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog.conf.j2 $FILESYSTEM_ROOT/usr/share/sonic/templates/
 sudo cp $IMAGE_CONFIGS/rsyslog/rsyslog.d/* $FILESYSTEM_ROOT/etc/rsyslog.d/
 
-# Copy logrotate.d configuration files
-sudo cp -f $IMAGE_CONFIGS/logrotate.d/rsyslog $FILESYSTEM_ROOT/etc/logrotate.d/
+# Copy logrotate configuration files and templates
+sudo cp $IMAGE_CONFIGS/logrotate/logrotate-config.service  $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable logrotate-config.service
+sudo cp $IMAGE_CONFIGS/logrotate/logrotate-config.sh $FILESYSTEM_ROOT/usr/bin/
+sudo cp $IMAGE_CONFIGS/logrotate/logrotate.conf $FILESYSTEM_ROOT/etc/
+sudo mkdir -p $FILESYSTEM_ROOT/usr/share/sonic/templates/logrotate.d/
+sudo cp $IMAGE_CONFIGS/logrotate/rsyslog.j2 $FILESYSTEM_ROOT/usr/share/sonic/templates/logrotate.d/
 
 # Copy systemd-journald configuration files
 sudo cp -f $IMAGE_CONFIGS/systemd/journald.conf $FILESYSTEM_ROOT/etc/systemd/

files/image_config/cron.d/logrotate

@@ -1,2 +1,2 @@
 # Attempt to rotate system logs once per minute
-* * * * * root /usr/sbin/logrotate /etc/logrotate.d/rsyslog
+* * * * * root /usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1

files/image_config/logrotate/logrotate-config.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Update logrotate configuration
+After=basic.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/logrotate-config.sh
+
+[Install]
+WantedBy=multi-user.target

files/image_config/logrotate/logrotate-config.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Reserve space for btmp and wtmp, auth.log and cron.log, as well as logs that
+# should be disabled, just in case they get created and rotated
+RESERVED_SPACE_KB=1024
+
+# Number of rotated archive files to keep per log file
+NUM_ARCHIVES_PER_LOG_FILE=7
+
+# Number of files to rotate in each block within rsyslog.j2 template
+NUM_LOG_FILES_SYSLOG=1
+NUM_LOG_FILES_QUAGGA_TEAMD=3
+NUM_LOG_FILES_SWSS=2
+
+# Percentage of usable /var/log/ space to allocate to each block in template
+# NOTE: These must sum to 100!
+PERCENT_ALLOCATED_SYSLOG=75
+PERCENT_ALLOCATED_QUAGGA_TEAMD=15
+PERCENT_ALLOCATED_SWSS=10
+
+VAR_LOG_SIZE_KB=$(df /var/log | sed -n 2p | awk '{print $2}')
+USABLE_SPACE_KB=$((VAR_LOG_SIZE_KB - RESERVED_SPACE_KB))
+
+SIZE_LIMIT_SYSLOG_FILES_KB=$(((USABLE_SPACE_KB * PERCENT_ALLOCATED_SYSLOG / 100) / (NUM_LOG_FILES_SYSLOG * (NUM_ARCHIVES_PER_LOG_FILE + 1))))
+SIZE_LIMIT_QUAGGA_TEAMD_FILES_KB=$(((USABLE_SPACE_KB * PERCENT_ALLOCATED_QUAGGA_TEAMD / 100) / (NUM_LOG_FILES_QUAGGA_TEAMD * (NUM_ARCHIVES_PER_LOG_FILE + 1))))
+SIZE_LIMIT_SWSS_FILES_KB=$(((USABLE_SPACE_KB * PERCENT_ALLOCATED_SWSS / 100) / (NUM_LOG_FILES_SWSS * (NUM_ARCHIVES_PER_LOG_FILE + 1))))
+
+ADDITIONAL_DATA_JSON="{"
+ADDITIONAL_DATA_JSON+="\"num_archive_files\":$NUM_ARCHIVES_PER_LOG_FILE,"
+ADDITIONAL_DATA_JSON+="\"size_limit_syslog_kb\":$SIZE_LIMIT_SYSLOG_FILES_KB,"
+ADDITIONAL_DATA_JSON+="\"size_limit_quagga_teamd_kb\":$SIZE_LIMIT_QUAGGA_TEAMD_FILES_KB,"
+ADDITIONAL_DATA_JSON+="\"size_limit_swss_kb\":$SIZE_LIMIT_SWSS_FILES_KB"
+ADDITIONAL_DATA_JSON+="}"
+
+sonic-cfggen -a "$ADDITIONAL_DATA_JSON" -t /usr/share/sonic/templates/logrotate.d/rsyslog.j2 > /etc/logrotate.d/rsyslog

files/image_config/logrotate/logrotate.conf

@@ -0,0 +1,32 @@
+# see "man logrotate" for details
+# Rotate log files daily by default
+daily
+
+# Keep 4 days worth of backlogs by default
+rotate 4
+
+# create new (empty) log files after rotating old ones
+create
+
+# uncomment this if you want your log files compressed
+#compress
+
+# packages drop log rotation information into this directory
+include /etc/logrotate.d
+
+# no packages own wtmp, or btmp -- we'll rotate them here
+/var/log/wtmp {
+    missingok
+    size 100k
+    create 0664 root utmp
+    rotate 1
+}
+
+/var/log/btmp {
+    missingok
+    size 100k
+    create 0660 root utmp
+    rotate 1
+}
+
+# system-specific logs may be configured here

files/image_config/logrotate.d/rsyslog → files/image_config/logrotate/rsyslog.j2

@@ -1,14 +1,42 @@
+{% block banner %}
+#
+# =========== Managed by SONiC Config Engine - DO NOT EDIT MANUALLY! ===========
+# Generated from:
+#   /usr/share/sonic/templates/logrotate.d/rsyslog.j2 using sonic-cfggen
+#
+# file: /etc/logrotate.d/rsyslog
+#   Logrotate configuration file for SONiC
+#
+{% endblock banner %}
+
 /var/log/syslog
+{
+    rotate {{ num_archive_files }}
+    size {{ size_limit_syslog_kb }}k
+    missingok
+    notifempty
+    compress
+    delaycompress
+    sharedscripts
+    postrotate
+        # Calling kill directly instead of 'service rsyslog rotate >/dev/null' due
+        # to bug in init-system-helpers. Bug has apparently been fixed in v1.47.
+        # However, Debian Jessie is still using v1.22.
+        # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672218
+        kill -HUP $(cat /var/run/rsyslogd.pid)
+    endscript
+}
+
 /var/log/quagga/*.log
 /var/log/teamd.log
 {
-    rotate 7
-    daily
-    maxsize 100M
+    rotate {{ num_archive_files }}
+    size {{ size_limit_quagga_teamd_kb }}k
     missingok
     notifempty
     compress
     delaycompress
+    sharedscripts
     postrotate
         # Calling kill directly instead of 'service rsyslog rotate >/dev/null' due
         # to bug in init-system-helpers. Bug has apparently been fixed in v1.47.
@@ -17,11 +45,12 @@
         kill -HUP $(cat /var/run/rsyslogd.pid)
     endscript
 }
+
+# SwSS logs (written by orchagent, not rsyslog)
 /var/log/swss/*.rec
 {
-    rotate 7
-    daily
-    maxsize 20M
+    rotate {{ num_archive_files }}
+    size {{ size_limit_swss_kb }}k
     missingok
     notifempty
     compress
@@ -31,6 +60,10 @@
         pgrep -x orchagent | xargs /bin/kill -HUP 2>/dev/null || true
     endscript
 }
+
+# Of these rsyslog-written log files, only auth.log and cron.log should still
+# be created. However, we should attempt to rotate all of them anyway, just
+# in case others happen to get created.
 /var/log/mail.info
 /var/log/mail.warn
 /var/log/mail.err
@@ -44,9 +77,8 @@
 /var/log/debug
 /var/log/messages
 {
-    rotate 4
-    daily
-    maxsize 50M
+    rotate 1
+    size 10k
     missingok
     notifempty
     compress

files/image_config/rsyslog/rsyslog.conf.j2

@@ -1,12 +1,13 @@
-###############################################################################
-# Managed by Ansible
-# file: ansible/roles/acs/templates/rsyslog.conf.j2
-###############################################################################
+{% block banner %}
 #
-#  /etc/rsyslog.conf    Configuration file for rsyslog.
+# =========== Managed by SONiC Config Engine - DO NOT EDIT MANUALLY! ===========
+# Generated from /usr/share/sonic/templates/rsyslog.conf.j2 using sonic-cfggen
+#
+# file: /etc/rsyslog.conf    Configuration file for rsyslog.
 #
 #                       For more information see
 #                       /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
+{% endblock banner %}
 
 
 #################
@@ -50,7 +51,7 @@ $ActionFileDefaultTemplate SONiCFileFormat
 #
 $FileOwner root
 $FileGroup adm
-$FileCreateMode 0640
+$FileCreateMode 0644
 $DirCreateMode 0755
 $Umask 0022
 

files/image_config/rsyslog/rsyslog.d/99-default.conf

@@ -1,61 +1,18 @@
 #
 # First some standard log files.  Log by facility.
 #
+
+# Log all facilities to /var/log/syslog except cron, auth
+# and authpriv. They are noisy - log them to their own files
+*.*;cron,auth,authpriv.none     -/var/log/syslog
 auth,authpriv.*                 /var/log/auth.log
-*.*;auth,authpriv.none          -/var/log/syslog
 cron.*                          /var/log/cron.log
-# Do not redirect daemon, kernel or lpr logs to
-# their own files. Let them log to /var/log/syslog
-#daemon.*                        -/var/log/daemon.log
-#kern.*                          -/var/log/kern.log
-#kern.*                          -/var/persist/log/kern.log
-#lpr.*                           -/var/log/lpr.log
-mail.*                          -/var/log/mail.log
-user.*                          -/var/log/user.log
-
-#
-# Logging for the mail system.  Split it up so that
-# it is easy to write scripts to parse these files.
-#
-mail.info                       -/var/log/mail.info
-mail.warn                       -/var/log/mail.warn
-mail.err                        /var/log/mail.err
-
-#
-# Logging for INN news system.
-#
-news.crit                       /var/log/news/news.crit
-news.err                        /var/log/news/news.err
-news.notice                     -/var/log/news/news.notice
 
-#
-# Some "catch-all" log files.
-#
-*.=debug;\
-        auth,authpriv.none;\
-        news.none;mail.none     -/var/log/debug
-#
-# Removed as duplicates:
-#*.=info;*.=notice;*.=warn;\
-#        auth,authpriv.none;\
-#        cron,daemon.none;\
-#        mail,news.none          -/var/log/messages
-#
-*.=crit;*.=alert;*.=emerg     -/var/persist/log/alarms
 #
 # Emergencies are sent to everybody logged in.
 #
 *.emerg                         :omusrmsg:*
 
-#
-# I like to have messages displayed on the console, but only on a virtual
-# console I usually leave idle.
-#
-#daemon,mail.*;\
-#       news.=crit;news.=err;news.=notice;\
-#       *.=debug;*.=info;\
-#       *.=notice;*.=warn       /dev/tty8
-
 # The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
 # you must invoke `xconsole' with the `-file' option:
 #