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

Fix panel error when no items returned by templated variable query.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-05-29 00:08:07 +03:00
parent d7ff952761
commit ac84871085
1 changed files with 12 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
zabbix/datasource.js
View File

@@ -64,7 +64,7 @@ function (angular, _, kbn) {
var itemname_pattern = /([^{},]+)/g; var itemname_pattern = /([^{},]+)/g;
var itemnames = itemname.match(itemname_pattern); var itemnames = itemname.match(itemname_pattern);
if (itemnames.length < this.limitmetrics) { if (itemnames && (itemnames.length < this.limitmetrics)) {
// Find items by item names and perform queries // Find items by item names and perform queries
var self = this; var self = this;
return $q.all(_.map(hosts, function (hostname) { return $q.all(_.map(hosts, function (hostname) {
@@ -388,33 +388,15 @@ function (angular, _, kbn) {
// Get hostids from names // Get hostids from names
if (template.host && template.host != '*') { if (template.host && template.host != '*') {
if (_.isArray(template.host)) { promises.push(this.findZabbixHost(template.host));
_.each(template.host, function (host) {
promises.push(this.findZabbixHost(host));
}, this);
} else {
promises.push(this.findZabbixHost(template.host));
}
} }
// Get groupids from names // Get groupids from names
else if (template.group && template.group != '*') { else if (template.group && template.group != '*') {
if (_.isArray(template.group)) { promises.push(this.findZabbixGroup(template.group));
_.each(template.group, function (group) {
promises.push(this.findZabbixGroup(group));
}, this);
} else {
promises.push(this.findZabbixGroup(template.group));
}
} }
// Get applicationids from names // Get applicationids from names
if (template.app && template.app != '*') { if (template.app && template.app != '*') {
if (_.isArray(template.app)) { promises.push(this.findZabbixApp(template.app));
_.each(template.app, function (app) {
promises.push(this.findZabbixApp(app));
}, this);
} else {
promises.push(this.findZabbixApp(template.app));
}
} }
var self = this; var self = this;
@@ -460,24 +442,12 @@ function (angular, _, kbn) {
var promises = []; var promises = [];
// Get groupids from names // Get groupids from names
if (template.group != '*' && template.group) { if (template.group && template.group != '*') {
if (_.isArray(template.group)) { promises.push(this.findZabbixGroup(template.group));
_.each(template.group, function (group) {
promises.push(this.findZabbixGroup(group));
}, this);
} else {
promises.push(this.findZabbixGroup(template.group));
}
} }
// Get hostids from names // Get hostids from names
if (template.host != '*' && template.host) { if (template.host && template.host != '*') {
if (_.isArray(template.host)) { promises.push(this.findZabbixHost(template.host));
_.each(template.host, function (host) {
promises.push(this.findZabbixHost(host));
}, this);
} else {
promises.push(this.findZabbixHost(template.host));
}
} }
var self = this; var self = this;
@@ -517,18 +487,12 @@ function (angular, _, kbn) {
var promises = []; var promises = [];
// Get groupids from names // Get groupids from names
if (template.group != '*' && template.group) { if (template.group && template.group != '*') {
if (_.isArray(template.group)) { promises.push(this.findZabbixGroup(template.group));
_.each(template.group, function (group) {
promises.push(this.findZabbixGroup(group));
}, this);
} else {
promises.push(this.findZabbixGroup(template.group));
}
} }
var self = this; var self = this;
return $q.all(promises).then(function (results) { return this.findZabbixGroup(template.group).then(function (results) {
results = _.flatten(results); results = _.flatten(results);
var groupids = _.map(_.filter(results, function (object) { var groupids = _.map(_.filter(results, function (object) {
return object.groupid; return object.groupid;
@@ -556,19 +520,8 @@ function (angular, _, kbn) {
ZabbixAPIDatasource.prototype.groupFindQuery = function(template) { ZabbixAPIDatasource.prototype.groupFindQuery = function(template) {
var promises = [];
// Get groupids from names
if (_.isArray(template.group)) {
_.each(template.group, function (group) {
promises.push(this.findZabbixGroup(group));
}, this);
} else {
promises.push(this.findZabbixGroup(template.group));
}
var self = this; var self = this;
return $q.all(promises).then(function (results) { return this.findZabbixGroup(template.group).then(function (results) {
results = _.flatten(results); results = _.flatten(results);
var groupids = _.map(_.filter(results, function (object) { var groupids = _.map(_.filter(results, function (object) {
return object.groupid; return object.groupid;