openstack
/
monasca-agent
Code Issues Proposed changes

A couple small fixes to the postfix plugin 

The postfix plugin is failing due to InvalidValue: "invalid value 0
is not of number type for metric postfix.queue_size" since it's
returning a str value instead of an int, so this patch resolves that.

Also, the detection plugin was hard-coded to look for the mon-agent
user, so this is changed to detect the user based off of the owner
of the agent configuration file.

Change-Id: Iaca266493c1fba3ca9ce8747f0152b7b56838573
This commit is contained in:
David Schroeder 2016-04-11 12:25:09 -06:00
parent 5e71ddaf54
commit 1a35f4bc5f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monasca_agent/collector/checks_d/postfix.py
View File

@ -1,4 +1,4 @@
# (C) Copyright 2015 Hewlett Packard Enterprise Development Company LP
# (c) Copyright 2015-2016 Hewlett Packard Enterprise Development Company LP
import os
@ -64,4 +64,4 @@ class PostfixCheck(AgentCheck):
# emit an individually tagged metric
dimensions.update({'queue': queue, 'instance': os.path.basename(directory)})
self.gauge('postfix.queue_size', count, dimensions=dimensions)
self.gauge('postfix.queue_size', int(count), dimensions=dimensions)

12
monasca_setup/detection/plugins/postfix.py
View File

@ -1,5 +1,6 @@
# (C) Copyright 2015 Hewlett Packard Enterprise Development Company LP
# (c) Copyright 2015-2016 Hewlett Packard Enterprise Development Company LP
import grp
import logging
import os
import yaml
@ -17,10 +18,15 @@ class Postfix(monasca_setup.detection.Plugin):
"""Run detection, set self.available True if the service is detected.
"""
# Detect Agent's OS username by getting the group owner of confg file
try:
gid = os.stat('/etc/monasca/agent/agent.yaml').st_gid
agent_user = grp.getgrgid(gid)[0]
except OSError:
agent_user = None
if monasca_setup.detection.find_process_cmdline('postfix') is not None:
# Test for sudo access
# TODO(craig): don't hardcode the user. Need to get it from the arguments to monasca_setup
test_sudo = os.system('sudo -l -U mon-agent find /var/spool/postfix/incoming -type f > /dev/null')
test_sudo = os.system('sudo -l -U {0} find /var/spool/postfix/incoming -type f > /dev/null'.format(agent_user))
if test_sudo != 0:
log.info("Postfix found but the required sudo access is not configured.\n\t" +
"Refer to plugin documentation for more detail")