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

Fixed #23 - aliases don't work.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-06-24 22:14:58 +03:00
parent 62a4bbf6ee
commit ef5211cf06
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zabbix/datasource.js
View File

@@ -123,10 +123,10 @@ function (angular, _, kbn) {
if ((from < useTrendsFrom) && self.trends) { if ((from < useTrendsFrom) && self.trends) {
return self.getTrends(items, from, to) return self.getTrends(items, from, to)
.then(_.partial(self.handleTrendResponse, items, target.scale)); .then(_.partial(self.handleTrendResponse, items, target.alias, target.scale));
} else { } else {
return self.performTimeSeriesQuery(items, from, to) return self.performTimeSeriesQuery(items, from, to)
.then(_.partial(self.handleHistoryResponse, items, target.scale)); .then(_.partial(self.handleHistoryResponse, items, target.alias, target.scale));
} }
} }
}); });
@@ -203,7 +203,7 @@ function (angular, _, kbn) {
}; };
ZabbixAPIDatasource.prototype.handleTrendResponse = function(items, scale, trends) { ZabbixAPIDatasource.prototype.handleTrendResponse = function(items, alias, scale, trends) {
// Group items and trends by itemid // Group items and trends by itemid
var indexed_items = _.indexBy(items, 'itemid'); var indexed_items = _.indexBy(items, 'itemid');
@@ -227,7 +227,13 @@ function (angular, _, kbn) {
}; };
return series; return series;
})).then(function (result) { })).then(function (result) {
// Add alias or sort targets
if (result.length == 1) {
result[0].target = alias;
return result;
} else {
return _.sortBy(result, 'target'); return _.sortBy(result, 'target');
}
}); });
}; };
@@ -244,7 +250,7 @@ function (angular, _, kbn) {
* datapoints: [[<value>, <unixtime>], ...] * datapoints: [[<value>, <unixtime>], ...]
* } * }
*/ */
ZabbixAPIDatasource.prototype.handleHistoryResponse = function(items, scale, history) { ZabbixAPIDatasource.prototype.handleHistoryResponse = function(items, alias, scale, history) {
/** /**
* Response should be in the format: * Response should be in the format:
* data: [ * data: [
@@ -281,7 +287,13 @@ function (angular, _, kbn) {
}; };
return series; return series;
})).then(function (result) { })).then(function (result) {
// Add alias or sort targets
if (result.length == 1) {
result[0].target = alias;
return result;
} else {
return _.sortBy(result, 'target'); return _.sortBy(result, 'target');
}
}); });
}; };