starlingx
/
config-files
Code Issues Proposed changes

Avoid dcmanager and dcorch log duplication in openstack.log 

The logs related to dcmanager (orchestrator, audit, etc..) and
dcorch show up in openstack.log as well. This commit fixes the
issue by moving the DC logs to local4 log facility and filtering
the slapd logs to daemon.log.

Change-Id: I2d8fad2e2b807846f5d7a9fc383f290a7c776745
Signed-off-by: Jessica Castelino <jessica.castelino@windriver.com>
Closes-Bug: 1932334
This commit is contained in:
Jessica Castelino 2021-06-22 15:08:12 -04:00
parent e82d1b9e70
commit af46ca0cb6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openldap-config/centos/openldap-config.spec
View File

@ -35,12 +35,12 @@ install -m 755 initscript %{buildroot}%{_sysconfdir}/rc.d/init.d/openldap
install -d -m 740 %{buildroot}%{_sysconfdir}/openldap
install -m 600 slapd.conf %{buildroot}%{_sysconfdir}/openldap/slapd.conf
install -m 600 initial_config.ldif %{buildroot}%{_sysconfdir}/openldap/initial_config.ldif
install -p -D -m 644 slapd.syslog-ng.conf %{buildroot}%{_sysconfdir}/syslog-ng/conf.d/slapd.conf
install -d %{buildroot}%{_datadir}/starlingx
install -m 644 slapd.service %{buildroot}%{local_systemd_system}/slapd.service
install -m 644 slapd.sysconfig %{buildroot}%{_datadir}/starlingx/slapd.sysconfig
%post
if [ $1 -eq 1 ] ; then
cp -f %{_datadir}/starlingx/slapd.sysconfig %{_sysconfdir}/sysconfig/slapd
@ -53,5 +53,6 @@ fi
%{_sysconfdir}/rc.d/init.d/openldap
%{_sysconfdir}/openldap/slapd.conf
%{_sysconfdir}/openldap/initial_config.ldif
%{_sysconfdir}/syslog-ng/conf.d/slapd.conf
%{local_systemd_system}/slapd.service
%{_datadir}/starlingx/slapd.sysconfig

8
openldap-config/files/slapd.syslog-ng.conf Normal file
View File

@ -0,0 +1,8 @@
# slapd log destination
destination d_daemon_slapd { file("/var/log/daemon.log" template(t_preformatted)); };
# slapd log filters
filter f_slapd { facility(local4) and program(slapd); };
# slapd log path
log {source(s_src); filter(f_slapd); destination(d_daemon_slapd); };

3
syslog-ng-config/files/syslog-ng.conf
View File

@ -144,7 +144,6 @@ destination d_vim_api { file("/var/log/nfv-vim-api.log" template(t_nfv));
destination d_vim_webserver { file("/var/log/nfv-vim-webserver.log" template(t_nfv)); };
# Local Log destinations
destination d_local4 { file("/var/log/local4.log"); };
destination d_local5 { file("/var/log/local5.log"); };
destination d_local6 { file("/var/log/local6.log"); };
destination d_local7 { file("/var/log/local7.log"); };
@ -251,7 +250,6 @@ filter f_local2 { facility(local2)
and not filter(f_keystoneall)
and not filter(f_keystoneapi) };
filter f_local3 { facility(local3); };
filter f_local4 { facility(local4); };
filter f_local5 { facility(local5); };
filter f_local6 { facility(local6); };
filter f_local7 { facility(local7); };
@ -340,7 +338,6 @@ log {source(s_src); filter(f_vim_api); destination(d_vim_api); };
log {source(s_src); filter(f_vim_webserver); destination(d_vim_webserver); };
# Local Log Paths
log { source(s_src); filter(f_local4); destination(d_local4); };
log { source(s_src); filter(f_mail); destination(d_mail); };
#log { source(s_src); filter(f_mail); filter(f_info); destination(d_mailinfo); };
#log { source(s_src); filter(f_mail); filter(f_warn); destination(d_mailwarn); };