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

Removed OrderedDict usage in InfluxDB execution module, so that it

Browse Source 
doesn't cause unnecessary template rendering errors.
This commit is contained in:
zer0def 2017-02-21 16:13:14 +01:00
parent 2d068462a9
commit c3b3838f10
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/influx.py
View File

@ -667,14 +667,14 @@ def _pull_query_results(resultset):
Parses a ResultSet returned from InfluxDB into a dictionary of results,
grouped by series names and optional JSON-encoded grouping tags.
'''
_results = collections.defaultdict(lambda: collections.OrderedDict())
_results = collections.defaultdict(lambda: {})
for _header, _values in resultset.items():
_header, _group_tags = _header
if _group_tags:
_results[_header][json.dumps(_group_tags)] = [_value for _value in _values]
else:
_results[_header] = [_value for _value in _values]
return _results
return dict(sorted(_results.items()))
def query(database, query, **client_args):