x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Ensure manifests fit the 140-character limit 

Change-Id: I6663f402c3c64a76190543531ae70c8294414d04
This commit is contained in:
Simon Pasquier 2016-03-10 14:09:13 +01:00
parent e2beeaeef8
commit 4d7f70832f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment_scripts/puppet/manifests/configure_afd_filters.pp
View File

@ -64,7 +64,8 @@ if $alerting_mode == 'remote' {
if ! $lma_infra_alerting {
notice('Could not get the LMA Infrastructure Alerting parameters. The LMA-Infrastructure-Alerting plugin is probably not installed.')
} elsif ! $lma_infra_alerting['metadata']['enabled'] {
notice('Could not get the LMA Infrastructure Alerting parameters. The LMA-Infrastructure-Alerting plugin is probably not enabled for this environment.')
notice(join(['Could not get the LMA Infrastructure Alerting parameters. ',
'The LMA-Infrastructure-Alerting plugin is probably not enabled for this environment.'], ''))
} else {
notice('The LMA-Infrastructure-Alerting plugin is enabled but no alerting node for this environment.')
}

3
deployment_scripts/puppet/manifests/controller.pp
View File

@ -280,7 +280,8 @@ if $influxdb_mode != 'disabled' {
$cinder = hiera_hash('cinder', {})
$haproxy_socket = '/var/lib/haproxy/stats'
if $storage_options['volumes_ceph'] or $storage_options['images_ceph'] or $storage_options['objects_ceph'] or $storage_options['ephemeral_ceph']{
if $storage_options['volumes_ceph'] or $storage_options['images_ceph'] or
$storage_options['objects_ceph'] or $storage_options['ephemeral_ceph']{
$ceph_enabled = true
} else {
$ceph_enabled = false

3
deployment_scripts/puppet/modules/lma_collector/manifests/afd/api.pp
View File

@ -25,7 +25,8 @@ class lma_collector::afd::api () {
heka::filter::sandbox { 'afd_api_endpoints':
config_dir => $lma_collector::params::config_dir,
filename => "${lma_collector::params::plugins_dir}/filters/afd_api_endpoints.lua",
message_matcher => '(Type == \'metric\' || Type == \'heka.sandbox.metric\') && (Fields[name] =~ /^openstack.*check_api$/ || Fields[name] == \'http_check\')',
message_matcher => join(['(Type == \'metric\' || Type == \'heka.sandbox.metric\') &&',
' (Fields[name] =~ /^openstack.*check_api$/ || Fields[name] == \'http_check\')'], ''),
notify => Class['lma_collector::service'],
}
}