Changes from grafana-1.9 branch.

zabbix/datasource.js

@@ -30,9 +30,11 @@ function (angular, _, kbn) {
       // get from & to in seconds
       var from = kbn.parseDate(options.range.from).getTime();
       var to = kbn.parseDate(options.range.to).getTime();
+
       // Need for find target alias
       var targets = options.targets;
 
+      // TODO: remove undefined targets from request
       // Check that all targets defined
       var targetsDefined = options.targets.every(function (target, index, array) {
         return target.item;
@@ -41,7 +43,6 @@ function (angular, _, kbn) {
         // Extract zabbix api item objects from targets
         var target_items = _.map(options.targets, 'item');
       } else {
-
         // No valid targets, return the empty dataset
         var d = $q.defer();
         d.resolve({ data: [] });
@@ -51,20 +52,7 @@ function (angular, _, kbn) {
       from = Math.ceil(from/1000);
       to = Math.ceil(to/1000);
 
-      var performedQuery;
+      return this.performTimeSeriesQuery(target_items, from, to).then(function (response) {
-
-      // Check authorization first
-      if (!this.auth) {
-        var self = this;
-        performedQuery = this.performZabbixAPILogin().then(function (response) {
-          self.auth = response;
-          return self.performTimeSeriesQuery(target_items, from, to);
-        });
-      } else {
-        performedQuery = this.performTimeSeriesQuery(target_items, from, to);
-      }
-
-      return performedQuery.then(function (response) {
         /**
          * Response should be in the format:
          * data: [
@@ -80,9 +68,7 @@ function (angular, _, kbn) {
          */
 
         // Index returned datapoints by item/metric id
-        var indexed_result = _.groupBy(response.data.result, function (history_item) {
+        var indexed_result = _.groupBy(response, 'itemid');
-          return history_item.itemid;
-        });
 
         // Reduce timeseries to the same size for stacking and tooltip work properly
         var min_length = _.min(_.map(indexed_result, function (history) {
@@ -128,43 +114,109 @@ function (angular, _, kbn) {
     ///////////////////////////////////////////////////////////////////////
 
 
+    // Request data from Zabbix API
+    ZabbixAPIDatasource.prototype.doZabbixAPIRequest = function(request_data) {
+      var options = {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        url: this.url,
+        data: request_data
+      };
+
+      var performedQuery;
+
+      // Check authorization first
+      if (!this.auth) {
+        var self = this;
+        performedQuery = this.performZabbixAPILogin().then(function (response) {
+          self.auth = response;
+          options.data.auth = response;
+          return $http(options);
+        });
+      } else {
+        performedQuery = $http(options);
+      }
+
+      // Handle response
+      return performedQuery.then(function (response) {
+        if (!response.data) {
+          return [];
+        }
+        return response.data.result;
+      });
+    };
+
+
     /**
      * Perform time series query to Zabbix API
      *
      * @param items: array of zabbix api item objects
      */
     ZabbixAPIDatasource.prototype.performTimeSeriesQuery = function(items, start, end) {
-      var item_ids = items.map(function (item, index, array) {
+
-        return item.itemid;
+      // Group items by value type for separate requests
-      });
+      var items_by_value_type = _.groupBy(items, 'value_type');
-      // TODO: if different value types passed?
+
-      //       Perform multiple api request.
+      var self = this;
-      var hystory_type = items[0].value_type;
+      var apiRequests = [];
-      var options = {
+
-        method: 'POST',
+      // Prepare requests for each value type
-        url: this.url,
+      _.each(items_by_value_type, function (value, key, list) {
-        data: {
+        var item_ids = _.map(value, 'itemid');
+        var history_type = key;
+        var data = {
           jsonrpc: '2.0',
           method: 'history.get',
           params: {
             output: 'extend',
-              history: hystory_type,
+            history: history_type,
             itemids: item_ids,
             sortfield: 'clock',
             sortorder: 'ASC',
-              limit: this.limitmetrics,
+            limit: self.limitmetrics,
             time_from: start,
           },
-          auth: this.auth,
+          auth: self.auth,
           id: 1
-        },
         };
+
         // Relative queries (e.g. last hour) don't include an end time
         if (end) {
-        options.data.params.time_till = end;
+          data.params.time_till = end;
         }
 
-      return $http(options);
+        apiRequests.push(self.doZabbixAPIRequest(data));
+      });
+
+      return this.handleMultipleRequest(apiRequests);
+    };
+
+
+    // Handle multiple request
+    ZabbixAPIDatasource.prototype.handleMultipleRequest = function(apiRequests) {
+      var history = [];
+      var performedQuery = null;
+
+      // Build chain of api requests and put all history data into single array
+      _.each(apiRequests, function (apiRequest) {
+        if(!performedQuery) {
+          performedQuery = apiRequest.then(function (response) {
+            history = history.concat(response);
+            return history;
+          });
+        } else {
+          performedQuery = performedQuery.then(function () {
+            return apiRequest.then(function (response) {
+              history = history.concat(response);
+              return history;
+            });
+          });
+        }
+      });
+
+      return performedQuery;
     };
 
 
@@ -184,6 +236,7 @@ function (angular, _, kbn) {
           id: 1
         },
       };
+
       return $http(options).then(function (result) {
         if (!result.data) {
           return null;
@@ -195,35 +248,25 @@ function (angular, _, kbn) {
 
     // Get the list of host groups
     ZabbixAPIDatasource.prototype.performHostGroupSuggestQuery = function() {
-      var options = {
+      var data = {
-        url : this.url,
-        method : 'POST',
-        data: {
         jsonrpc: '2.0',
         method: 'hostgroup.get',
         params: {
           output: ['name'],
+          real_hosts: true, //Return only host groups that contain hosts
           sortfield: 'name'
         },
         auth: this.auth,
         id: 1
-        },
       };
-      return $http(options).then(function (result) {
+
-        if (!result.data) {
+      return this.doZabbixAPIRequest(data);
-          return [];
-        }
-        return result.data.result;
-      });
     };
 
 
     // Get the list of hosts
     ZabbixAPIDatasource.prototype.performHostSuggestQuery = function(groupid) {
-      var options = {
+      var data = {
-        url : this.url,
-        method : 'POST',
-        data: {
         jsonrpc: '2.0',
         method: 'host.get',
         params: {
@@ -232,26 +275,18 @@ function (angular, _, kbn) {
         },
         auth: this.auth,
         id: 1
-        },
       };
       if (groupid) {
-        options.data.params.groupids = groupid;
+        data.params.groupids = groupid;
       }
-      return $http(options).then(function (result) {
+
-        if (!result.data) {
+      return this.doZabbixAPIRequest(data);
-          return [];
-        }
-        return result.data.result;
-      });
     };
 
 
     // Get the list of applications
     ZabbixAPIDatasource.prototype.performAppSuggestQuery = function(hostid) {
-      var options = {
+      var data = {
-        url : this.url,
-        method : 'POST',
-        data: {
         jsonrpc: '2.0',
         method: 'application.get',
         params: {
@@ -261,44 +296,35 @@ function (angular, _, kbn) {
         },
         auth: this.auth,
         id: 1
-        },
       };
-      return $http(options).then(function (result) {
+
-        if (!result.data) {
+      return this.doZabbixAPIRequest(data);
-          return [];
-        }
-        return result.data.result;
-      });
     };
 
 
     // Get the list of host items
     ZabbixAPIDatasource.prototype.performItemSuggestQuery = function(hostid, applicationid) {
-      var options = {
+      var data = {
-        url : this.url,
-        method : 'POST',
-        data: {
         jsonrpc: '2.0',
         method: 'item.get',
         params: {
           output: ['name', 'key_', 'value_type', 'delay'],
           sortfield: 'name',
-            hostids: hostid
+          hostids: hostid,
+          webitems: true, //Include web items in the result
+          filter: {
+            value_type: [0,3]
+          }
         },
         auth: this.auth,
         id: 1
-        },
       };
       // If application selected return only relative items
       if (applicationid) {
-        options.data.params.applicationids = applicationid;
+        data.params.applicationids = applicationid;
       }
-      return $http(options).then(function (result) {
+
-        if (!result.data) {
+      return this.doZabbixAPIRequest(data);
-          return [];
-        }
-        return result.data.result;
-      });
     };