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

Add support for Sahara logs and notifications 

Closes-Bug: #1493699
Change-Id: If3d7688d5f60d38ab21ba44de57b5cfdb4b7adc3
This commit is contained in:
Guillaume Thouvenin 2016-02-29 16:42:21 +01:00
parent 967833c885
commit e2beeaeef8
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ $rabbit = hiera_hash('rabbit')
$management_vip = hiera('management_vip')
$storage_options = hiera_hash('storage', {})
$murano = hiera_hash('murano')
$sahara = hiera_hash('sahara')
$contrail = hiera('contrail', false)
if $ceilometer['enabled'] {
@ -56,6 +57,31 @@ class { 'lma_collector::notifications::input':
password => $rabbit['password'],
}
# Sahara notifications
if $sahara['enabled'] {
include sahara::params
$sahara_api_service = $::sahara::params::api_service_name
$sahara_engine_service = $::sahara::params::engine_service_name
sahara_config { 'DEFAULT/enable_notifications':
value => true,
notify => Service[$sahara_api_service, $sahara_engine_service],
}
sahara_config { 'DEFAULT/notification_topics':
value => $notification_topics,
notify => Service[$sahara_api_service, $sahara_engine_service],
}
sahara_config { 'DEFAULT/notification_driver':
value => 'messaging',
notify => Service[$sahara_api_service, $sahara_engine_service],
}
service { [$sahara_api_service, $sahara_engine_service]:
hasstatus => true,
hasrestart => true,
}
}
# Nova notifications
include nova::params
$nova_api_service = $::nova::params::api_service_name
@ -222,9 +248,15 @@ lma_collector::logs::openstack { 'heat': }
lma_collector::logs::openstack { 'keystone': }
class {'lma_collector::logs::keystone_wsgi': }
lma_collector::logs::openstack { 'horizon': }
if $murano['enabled'] {
lma_collector::logs::openstack { 'murano': }
}
if $sahara['enabled'] {
lma_collector::logs::openstack { 'sahara': }
}
if ! $storage_options['objects_ceph'] {
class { 'lma_collector::logs::swift':
file_match => 'swift-all\.log\.?(?P<Seq>\d*)$',

2
deployment_scripts/puppet/modules/lma_collector/files/plugins/decoders/notification.lua
View File

@ -47,6 +47,8 @@ local logger_map = {
port = 'neutron',
router = 'neutron',
subnet = 'neutron',
-- sahara
sahara = 'sahara',
}
-- Mapping table between the attributes in the notification's payload and the

2
pre_build_hook
View File

@ -18,6 +18,7 @@ HEAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-heat-7.0.0.
KEYSTONE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-keystone-7.0.0.tar.gz"
NEUTRON_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-neutron-7.0.0.tar.gz"
NOVA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-nova-7.0.0.tar.gz"
SAHARA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-sahara-7.0.0.tar.gz"
OPENSTACKLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-openstacklib-7.0.0.tar.gz"
download_packages \
@ -66,4 +67,5 @@ download_puppet_module "heat" "${HEAT_TARBALL_URL}"
download_puppet_module "keystone" "${KEYSTONE_TARBALL_URL}"
download_puppet_module "neutron" "${NEUTRON_TARBALL_URL}"
download_puppet_module "nova" "${NOVA_TARBALL_URL}"
download_puppet_module "sahara" "${SAHARA_TARBALL_URL}"
download_puppet_module "openstacklib" "${OPENSTACKLIB_TARBALL_URL}"