commit c11a8764da4e5d828af8797c69f67f57e577b1dd Author: Don Penney Date: Tue Oct 13 09:43:16 2020 -0400 Move distcloud and mtce logfile config Update the syslog-ng config file to support sourcing conf files from the /etc/syslog-ng/conf.d directory. This will allow each subsystem to package their own logfile configuration. Move the distcloud and mtce logfile config to their respective packages. Change-Id: I7d0756475360407b6f4f01746b37b3e38e5dd4f9 Story: 2008251 Task: 41098 Signed-off-by: Don Penney diff --git a/syslog-ng-config/files/syslog-ng.conf b/syslog-ng-config/files/syslog-ng.conf index a66088d..bd19f28 100644 --- a/syslog-ng-config/files/syslog-ng.conf +++ b/syslog-ng-config/files/syslog-ng.conf @@ -1,5 +1,5 @@ @version: 3.4 -#@include "remotelogging.conf" + # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) @@ -11,6 +11,12 @@ template t_log { template-escape(no); }; +# Format for logs that provide their own timestamp, priority, etc... +template t_preformatted { + template("${MSG}\n"); + template-escape(no); +}; + template t_ocf_log { template("${R_YEAR}-${R_MONTH}-${R_DAY}T${R_HOUR}:${R_MIN}:${R_SEC}.${R_MSEC} ${HOST} ${MSGHDR}${PRIORITY} ${MSG}\n"); template-escape(no); @@ -32,11 +38,6 @@ template t_nfv { template-escape(no); }; -template t_mtc { - template("${R_YEAR}-${R_MONTH}-${R_DAY}T${R_HOUR}:${R_MIN}:${R_SEC}.${R_MSEC} ${MSG}\n"); - template-escape(no); -}; - template t_fm { template("${R_YEAR}-${R_MONTH}-${R_DAY}T${R_HOUR}:${R_MIN}:${R_SEC}.${R_MSEC} ${MSG}\n"); template-escape(no); @@ -104,24 +105,6 @@ destination d_openstack { file("/var/log/openstack.log" template(t_openstack)); destination d_sm { file("/var/log/sm.log"); }; destination d_certmon { file("/var/log/cert-mon.log"); }; -# Maintenance Log destinations -destination d_pmon { file("/var/log/pmond.log" template(t_mtc) perm(0640)); }; -destination d_lmon { file("/var/log/lmond.log" template(t_mtc)); }; -destination d_hostwd { file("/var/log/hostwd.log" template(t_mtc) perm(0640)); }; -destination d_fsmon { file("/var/log/fsmond.log" template(t_mtc)); }; -destination d_hwmon { file("/var/log/hwmond.log" template(t_mtc)); }; -destination d_mtclogd { file("/var/log/mtclogd.log" template(t_mtc)); }; -destination d_mtcalarmd { file("/var/log/mtcalarmd.log" template(t_mtc)); }; -destination d_mtcclient { file("/var/log/mtcClient.log" template(t_mtc)); }; -destination d_mtcagent { file("/var/log/mtcAgent.log" template(t_mtc)); }; -destination d_hbsclient { file("/var/log/hbsClient.log" template(t_mtc)); }; -destination d_hbsagent { file("/var/log/hbsAgent.log" template(t_mtc)); }; -destination d_guestagent { file("/var/log/guestAgent.log" template(t_mtc)); }; -destination d_guestserver { file("/var/log/guestServer.log" template(t_mtc)); }; -destination d_mtcagentalarm { file("/var/log/mtcAgent_alarm.log" template(t_mtc)); }; -destination d_mtcagentapi { file("/var/log/mtcAgent_api.log" template(t_mtc) perm(0640)); }; -destination d_mtcagentevent { file("/var/log/mtcAgent_event.log" template(t_mtc)); }; - # HAProxy Log destination destination d_haproxy { file("/var/log/haproxy.log"); }; @@ -144,14 +127,6 @@ destination d_ima_appraise { destination d_sysinv { file("/var/log/sysinv.log" template(t_openstack) perm(0640)); }; destination d_sysinvapi { file("/var/log/sysinv-api.log" template(t_openstack) perm(0640)); }; -# Distributed Cloud Log destination -destination d_dcmanager { file("/var/log/dcmanager/dcmanager.log" template(t_openstack)); }; -destination d_dcmanager_audit { file("/var/log/dcmanager/audit.log" template(t_openstack)); }; -destination d_dcmanager_orch { file("/var/log/dcmanager/orchestrator.log" template(t_openstack)); }; -destination d_dcorch { file("/var/log/dcorch/dcorch.log" template(t_openstack)); }; -destination d_dcdbsync { file("/var/log/dcdbsync/dcdbsync.log" template(t_openstack)); }; -destination d_dcdbsync_openstack { file("/var/log/dcdbsync/dcdbsync_openstack.log" template(t_openstack)); }; - # Openstack Log destinations destination d_horizon { file("/var/log/horizon.log" template(t_openstack) perm(0640)); }; destination d_libvirtd { file("/var/log/libvirt/libvirtd.log" template(t_libvirtd)); }; @@ -283,23 +258,6 @@ filter f_local5 { facility(local5); }; filter f_local6 { facility(local6); }; filter f_local7 { facility(local7); }; -# Maintenance Log Filters -filter f_pmon { facility(local5) and program(pmond); }; -filter f_lmon { facility(local5) and program(lmond); }; -filter f_hostw { facility(local5) and program(hostwd); }; -filter f_fsmon { facility(local5) and program(fsmond); }; -filter f_hwmon { facility(local5) and program(hwmond); }; -filter f_mtclogd { facility(local5) and program(mtclogd); }; -filter f_mtcalarmd { facility(local5) and program(mtcalarmd); }; -filter f_mtcclient { facility(local5) and program(mtcClient); }; -filter f_mtcagent { facility(local5) and program(mtcAgent); }; -filter f_hbsclient { facility(local5) and program(hbsClient); }; -filter f_hbsagent { facility(local5) and program(hbsAgent); }; -filter f_guestagent { facility(local5) and program(guestAgent); }; -filter f_guestserver { facility(local5) and program(guestServer); }; -filter f_mtcagentalarm { facility(local5) and program(/var/log/mtcAgent_alarm.log); }; -filter f_mtcagentapi { facility(local5) and program(/var/log/mtcAgent_api.log); }; -filter f_mtcagentevent { facility(local5) and program(/var/log/mtcAgent_event.log); }; filter f_certmon { facility(local6) and program(cert-mon); }; # Fault Management Filter @@ -314,18 +272,6 @@ filter f_ima_appraise { filter(f_ima) and match("appraise_data") ; }; filter f_sysinv { facility(local6) and program(sysinv) and not match("sysinv.api.hooks.auditor"); }; filter f_sysinvapi { facility(local6) and program(sysinv) and match("sysinv.api.hooks.auditor"); }; -# Distributed Cloud Log Filters -filter f_dcmanagermanager { facility(local2) and program(dcmanager-manager); }; -filter f_dcmanageraudit { facility(local2) and program(dcmanager-audit); }; -filter f_dcmanagerorchestrator { facility(local2) and program(dcmanager-orchestrator); }; -filter f_dcmanagerapi { facility(local2) and program(dcmanager-api); }; - -filter f_dcorchengine { facility(local2) and program(dcorch-engine); }; -filter f_dcorchapiproxy { facility(local2) and program(dcorch-api-proxy); }; - -filter f_dcdbsyncapi { facility(local2) and program(dcdbsync-api); }; -filter f_dcdbsyncopenstackapi { facility(local3) and program(dcdbsync-api); }; - # Openstack Log Filters filter f_horizon { facility(local7) }; filter f_libvirtd { program(libvirtd) }; @@ -367,24 +313,6 @@ log { source(s_src); filter(f_local1); destination(d_platform); }; log { source(s_src); filter(f_local2); destination(d_openstack); }; log { source(s_src); filter(f_local3); destination(d_sm); }; -# Maintenance Log Paths -log { source(s_src); filter(f_pmon); destination(d_pmon); }; -log { source(s_src); filter(f_lmon); destination(d_lmon); }; -log { source(s_src); filter(f_hostw); destination(d_hostwd); }; -log { source(s_src); filter(f_fsmon); destination(d_fsmon); }; -log { source(s_src); filter(f_hwmon); destination(d_hwmon); }; -log { source(s_src); filter(f_mtclogd); destination(d_mtclogd); }; -log { source(s_src); filter(f_mtcalarmd); destination(d_mtcalarmd); }; -log { source(s_src); filter(f_mtcclient); destination(d_mtcclient); }; -log { source(s_src); filter(f_mtcagent); destination(d_mtcagent); }; -log { source(s_src); filter(f_hbsclient); destination(d_hbsclient); }; -log { source(s_src); filter(f_hbsagent); destination(d_hbsagent); }; -log { source(s_src); filter(f_guestagent); destination(d_guestagent); }; -log { source(s_src); filter(f_guestserver); destination(d_guestserver); }; -log { source(s_src); filter(f_mtcagentalarm); destination(d_mtcagentalarm); }; -log { source(s_src); filter(f_mtcagentapi); destination(d_mtcagentapi); }; -log { source(s_src); filter(f_mtcagentevent); destination(d_mtcagentevent); }; - # HAProxy Log Path log { source(s_udp); filter(f_local1); destination(d_haproxy); }; @@ -402,16 +330,6 @@ log { source(s_src); filter(f_ima_appraise); destination(d_ima_appraise); }; log {source(s_src); filter(f_sysinv); destination(d_sysinv); }; log {source(s_src); filter(f_sysinvapi); destination(d_sysinvapi); }; -# Distributed Cloud Log Path -log {source(s_src); filter(f_dcmanagermanager); destination(d_dcmanager); }; -log {source(s_src); filter(f_dcmanageraudit); destination(d_dcmanager_audit); }; -log {source(s_src); filter(f_dcmanagerorchestrator); destination(d_dcmanager_orch); }; -log {source(s_src); filter(f_dcmanagerapi); destination(d_dcmanager); }; -log {source(s_src); filter(f_dcorchengine); destination(d_dcorch); }; -log {source(s_src); filter(f_dcorchapiproxy); destination(d_dcorch); }; -log {source(s_src); filter(f_dcdbsyncapi); destination(d_dcdbsync); }; -log {source(s_src); filter(f_dcdbsyncopenstackapi); destination(d_dcdbsync_openstack); }; - # Openstack Log Paths log { source(s_src); filter(f_horizon); destination(d_horizon); }; log { source(s_src); filter(f_libvirtd); destination(d_libvirtd); }; @@ -456,3 +374,6 @@ log { source(s_src); filter(f_bash); destination(d_bash); }; # SNMP Audit Trail log { source(s_src); filter(f_snmpat); destination(d_snmpat); }; + +# Include conf.d files +@include "/etc/syslog-ng/conf.d/" diff --git a/syslog-ng-config/files/syslog-ng.logrotate b/syslog-ng-config/files/syslog-ng.logrotate index 92008c8..806694a 100644 --- a/syslog-ng-config/files/syslog-ng.logrotate +++ b/syslog-ng-config/files/syslog-ng.logrotate @@ -24,8 +24,6 @@ /var/log/keystone/*.log /var/log/horizon.log /var/log/snmp-api.log -/var/log/dcmanager/*.log -/var/log/dcdbsync/*.log /var/log/barbican/barbican-keystone-listener.log /var/log/barbican/barbican-worker.log { @@ -42,21 +40,6 @@ endscript } -/var/log/dcorch/*.log -{ - nodateext - size 20M - start 1 - rotate 20 - missingok - notifempty - compress - sharedscripts - postrotate - systemctl reload syslog-ng > /dev/null 2>&1 || true - endscript -} - /var/log/nfv-vim.log { nodateext