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

Fix the configuration of process metrics on base-os 

Unless this patch, the collectd processes plugin is configured to collect all
'self-monitored' processes on all base-os nodes whatever the name of the node.

Change-Id: Iaf546d41571cf4e6fba76ded566e8898f71ee728
This commit is contained in:
Swann Croiset 2015-06-30 21:18:09 +02:00
parent ec6d304e9b
commit a3217f47d5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment_scripts/puppet/manifests/base.pp
View File

@ -14,10 +14,11 @@
#
# TODO(spasquier): fail if Neutron isn't used
$lma_collector = hiera('lma_collector')
$roles = node_roles(hiera('nodes'), hiera('uid'))
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
$is_base_os = member($roles, 'base-os')
$lma_collector = hiera('lma_collector')
$roles = node_roles(hiera('nodes'), hiera('uid'))
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
$is_base_os = member($roles, 'base-os')
$current_node_name = hiera('user_node_name')
$elasticsearch_kibana = hiera('elasticsearch_kibana', false)
$es_node_name = $lma_collector['elasticsearch_node_name']
@ -145,13 +146,13 @@ case $influxdb_mode {
}
if $is_base_os {
if $influxdb_node_name == $influxdb_grafana['node_name'] and $influxdb_mode == 'local' {
if $current_node_name == $influxdb_grafana['node_name'] and $influxdb_mode == 'local' {
$processes = ['hekad', 'collectd', 'influxdb']
} else {
$processes = ['hekad', 'collectd']
}
if $es_node_name == $elasticsearch_kibana['node_name'] and $elasticsearch_mode == 'local' {
if $current_node_name == $elasticsearch_kibana['node_name'] and $elasticsearch_mode == 'local' {
# Elasticsearch is running on a JVM
$process_matches = [{name => 'elasticsearch', regex => 'java'}]
} else {