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

Fix templated items search.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-05-25 01:49:33 +03:00
parent 0213512e3b
commit 4d89b82de1
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zabbix/datasource.js
View File

@@ -367,16 +367,6 @@ function (angular, _, kbn) {
ZabbixAPIDatasource.prototype.itemFindQuery = function(template) { ZabbixAPIDatasource.prototype.itemFindQuery = function(template) {
var promises = []; var promises = [];
// Get groupids from names
if (template.group != '*' && template.group) {
if (_.isArray(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)) { if (_.isArray(template.host)) {
@@ -387,11 +377,21 @@ function (angular, _, kbn) {
promises.push(this.findZabbixHost(template.host)); promises.push(this.findZabbixHost(template.host));
} }
} }
// Get groupids from names
else if (template.group != '*' && template.group) {
if (_.isArray(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 && !_.isArray(template.app)) {
if (_.isArray(template.app)) { if (_.isArray(template.app)) {
_.each(template.app, function (app) { _.each(template.app, function (app) {
promises.push(this.findZabbixHost(app)); promises.push(this.findZabbixApp(app));
}, this); }, this);
} else { } else {
promises.push(this.findZabbixApp(template.app)); promises.push(this.findZabbixApp(template.app));