Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

mysql-connector: compact SQL queries

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/datasource-zabbix/zabbixDBConnector.js vendored
View File

@@ -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 '; 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); return _this.invokeSQLQuery(query);
}); });
@@ -132,6 +133,10 @@ System.register(['angular', 'lodash'], function (_export, _context) {
return _.sortBy(grafanaSeries, 'target'); return _.sortBy(grafanaSeries, 'target');
} }
function compactSQLQuery(query) {
return query.replace(/\s+/g, ' ');
}
return { return {
setters: [function (_angular) { setters: [function (_angular) {
angular = _angular.default; angular = _angular.default;

2
dist/datasource-zabbix/zabbixDBConnector.js.map vendored
View File

File diff suppressed because one or more lines are too long

5
dist/test/datasource-zabbix/zabbixDBConnector.js vendored
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 '; 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); return _this.invokeSQLQuery(query);
}); });
@@ -154,3 +155,7 @@ function convertHistory(time_series, items, addHostName) {
return _lodash2.default.sortBy(grafanaSeries, 'target'); return _lodash2.default.sortBy(grafanaSeries, 'target');
} }
function compactSQLQuery(query) {
return query.replace(/\s+/g, ' ');
}

5
src/datasource-zabbix/zabbixDBConnector.js
View File

@@ -66,6 +66,7 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
GROUP BY time_sec DIV ${intervalSec}, metric GROUP BY time_sec DIV ${intervalSec}, metric
`; `;
query = compactSQLQuery(query);
return this.invokeSQLQuery(query); return this.invokeSQLQuery(query);
}); });
@@ -133,3 +134,7 @@ function convertHistory(time_series, items, addHostName) {
return _.sortBy(grafanaSeries, 'target'); return _.sortBy(grafanaSeries, 'target');
} }
function compactSQLQuery(query) {
return query.replace(/\s+/g, ' ');
}