openstack
/
monasca-agent
Code Issues Proposed changes

Fixed pep8 issues, bumped version and removed an unused variable.

This commit is contained in:
gary-hessler 2014-05-22 12:39:52 -06:00
parent 35324a4c32
commit 456fefe8b4
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monagent/common/config.py
View File

@ -56,7 +56,7 @@ def get_parsed_args():
def get_version():
return "1.0.2"
return "1.0.3"
def skip_leading_wsp(f):

43
monagent/forwarder/api/__init__.py
View File

@ -12,7 +12,8 @@ log = logging.getLogger(__name__)
class MonAPI(object):
"""Sends measurements to MonAPI
Any errors should raise an exception so the transaction calling this is not committed
Any errors should raise an exception so the transaction calling
this is not committed
"""
def __init__(self, config):
"""
@ -23,7 +24,8 @@ class MonAPI(object):
self.api_version = '2_0'
self.default_dimensions = config['dimensions']
self.token_expiration = 1438
if not 'hostname' in self.default_dimensions: # Verify the hostname is set as a dimension
# Verify the hostname is set as a dimension
if not 'hostname' in self.default_dimensions:
self.default_dimensions['hostname'] = get_hostname()
if config['use_keystone']:
@ -50,21 +52,27 @@ class MonAPI(object):
response = self.mon_client.metrics.create(**kwargs)
if 200 <= response.status_code <= 299:
# Good status from web service
log.debug("Message sent successfully: {0}".format(str(data)))
log.debug("Message sent successfully: {0}"
.format(str(data)))
elif 400 <= response.status_code <= 499:
# Good status from web service but some type of issue with the data
error_msg = "Successful web service call but there were issues (Status: {0}," + \
"Status Message: {1}, Message Content: {1})"
log.error(error_msg.format(response.status_code, response.reason, response.text))
# Good status from web service but some type of issue
# with the data
error_msg = "Successful web service call but there" + \
" were issues (Status: {0}, Status Message: " + \
"{1}, Message Content: {1})"
log.error(error_msg.format(response.status_code,
response.reason, response.text))
response.raise_for_status()
else: # Not a good status
response.raise_for_status()
except exc.HTTPException as he:
log.error("Error sending message to mon-api: {0}".format(str(he.message)))
log.error("Error sending message to mon-api: {0}"
.format(str(he.message)))
def post_metrics(self, measurements):
"""post_metrics
given [Measurement, ...], format the request and post to the monitoring api
given [Measurement, ...], format the request and post to
the monitoring api
"""
# Add default dimensions
for measurement in measurements:
@ -76,14 +84,19 @@ class MonAPI(object):
"""_refresh_token
Gets a new token from Keystone and resets the validity timer
"""
token = None
try:
log.debug("Getting token from Keystone")
keystone = Keystone(self.config['keystone_url'], self.config['use_keystone'])
self.token = keystone.get_token_password_auth(self.config['username'], self.config['password'], self.config['project_id'])
log.debug("Setting Keystone token expiration timer for {0} minutes".format(str(self.token_expiration)))
self.timer = Timer(self.token_expiration,self._refresh_token)
keystone = Keystone(self.config['keystone_url'])
self.token = \
keystone.get_token_password_auth(
self.config['username'],
self.config['password'],
self.config['project_id'])
log.debug("Setting Keystone token expiration timer for " +
"{0} minutes".format(str(self.token_expiration)))
self.timer = Timer(self.token_expiration, self._refresh_token)
self.timer.start()
except Exception as ex:
log.error("Error getting token from Keystone: {0}".format(str(ex.message)))
log.error("Error getting token from Keystone: {0}".
format(str(ex.message)))
raise ex

2
setup.py
View File

@ -112,7 +112,7 @@ setup(
name='mon-agent',
maintainer="Tim Kuhlman",
maintainer_email="tim.kuhlman@hp.com",
version='1.0.2',
version='1.0.3',
description="Collects metrics from the host it is installed on and sends to the monitroing api",
classifiers=[
"Development Status :: 5 - Production/Stable",