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

Merge "Use 'meta' in the rabbitmq collectd plugin"

This commit is contained in:
Jenkins 2016-03-23 09:46:07 +00:00 committed by Gerrit Code Review
parent 459dbc1784 13d76111fb
commit edf29e1753
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deployment_scripts/puppet/modules/lma_collector/files/collectd/rabbitmq_info.py
View File

@ -191,10 +191,24 @@ class RabbitMqPlugin(base.Base):
queue_name = ctl_stats[0]
if self._matching_queue(queue_name):
queue_name = ctl_stats[0][:self.MAX_QUEUE_IDENTIFIER_LENGTH]
stats['%s.messages' % queue_name] = ctl_stats[1]
stats['%s.memory' % queue_name] = ctl_stats[2]
stats['%s.consumers' % queue_name] = ctl_stats[3]
meta = {
'queue': ctl_stats[0][:self.MAX_QUEUE_IDENTIFIER_LENGTH]
}
yield {
'type_instance': 'queue_messages',
'values': ctl_stats[1],
'meta': meta
}
yield {
'type_instance': 'queue_memory',
'values': ctl_stats[2],
'meta': meta
}
yield {
'type_instance': 'queue_consumers',
'values': ctl_stats[3],
'meta': meta
}
# we need to check if the list of synchronised slaves is
# equal to the list of slaves.
@ -238,8 +252,6 @@ class RabbitMqPlugin(base.Base):
self.logger.warning('%s returned something strange.' %
self.pmap_bin)
# TODO(pasquier-s): define and use own types instead of the generic
# GAUGE type
for k, v in stats.iteritems():
yield {'type_instance': k, 'values': v}

21
deployment_scripts/puppet/modules/lma_collector/files/plugins/decoders/collectd.lua
View File

@ -181,25 +181,10 @@ function process_message ()
msg['Fields']['name'] = msg['Fields']['name'] .. sample['type_instance']
end
elseif metric_source == 'rabbitmq_info' then
if sample['type_instance'] ~= 'consumers' and
sample['type_instance'] ~= 'messages' and
sample['type_instance'] ~= 'memory' and
sample['type_instance'] ~= 'used_memory' and
sample['type_instance'] ~= 'unmirrored_queues' and
sample['type_instance'] ~= 'vm_memory_limit' and
sample['type_instance'] ~= 'disk_free_limit' and
sample['type_instance'] ~= 'disk_free' and
sample['type_instance'] ~= 'remaining_memory' and
sample['type_instance'] ~= 'remaining_disk' and
(string.match(sample['type_instance'], '%.consumers$') or
string.match(sample['type_instance'], '%.messages$') or
string.match(sample['type_instance'], '%.memory$')) then
local q, m = string.match(sample['type_instance'], '^(.+)%.([^.]+)$')
msg['Fields']['name'] = 'rabbitmq_queue' .. sep .. m
msg['Fields']['queue'] = q
msg['Fields']['name'] = 'rabbitmq' .. sep .. sample['type_instance']
if sample['meta'] and sample['meta']['queue'] then
msg['Fields']['queue'] = sample['meta']['queue']
msg['Fields']['tag_fields'] = { 'queue' }
else
msg['Fields']['name'] = 'rabbitmq' .. sep .. sample['type_instance']
end
elseif metric_source == 'nova' then
if sample['plugin_instance'] == 'nova_services' or