stackforge/puppet-openstack-cloud
Code Issues Proposed changes

logging: instantiate dedicated ES instance and fluentd refresh on change

Browse Source 
* Elasticsearch spawns a dedicated instance named fluentd for its usage
* Fluentd change weren't taking in account, now it does
This commit is contained in:
Yanis Guenane 2014-07-11 17:07:41 -04:00
parent cd1ebfef27
commit adad6151e3
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.fixtures.yml
View File

@ -59,7 +59,7 @@ fixtures:
ref: '0df1f62130a7752c728efb7555f2b07ca178ee5b' ref: '0df1f62130a7752c728efb7555f2b07ca178ee5b'
'fluentd': 'fluentd':
repo: 'git://github.com/enovance/puppet-fluentd.git' repo: 'git://github.com/enovance/puppet-fluentd.git'
ref: '93ea059e21850c22f1ca079cbacd51b548d3b1b3' ref: 'da0ce0a3de340b671c243a5550a27532e6679da2'
'haproxy': 'haproxy':
repo: 'git://github.com/enovance/puppetlabs-haproxy.git' repo: 'git://github.com/enovance/puppetlabs-haproxy.git'
ref: 'fc1166f28d411dfd4f59d4bfd6936595c014a11b' ref: 'fc1166f28d411dfd4f59d4bfd6936595c014a11b'

2
Puppetfile
View File

@ -85,7 +85,7 @@ mod 'firewall',
:ref => '6540b31b0ca0727094ddf44436274436d2853d6d' :ref => '6540b31b0ca0727094ddf44436274436d2853d6d'
mod 'fluentd', mod 'fluentd',
:git => 'git://github.com/enovance/puppet-fluentd.git', :git => 'git://github.com/enovance/puppet-fluentd.git',
:ref => '93ea059e21850c22f1ca079cbacd51b548d3b1b3' :ref => 'da0ce0a3de340b671c243a5550a27532e6679da2'
mod 'haproxy', mod 'haproxy',
:git => 'git://github.com/enovance/puppetlabs-haproxy.git', :git => 'git://github.com/enovance/puppetlabs-haproxy.git',
:ref => 'fc1166f28d411dfd4f59d4bfd6936595c014a11b' :ref => 'fc1166f28d411dfd4f59d4bfd6936595c014a11b'

4
manifests/logging/agent.pp
View File

@ -60,8 +60,8 @@ class cloud::logging::agent(
ensure_resource('fluentd::configfile', keys($sources)) ensure_resource('fluentd::configfile', keys($sources))
ensure_resource('fluentd::configfile', keys($matches)) ensure_resource('fluentd::configfile', keys($matches))
create_resources('fluentd::source', $sources, {'require' => 'File[/var/db/td-agent]'}) create_resources('fluentd::source', $sources, {'require' => 'File[/var/db/td-agent]', 'notify' => 'Service[td-agent]'})
create_resources('fluentd::match', $matches) create_resources('fluentd::match', $matches, {'notify' => 'Service[td-agent]'})
create_resources('fluentd::install_plugin', $plugins) create_resources('fluentd::install_plugin', $plugins)
} }

1
manifests/logging/server.pp
View File

@ -21,5 +21,6 @@ class cloud::logging::server{
include ::elasticsearch include ::elasticsearch
include ::kibana3 include ::kibana3
include cloud::logging::agent include cloud::logging::agent
elasticsearch::instance {'fluentd' : }
} }

4
spec/classes/cloud_logging_server.rb
View File

@ -34,6 +34,10 @@ describe 'cloud::logging::server' do
it 'configure kibana' do it 'configure kibana' do
should contain_class('kibana3').with(:ws_port => '8001') should contain_class('kibana3').with(:ws_port => '8001')
end end
it 'configure an elasticsearch instance' do
should contain_elasticsearch__instance('fluentd')
end
end end
context 'on Debian platforms' do context 'on Debian platforms' do