mysql-connector: compact SQL queries
This commit is contained in:
5
dist/datasource-zabbix/zabbixDBConnector.js
vendored
5
dist/datasource-zabbix/zabbixDBConnector.js
vendored
@@ -62,6 +62,7 @@ System.register(['angular', 'lodash'], function (_export, _context) {
|
||||
|
||||
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);
|
||||
});
|
||||
|
||||
@@ -132,6 +133,10 @@ System.register(['angular', 'lodash'], function (_export, _context) {
|
||||
|
||||
return _.sortBy(grafanaSeries, 'target');
|
||||
}
|
||||
|
||||
function compactSQLQuery(query) {
|
||||
return query.replace(/\s+/g, ' ');
|
||||
}
|
||||
return {
|
||||
setters: [function (_angular) {
|
||||
angular = _angular.default;
|
||||
|
||||
Reference in New Issue
Block a user