mysql-connector: compact SQL queries

This commit is contained in:
Alexander Zobnin
2017-07-22 21:00:40 +03:00
parent 3795ce564e
commit 59bfacccbc
4 changed files with 16 additions and 1 deletions

View File

@@ -82,6 +82,7 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
var query = '\n SELECT itemid AS metric, clock AS time_sec, ' + aggFunction + '(value) as value\n FROM ' + table + '\n WHERE itemid IN (' + itemids + ')\n AND clock > ' + timeFrom + ' AND clock < ' + timeTill + '\n GROUP BY time_sec DIV ' + intervalSec + ', metric\n ';
query = compactSQLQuery(query);
return _this.invokeSQLQuery(query);
});
@@ -154,3 +155,7 @@ function convertHistory(time_series, items, addHostName) {
return _lodash2.default.sortBy(grafanaSeries, 'target');
}
function compactSQLQuery(query) {
return query.replace(/\s+/g, ' ');
}