commit 797574962804762a562a088b08b114f929ed6512 Author: Don Penney Date: Tue Oct 13 09:45:52 2020 -0400 Setup distcloud logfile configuration This update creates and packages distcloud-specific logfile configuration for syslog and logrotate, moving it out of the central syslog-ng-config package. Change-Id: Ia6d38fe7d39ff68178441db8844c00232f7597f6 Story: 2008251 Task: 41099 Depends-On: https://review.opendev.org/757947 Signed-off-by: Don Penney diff --git a/distributedcloud/centos/distributedcloud.spec b/distributedcloud/centos/distributedcloud.spec index 18f75cb..0629fa4 100644 --- a/distributedcloud/centos/distributedcloud.spec +++ b/distributedcloud/centos/distributedcloud.spec @@ -30,6 +30,8 @@ Source11: dcdbsync.conf Source12: clean-dcorch Source13: dcmanager-audit.service Source14: dcmanager-orchestrator.service +Source15: distcloud-syslog.conf +Source16: distcloud-logrotate.conf BuildArch: noarch @@ -139,6 +141,8 @@ install -p -D -m 644 %{SOURCE9} %{buildroot}%{_tmpfilesdir} cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcmanager/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample %{buildroot}%{_sysconfdir}/dcmanager/dcmanager.conf +install -p -D -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/syslog-ng/conf.d/distcloud.conf +install -p -D -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/logrotate.d/distcloud.conf install -d -m 755 %{buildroot}/var/log/dcorch install -d -m 755 %{buildroot}/var/cache/dcorch @@ -182,6 +186,8 @@ install -m 755 -D -p %{SOURCE12} %{buildroot}/%{_bindir}/clean-dcorch %{python2_sitelib}/dccommon* %{python2_sitelib}/distributedcloud-*.egg-info %exclude %{python2_sitelib}/dccommon/tests +%{_sysconfdir}/syslog-ng/conf.d/distcloud.conf +%{_sysconfdir}/logrotate.d/distcloud.conf %files dcmanager %license LICENSE diff --git a/distributedcloud/centos/files/distcloud-logrotate.conf b/distributedcloud/centos/files/distcloud-logrotate.conf new file mode 100644 index 0000000..c8b7f2f --- /dev/null +++ b/distributedcloud/centos/files/distcloud-logrotate.conf @@ -0,0 +1,31 @@ +/var/log/dcmanager/*.log +/var/log/dcdbsync/*.log +{ + nodateext + size 10M + start 1 + rotate 20 + missingok + notifempty + compress + sharedscripts + postrotate + systemctl reload syslog-ng > /dev/null 2>&1 || true + 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 +} + diff --git a/distributedcloud/centos/files/distcloud-syslog.conf b/distributedcloud/centos/files/distcloud-syslog.conf new file mode 100644 index 0000000..ad7c949 --- /dev/null +++ b/distributedcloud/centos/files/distcloud-syslog.conf @@ -0,0 +1,30 @@ +# Distributed Cloud Log destination +destination d_dcmanager { file("/var/log/dcmanager/dcmanager.log" template(t_preformatted)); }; +destination d_dcmanager_audit { file("/var/log/dcmanager/audit.log" template(t_preformatted)); }; +destination d_dcmanager_orch { file("/var/log/dcmanager/orchestrator.log" template(t_preformatted)); }; +destination d_dcorch { file("/var/log/dcorch/dcorch.log" template(t_preformatted)); }; +destination d_dcdbsync { file("/var/log/dcdbsync/dcdbsync.log" template(t_preformatted)); }; +destination d_dcdbsync_openstack { file("/var/log/dcdbsync/dcdbsync_openstack.log" template(t_preformatted)); }; + +# 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); }; + +# 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); }; +