valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7822 from mgwilliams/carbon-return

Browse Source 
carbon-returner: make it more flexible
This commit is contained in:
David Boucha 2013-10-14 12:56:37 -07:00
commit 7790d914f5
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/returners/carbon_return.py
View File

@ -15,6 +15,7 @@ import socket
import logging
import time
import struct
import collections
log = logging.getLogger(__name__)
@ -44,6 +45,20 @@ def _send_picklemetrics(metrics, carbon_sock):
logging.debug('Sent {0} bytes to carbon'.format(sent_bytes))
def _walk(path, value, metrics, timestamp):
if isinstance(value, collections.Mapping):
for key, val in value.items():
_walk('{0}.{1}'.format(path, key), val, metrics, timestamp)
else:
try:
val = float(value)
metrics.append((path, val, timestamp))
except TypeError:
raise
log.info('Error in carbon returner, when trying to'
'convert metric:{0}, with val:{1}'.format(path, val))
def returner(ret):
'''
Return data to a remote carbon server using the text metric protocol
@ -75,14 +90,8 @@ def returner(ret):
if not metric_base.startswith('virt.'):
metric_base += '.' + _formatHostname(ret['id'])
metrics = []
for name, vals in saltdata.items():
for key, val in vals.items():
# XXX: force datatype, needs typechecks, etc
try:
val = float(val)
metrics.append((metric_base + '.' + _formatHostname(name) + '.' + key, val, timestamp))
except TypeError:
log.info('Error in carbon returner, when trying to convert metric:{0}, with val:{1}'.format(key, val))
_walk(metric_base, saltdata, metrics, timestamp)
def _send_textmetrics(metrics):
''' Use text protorocol to send metric over socket '''
@ -97,7 +106,7 @@ def returner(ret):
if sent_bytes == 0:
log.error('Bytes sent 0, Connection reset?')
return
logging.debug('Sent {0} bytes to carbon'.format(sent_bytes))
log.debug('Sent {0} bytes to carbon'.format(sent_bytes))
total_sent_bytes += sent_bytes