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

Fix query editor for work with templated variables.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-05-30 20:54:03 +03:00
parent 81f10ea6a9
commit 46c9fa90be
3 changed files with 41 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zabbix/datasource.js
View File

@@ -49,7 +49,7 @@ function (angular, _, kbn) {
name: target.alias
}];
return this.performTimeSeriesQuery(item, from, to).then(_.partial(
this.handleZabbixAPIResponse, alias));
this.handleHistoryResponse, alias));
} else {
// Handle templated target
@@ -73,13 +73,14 @@ function (angular, _, kbn) {
var self = this;
return $q.all(_.map(hosts, function (hostname) {
if (hosts.length > 1) {
// Select the host that the item belongs for multiple hosts request
var selectHosts = true;
}
return this.findZabbixItem(hostname, itemnames, selectHosts);
}, this)).then(function (items) {
items = _.flatten(items);
return self.performTimeSeriesQuery(items, from, to)
.then(_.partial(self.handleZabbixAPIResponse, items));
.then(_.partial(self.handleHistoryResponse, items));
});
} else {
return [];
@@ -127,7 +128,7 @@ function (angular, _, kbn) {
// Convert Zabbix API data to Grafana format
ZabbixAPIDatasource.prototype.handleZabbixAPIResponse = function(items, response) {
ZabbixAPIDatasource.prototype.handleHistoryResponse = function(items, response) {
/**
* Response should be in the format:
* data: [