openstack
/
fuel-library
Code Issues Proposed changes

Remove duplicate configurations of the rsyslog 

This commit removes the duplicate configuration settings configured
by the incorrect usage of the rsyslog::client class for local and
remote logging. Also, this commit adds some comments, notes and
contains styling fixes.

Depends-On: Ib95db5545889e8ae2b86dcf787c4adb7413d5698
Change-Id: Iefef30379a62c8fab123e03c35c302de8e39a4a3
Closes-Bug: #1579081
Partial-Bug: #1580200
Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
This commit is contained in:
Maksim Malchuk 2016-05-12 22:12:36 +03:00
parent a6cf14c665
commit 50aa72b3d4
4 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
deployment/puppet/openstack/manifests/logging.pp
View File

@ -132,17 +132,17 @@ class openstack::logging (
# Configure logging templates for rsyslog client side
# Rabbitmq does not support syslogging, use imfile
::rsyslog::imfile { "04-rabbitmq" :
file_name => "/var/log/rabbitmq/rabbit@${rabbit_fqdn_prefix}${hostname}.log",
file_tag => "rabbitmq",
file_facility => "syslog",
::rsyslog::imfile { '04-rabbitmq' :
file_name => "/var/log/rabbitmq/rabbit@${rabbit_fqdn_prefix}${::hostname}.log",
file_tag => 'rabbitmq',
file_facility => 'syslog',
file_severity => $rabbit_log_level,
}
::rsyslog::imfile { "04-rabbitmq-sasl" :
file_name => "/var/log/rabbitmq/rabbit@${rabbit_fqdn_prefix}${hostname}-sasl.log",
file_tag => "rabbitmq-sasl",
file_facility => "syslog",
::rsyslog::imfile { '04-rabbitmq-sasl' :
file_name => "/var/log/rabbitmq/rabbit@${rabbit_fqdn_prefix}${::hostname}-sasl.log",
file_tag => 'rabbitmq-sasl',
file_facility => 'syslog',
file_severity => $rabbit_log_level,
}
@ -153,24 +153,24 @@ class openstack::logging (
file_severity => 'ERROR',
}
::rsyslog::imfile { "04-rabbitmq-startup_log" :
file_name => "/var/log/rabbitmq/startup_log",
file_tag => "rabbitmq-startup_log",
file_facility => "syslog",
::rsyslog::imfile { '04-rabbitmq-startup_log' :
file_name => '/var/log/rabbitmq/startup_log',
file_tag => 'rabbitmq-startup_log',
file_facility => 'syslog',
file_severity => $rabbit_log_level,
}
::rsyslog::imfile { "04-rabbitmq-shutdown_err" :
file_name => "/var/log/rabbitmq/shutdown_err",
file_tag => "rabbitmq-shutdown_err",
file_facility => "syslog",
file_severity => "ERROR",
::rsyslog::imfile { '04-rabbitmq-shutdown_err' :
file_name => '/var/log/rabbitmq/shutdown_err',
file_tag => 'rabbitmq-shutdown_err',
file_facility => 'syslog',
file_severity => 'ERROR',
}
::rsyslog::imfile { "04-rabbitmq-shutdown_log" :
file_name => "/var/log/rabbitmq/shutdown_log",
file_tag => "rabbitmq-shutdown_log",
file_facility => "syslog",
::rsyslog::imfile { '04-rabbitmq-shutdown_log' :
file_name => '/var/log/rabbitmq/shutdown_log',
file_tag => 'rabbitmq-shutdown_log',
file_facility => 'syslog',
file_severity => $rabbit_log_level,
}
@ -303,30 +303,40 @@ class openstack::logging (
content => template("${module_name}/62-mongod.conf.erb"),
}
::rsyslog::snippet { '80-swift':
content => template("${module_name}/80-swift.conf.erb"),
}
# Custom settings for rsyslog client to define remote logging and local
# options
::rsyslog::snippet { '90-local':
content => template("${module_name}/90-local.conf.erb"),
}
::rsyslog::snippet { '00-remote':
content => template("${module_name}/00-remote.conf.erb"),
}
if $ironic_collector {
::rsyslog::snippet { '70-ironic':
content => template("${module_name}/70-ironic.conf.erb"),
}
}
::rsyslog::snippet { '80-swift':
content => template("${module_name}/80-swift.conf.erb"),
}
# Custom settings for rsyslog default system file
# WARNING: don't change the filename (same used in the syslog package)
::rsyslog::snippet { '50-default':
content => template("${module_name}/50-default.conf.erb"),
}
# Custom settings for rsyslog client to define local logging
::rsyslog::snippet { '90-local':
content => template("${module_name}/90-local.conf.erb"),
}
# Custom settings for rsyslog client to define remote logging
# WARNING: don't change the filename (same used in the fuel-agent)
::rsyslog::snippet { '00-remote':
content => template("${module_name}/00-remote.conf.erb"),
}
# TODO(mmalchuk) local and remote settings should be moved from snippets
# into rsyslog::client class when it will be able to use $custom_config
# together with $custom_params options in upstream module.
# Custom settings for rsyslog configuration with minimal configuration.
class { '::rsyslog::client':
log_remote => $log_remote,
log_local => $log_local,
log_auth_local => $log_auth_local,
log_remote => false,
high_precision_timestamps => $show_timezone,
}
@ -378,7 +388,7 @@ class openstack::logging (
}
}
Rsyslog::Snippet <| |> -> Service["$::rsyslog::params::service_name"]
Rsyslog::Snippet <| |> -> Service[$::rsyslog::params::service_name]
# Configure log rotation
class { '::openstack::logrotate':

5
deployment/puppet/openstack/spec/classes/openstack_logging_spec.rb
View File

@ -56,6 +56,7 @@ describe 'openstack::logging' do
'21-keystone-common-wsgi',
'30-cinder',
'40-glance',
'50-default',
'50-neutron',
'51-ceilometer',
'53-aodh',
@ -73,9 +74,7 @@ describe 'openstack::logging' do
should contain_file("/etc/rsyslog.d/#{item}.conf")
end
should contain_class('rsyslog::client').with(
:log_remote => p[:log_remote],
:log_local => p[:log_local],
:log_auth_local => p[:log_auth_local],
:log_remote => false,
:high_precision_timestamps => p[:show_timezone]
)
should contain_rsyslog__snippet('00-disable-EscapeControlCharactersOnReceive')

3
deployment/puppet/openstack/templates/00-remote.conf.erb
View File

@ -9,7 +9,9 @@ $Template RemoteLog, "<%%pri%>%timestamp% %hostname% %syslogtag%%msg:::sp-if-no-
# Note: don't use %app-name% cuz it would be empty for some cases
$ActionFileDefaultTemplate RemoteLog
$WorkDirectory <%= scope.lookupvar('rsyslog::params::spool_dir') %>
<% @rservers_real.each_with_index do |rserver, rservercount| -%>
<% if ! ['localhost','127.0.0.1','::1'].include?(rserver['server']) -%>
#Start remote server <%=rservercount %>
$ActionQueueType LinkedList # use asynchronous processing
@ -27,7 +29,6 @@ $ActionQueueWorkerThreads 2
$ActionQueueDequeueBatchSize 128
$ActionResumeRetryCount -1
# Isolate sudo logs locally
# match if "program name" is equal to "sudo"
:programname, isequal, "sudo" -/var/log/sudo.log

3
deployment/puppet/openstack/templates/50-default.conf.erb Normal file
View File

@ -0,0 +1,3 @@
# managed by puppet
# an intentionally empty file