commit 987f73124ab32db01cd01cc05bd8f90052aa993d
Author: Suvro Ghosh <suvrojeet.ghosh@windriver.com>
Date:   Fri Oct 16 14:46:59 2020 -0400

    Separated containerd logs from daemon logs
    
    Created a new destination, filter and therefore a log path for
    containerd. Also filtered containerd logs from daemon filter.
    
    Reverted temporary fix of increased log file size for daemon log and
    added containerd log file to logrotate config
    
    Change-Id: Ic6e53a5f2a72d96476b79615666dd19dccab8af6
    Closes-Bug: 1882087
    Signed-off-by: Suvro Ghosh <suvrojeet.ghosh@windriver.com>

diff --git a/syslog-ng-config/files/syslog-ng.conf b/syslog-ng-config/files/syslog-ng.conf
index bd19f28..fadb208 100644
--- a/syslog-ng-config/files/syslog-ng.conf
+++ b/syslog-ng-config/files/syslog-ng.conf
@@ -93,6 +93,7 @@ destination d_auth      { file("/var/log/auth.log" perm(0640)); };
 destination d_cron      { file("/var/log/cron.log"); };
 destination d_daemon    { file("/var/log/daemon.log"); };
 destination d_daemon_ocf { file("/var/log/daemon-ocf.log" template(t_ocf_log) ); };
+destination d_containerd { file("/var/log/containerd.log"); };
 destination d_kern      { file("/var/log/kern.log"); };
 destination d_lpr       { file("/var/log/lpr.log"); };
 destination d_mail      { file("/var/log/mail.log"); };
@@ -216,8 +217,9 @@ filter f_messages { level(info,notice,warn) and
 
 filter f_auth     { facility(auth, authpriv) and not program("audispd"); };
 filter f_cron     { facility(cron); };
-filter f_daemon   { facility(daemon) and not program("^(OCF_).") and not match("snmp-auditor" value("MESSAGE")); };
+filter f_daemon   { facility(daemon) and not program("containerd") and not program("^(OCF_).") and not match("snmp-auditor" value("MESSAGE")); };
 filter f_daemon_ocf { facility(daemon) and program("^(OCF_)."); };
+filter f_containerd { facility(daemon) and program("containerd"); };
 filter f_kern     { facility(kern); };
 filter f_lpr      { facility(lpr); };
 filter f_local    { facility(local0, local1, local3, local4, local5,
@@ -302,6 +304,7 @@ log { source(s_src); filter(f_auth);   destination(d_auth); };
 log { source(s_src); filter(f_cron);   destination(d_cron); };
 log { source(s_src); filter(f_daemon); destination(d_daemon); };
 log { source(s_src); filter(f_daemon_ocf); destination(d_daemon_ocf); };
+log { source(s_src); filter(f_containerd); destination(d_containerd); };
 log { source(s_src); filter(f_kern);   destination(d_kern); };
 log { source(s_src); filter(f_lpr);    destination(d_lpr); };
 #log { source(s_src); filter(f_syslog3); destination(d_syslog); };
diff --git a/syslog-ng-config/files/syslog-ng.logrotate b/syslog-ng-config/files/syslog-ng.logrotate
index 806694a..36fe614 100644
--- a/syslog-ng-config/files/syslog-ng.logrotate
+++ b/syslog-ng-config/files/syslog-ng.logrotate
@@ -4,7 +4,9 @@
 /var/log/auth.log
 /var/log/cron.log
 /var/log/cert-mon.log
+/var/log/daemon.log
 /var/log/daemon-ocf.log
+/var/log/containerd.log
 /var/log/kern.log
 /var/log/lpr.log
 /var/log/mail.log
@@ -105,18 +107,3 @@
                 /usr/bin/logmgmt_postrotate  > /dev/null 2>&1 || true
         endscript
 }
-
-/var/log/daemon.log
-{
-        nodateext
-        size 70M
-        start 1
-        rotate 20
-        missingok
-        notifempty
-        compress
-        sharedscripts
-        postrotate
-                 systemctl reload syslog-ng > /dev/null 2>&1 || true
-        endscript
-}