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

mysql-connector: minor refactor

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-22 21:09:17 +03:00
parent 59bfacccbc
commit 0da9aefccc
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/datasource-zabbix/datasource.js
View File

@@ -175,7 +175,7 @@ class ZabbixAPIDatasource {
// Use history
if (this.enableDirectDBConnection) {
getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo, options)
.then(history => this.zabbix.dbConnector.handleHistory(history, items));
.then(history => this.zabbix.dbConnector.handleGrafanaTSResponse(history, items));
} else {
getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo)
.then(history => responseHandler.handleHistory(history, items));

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

@@ -75,8 +75,8 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
});
}
handleHistory(history, items, addHostName = true) {
return convertHistory(history, items, addHostName);
handleGrafanaTSResponse(history, items, addHostName = true) {
return convertGrafanaTSResponse(history, items, addHostName);
}
invokeSQLQuery(query) {
@@ -115,7 +115,7 @@ angular
///////////////////////////////////////////////////////////////////////////////
function convertHistory(time_series, items, addHostName) {
function convertGrafanaTSResponse(time_series, items, addHostName) {
var hosts = _.uniqBy(_.flatten(_.map(items, 'hosts')), 'hostid'); //uniqBy is needed to deduplicate
let grafanaSeries = _.map(time_series, series => {
let itemid = series.name;