Merge branch 'develop'

2015-06-23 00:03:26 +03:00
parent 1ae83702f3 62a4bbf6ee
commit 1bba1d7f2d
1 changed files with 16 additions and 14 deletions
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -463,11 +463,12 @@ function (angular, _, kbn) {
    ZabbixAPIDatasource.prototype.findZabbixGroup = function (group) {
      var params = {
        output: ['name'],
-        filter: {
+        searchByAny: true
+      };
+      if (group != '*') {
+        params.filter = {
          name: group
-        },
-        searchByAny: true,
-        searchWildcardsEnabled: true
+        };
      }
      return this.performZabbixAPIRequest('hostgroup.get', params);
    };
@@ -482,12 +483,12 @@ function (angular, _, kbn) {
    ZabbixAPIDatasource.prototype.findZabbixHost = function (hostnames) {
      var params = {
        output: ['host', 'name'],
-        filter: {
-          host: hostnames,
+        searchByAny: true
+      };
+      if (hostnames != '*') {
+        params.filter = {
          name: hostnames
-        },
-        searchByAny: true,
-        searchWildcardsEnabled: true
+        };
      }
      return this.performZabbixAPIRequest('host.get', params);
    };
@@ -502,12 +503,13 @@ function (angular, _, kbn) {
    ZabbixAPIDatasource.prototype.findZabbixApp = function (application) {
      var params = {
        output: ['name'],
-        filter: {
-          name: application
-        },
-        searchByAny: true,
-        searchWildcardsEnabled: true,
+        searchByAny: true
      }
+      if (application != '*') {
+        params.filter = {
+          name: application
+        };
+      };
      return this.performZabbixAPIRequest('application.get', params);
    };