valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the ability to specify a base pattern for metrics path used by the carbon returner

Browse Source
This commit is contained in:
Metin OSMAN 2015-07-23 13:13:01 +02:00
parent 9634351fc2
commit f8b2f8079f
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
doc/man/salt.7
View File

@ -108465,6 +108465,44 @@ carbon.mode: pickle
.UNINDENT
.UNINDENT
.sp
You can also specify the pattern used for the metric base path (except for virt modules metrics):
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
carbon.metric_base_pattern: carbon.[minion_id].[module].[function]
.ft P
.fi
.UNINDENT
.UNINDENT
.sp
These tokens can used :
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
[module]: salt module
[function]: salt function
[minion_id]: minion id
.ft P
.fi
.UNINDENT
.UNINDENT
.sp
Default is :
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
carbon.metric_base_pattern: [module].[function].[minion_id]
.ft P
.fi
.UNINDENT
.UNINDENT
.sp
Carbon settings may also be configured as:
.INDENT 0.0
.INDENT 3.5
@ -108476,6 +108514,7 @@ Carbon settings may also be configured as:
port: <carbon port>
skip_on_error: True
mode: (pickle|text)
metric_base_pattern: <pattern> | [module].[function].[minion_id]
To use the carbon returner, append \(aq\-\-return carbon\(aq to the salt command. ex:

23
salt/returners/carbon_return.py
View File

@ -17,6 +17,18 @@ the pickle protocol, set ``carbon.mode`` to ``pickle``::
carbon.mode: pickle
You can also specify the pattern used for the metric base path (except for virt modules metrics):
carbon.metric_base_pattern: carbon.[minion_id].[module].[function]
These tokens can used :
[module]: salt module
[function]: salt function
[minion_id]: minion id
Default is :
carbon.metric_base_pattern: [module].[function].[minion_id]
Carbon settings may also be configured as::
carbon:
@ -24,6 +36,7 @@ Carbon settings may also be configured as::
port: <carbon port>
skip_on_error: True
mode: (pickle|text)
metric_base_pattern: <pattern> | [module].[function].[minion_id]
To use the carbon returner, append '--return carbon' to the salt command. ex:
@ -163,12 +176,14 @@ def returner(ret):
port = c_cfg.get('port', cfg('carbon.port', None))
skip = c_cfg.get('skip_on_error', cfg('carbon.skip_on_error', False))
mode = c_cfg.get('mode', cfg('carbon.mode', 'text')).lower()
metric_base_pattern = c_cfg.get('metric_base_pattern', cfg('carbon.metric_base_pattern', None))
else:
cfg = __opts__
host = cfg.get('cabon.host', None)
port = cfg.get('cabon.port', None)
skip = cfg.get('carbon.skip_on_error', False)
mode = cfg.get('carbon.mode', 'text').lower()
metric_base_pattern = cfg('carbon.metric_base_pattern', None)
log.debug('Carbon minion configured with host: {0}:{1}'.format(host, port))
log.debug('Using carbon protocol: {0}'.format(mode))
@ -190,7 +205,13 @@ def returner(ret):
# module since then we will get stable metric bases even if the VM is
# migrate from host to host
if not metric_base.startswith('virt.'):
metric_base += '.' + ret['id'].replace('.', '_')
minion_id = ret['id'].replace('.', '_')
if metric_base_pattern is not None:
[module, function] = ret['fun'].split('.')
metric_base = metric_base_pattern.replace("[module]", module).replace("[function]", function).replace("[minion_id]", minion_id)
else:
metric_base += '.' + minion_id
log.debug('Carbon metric_base : %s', metric_base)
metrics = []
_walk(metric_base, saltdata, metrics, timestamp, skip)