saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

Browse source 
Conflicts:
    doc/man/salt.7
    salt/minion.py
    salt/modules/file.py
    salt/returners/carbon_return.py
This commit is contained in:
Colton Myers 2015-07-30 15:31:10 -06:00
commit 93a182d9ea
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
salt/returners/carbon_return.py
View file

@ -23,6 +23,17 @@ 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:
.. code-block:: yaml
@ -32,6 +43,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]
Alternative configuration values can be used by prefacing the configuration.
Any values not found in the alternative configuration will be pulled from
@ -209,6 +221,7 @@ def returner(ret):
host = _options.get('host')
port = _options.get('port')
skip = _options.get('skip')
metric_base_pattern = options.get('carbon.metric_base_pattern')
if 'mode' in _options:
mode = _options.get('mode').lower()
@ -232,7 +245,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)