x/surveil
Code Issues Proposed changes

FIX: InfluxDB query WHERE clause

Browse Source 
Change-Id: I0809b60864dd11b58904cd999d940ccf94446451
This commit is contained in:
Frédéric Vachon 2015-04-27 14:55:46 -04:00
parent 052ac2fde3
commit c2a2b82b82
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
surveil/api/handlers/status/influxdb_query.py
View File

@ -37,6 +37,11 @@ def build_influxdb_query(live_query, measurement, group_by=[], limit=None):
query = ['SELECT * FROM', measurement]
if live_query:
filters = json.loads(live_query.filters)
if filters:
query.append(_build_where_clause(filters))
if group_by:
query.append('GROUP BY')
query.append(', '.join(group_by))
@ -44,11 +49,6 @@ def build_influxdb_query(live_query, measurement, group_by=[], limit=None):
if limit is not None:
query.append('LIMIT %d' % limit)
if live_query:
filters = json.loads(live_query.filters)
if filters:
query.append(_build_where_clause(filters))
return ' '.join(query)

6
surveil/tests/api/controllers/v2/status/test_hosts.py
View File

@ -196,9 +196,9 @@ class TestStatusHosts(functionalTest.FunctionalTest):
self.assertEqual(
httpretty.last_request().querystring['q'],
["SELECT * FROM HOST_STATE GROUP BY host_name, address, childs"
" LIMIT 1 WHERE host_name!='localhost' "
"AND description!='test_keystone'"]
["SELECT * FROM HOST_STATE WHERE host_name!='localhost' "
"AND description!='test_keystone' "
"GROUP BY host_name, address, childs LIMIT 1"]
)
@httpretty.activate