iss #30 - Fix problem with All parameters in query editor (All not return any objects).

This commit is contained in:
Alexander Zobnin
2015-06-23 00:02:55 +03:00
parent 78d2e4c7c5
commit 62a4bbf6ee

View File

@@ -463,11 +463,12 @@ function (angular, _, kbn) {
ZabbixAPIDatasource.prototype.findZabbixGroup = function (group) { ZabbixAPIDatasource.prototype.findZabbixGroup = function (group) {
var params = { var params = {
output: ['name'], output: ['name'],
filter: { searchByAny: true
};
if (group != '*') {
params.filter = {
name: group name: group
}, };
searchByAny: true,
searchWildcardsEnabled: true
} }
return this.performZabbixAPIRequest('hostgroup.get', params); return this.performZabbixAPIRequest('hostgroup.get', params);
}; };
@@ -482,12 +483,12 @@ function (angular, _, kbn) {
ZabbixAPIDatasource.prototype.findZabbixHost = function (hostnames) { ZabbixAPIDatasource.prototype.findZabbixHost = function (hostnames) {
var params = { var params = {
output: ['host', 'name'], output: ['host', 'name'],
filter: { searchByAny: true
host: hostnames, };
if (hostnames != '*') {
params.filter = {
name: hostnames name: hostnames
}, };
searchByAny: true,
searchWildcardsEnabled: true
} }
return this.performZabbixAPIRequest('host.get', params); return this.performZabbixAPIRequest('host.get', params);
}; };
@@ -502,12 +503,13 @@ function (angular, _, kbn) {
ZabbixAPIDatasource.prototype.findZabbixApp = function (application) { ZabbixAPIDatasource.prototype.findZabbixApp = function (application) {
var params = { var params = {
output: ['name'], output: ['name'],
filter: { searchByAny: true
name: application
},
searchByAny: true,
searchWildcardsEnabled: true,
} }
if (application != '*') {
params.filter = {
name: application
};
};
return this.performZabbixAPIRequest('application.get', params); return this.performZabbixAPIRequest('application.get', params);
}; };