Handle history response in query builder.

plugins/datasource-zabbix/datasource.js

@@ -9,12 +9,12 @@ define([
   './zabbixCache',
   './queryCtrl'
 ],
-function (angular, _, dateMath, QueryBuilder) {
+function (angular, _, dateMath) {
   'use strict';
 
   /** @ngInject */
   function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv,
-                               ZabbixAPI, zabbixHelperSrv, ZabbixCache) {
+                               ZabbixAPI, zabbixHelperSrv, ZabbixCache, QueryBuilder) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -39,6 +39,8 @@ function (angular, _, dateMath, QueryBuilder) {
     // Initialize query builder
     this.queryBuilder = new QueryBuilder(this.zabbixCache);
 
+    console.log(this.zabbixCache);
+
     ////////////////////////
     // Datasource methods //
     ////////////////////////
@@ -128,19 +130,26 @@ function (angular, _, dateMath, QueryBuilder) {
               alias = templateSrv.replace(target.alias, options.scopedVars);
             }
 
-            var history;
+            // Add hostname for items from multiple hosts
+            var addHostName = target.host.isRegex;
+
+            var getHistory;
             if ((from < useTrendsFrom) && self.trends) {
+
               // Use trends
-              var points = target.downsampleFunction ? target.downsampleFunction.value : "avg";
+              var valueType = target.downsampleFunction ? target.downsampleFunction.value : "avg";
-              history = self.zabbixAPI.getTrends(items, from, to)
+              getHistory = self.zabbixAPI.getTrends(items, from, to).then(function(history) {
-                .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale, points));
+                return self.queryBuilder.handleTrends(history, addHostName, valueType);
+              });
             } else {
+
               // Use history
-              history = self.zabbixAPI.getHistory(items, from, to)
+              getHistory = self.zabbixAPI.getHistory(items, from, to).then(function(history) {
-                .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
+                return self.queryBuilder.handleHistory(history, addHostName);
+              });
             }
 
-            return history.then(function (timeseries) {
+            return getHistory.then(function (timeseries) {
               var timeseries_data = _.flatten(timeseries);
               return _.map(timeseries_data, function (timeseries) {
 

plugins/datasource-zabbix/queryBuilder.js

@@ -6,10 +6,18 @@ define([
 function (angular, _, utils) {
   'use strict';
 
+  var module = angular.module('grafana.services');
+
+  module.factory('QueryBuilder', function() {
+
     function QueryBuilder(zabbixCacheInstance) {
+      var self = this;
 
       this.cache = zabbixCacheInstance;
 
+      /**
+       * Build query - convert target filters to array of Zabbix items
+       */
       this.build = function (groupFilter, hostFilter, appFilter, itemFilter) {
 
         // Find items by item names and perform queries
@@ -120,8 +128,84 @@ function (angular, _, utils) {
         return items;
       };
 
+      /**
+       * Convert Zabbix API history.get response to Grafana format
+       *
+       * @return {Array}            Array of timeseries in Grafana format
+       *                            {
+       *                               target: "Metric name",
+       *                               datapoints: [[<value>, <unixtime>], ...]
+       *                            }
+       */
+      this.convertHistory = function(history, addHostName, convertPointCallback) {
+        /**
+         * Response should be in the format:
+         * data: [
+         *          {
+         *             target: "Metric name",
+         *             datapoints: [[<value>, <unixtime>], ...]
+         *          }, ...
+         *       ]
+         */
+
+        // Group history by itemid
+        var grouped_history = _.groupBy(history, 'itemid');
+
+        return _.map(grouped_history, function(hist, itemid) {
+          var item = self.cache.getItem(itemid);
+          var alias = item.name;
+          if (addHostName) {
+            var host = self.cache.getHost(item.hostid);
+            alias = host.name + ": " + alias;
+          }
+          return {
+            target: alias,
+            datapoints: _.map(hist, convertPointCallback)
+          };
+        });
+      };
+
+      this.handleHistory = function(history, addHostName) {
+        return this.convertHistory(history, addHostName, convertHistoryPoint);
+      };
+
+      this.handleTrends = function(history, addHostName, valueType) {
+        var convertPointCallback = _.partial(convertTrendPoint, valueType);
+        return this.convertHistory(history, addHostName, convertPointCallback);
+      };
+
+      function convertHistoryPoint(point) {
+        // Value must be a number for properly work
+        return [
+          Number(point.value),
+          point.clock * 1000
+        ];
+      }
+
+      function convertTrendPoint(valueType, point) {
+        var value;
+        switch (valueType) {
+          case "min":
+            value = point.value_min;
+            break;
+          case "max":
+            value = point.value_max;
+            break;
+          case "avg":
+            value = point.value_avg;
+            break;
+          default:
+            value = point.value_avg;
+        }
+
+        return [
+          Number(value),
+          point.clock * 1000
+        ];
+      }
     }
 
     return QueryBuilder;
+  });
 
 });

plugins/datasource-zabbix/zabbixAPI.js

@@ -119,11 +119,13 @@ function (angular, _) {
      * Perform history query from Zabbix API
      *
      * @param  {Array}  items       Array of Zabbix item objects
-     * @param  {Number} start Time in seconds
+     * @param  {Number} time_from   Time in seconds
-     * @param  {Number} end   Time in seconds
+     * @param  {Number} time_till   Time in seconds
      * @return {Array}  Array of Zabbix history objects
      */
-    p.getHistory = function(items, start, end) {
+    p.getHistory = function(items, time_from, time_till) {
+      var self = this;
+
       // Group items by value type
       var grouped_items = _.groupBy(items, 'value_type');
 
@@ -136,18 +138,16 @@ function (angular, _) {
           itemids: itemids,
           sortfield: 'clock',
           sortorder: 'ASC',
-          time_from: start
+          time_from: time_from
         };
 
         // Relative queries (e.g. last hour) don't include an end time
-        if (end) {
+        if (time_till) {
-          params.time_till = end;
+          params.time_till = time_till;
         }
 
-        return this.request('history.get', params);
+        return self.request('history.get', params);
-      }, this)).then(function (results) {
+      })).then(_.flatten);
-        return _.flatten(results);
-      });
     };
 
     /**
@@ -155,11 +155,13 @@ function (angular, _) {
      * Use trends api extension from ZBXNEXT-1193 patch.
      *
      * @param  {Array}  items       Array of Zabbix item objects
-     * @param  {Number} start Time in seconds
+     * @param  {Number} time_from   Time in seconds
-     * @param  {Number} end   Time in seconds
+     * @param  {Number} time_till   Time in seconds
      * @return {Array}  Array of Zabbix trend objects
      */
-    p.getTrends = function(items, start, end) {
+    p.getTrends = function(items, time_from, time_till) {
+      var self = this;
+
       // Group items by value type
       var grouped_items = _.groupBy(items, 'value_type');
 
@@ -172,18 +174,16 @@ function (angular, _) {
           itemids: itemids,
           sortfield: 'clock',
           sortorder: 'ASC',
-          time_from: start
+          time_from: time_from
         };
 
         // Relative queries (e.g. last hour) don't include an end time
-        if (end) {
+        if (time_till) {
-          params.time_till = end;
+          params.time_till = time_till;
         }
 
-        return this.request('trend.get', params);
+        return self.request('trend.get', params);
-      }, this)).then(function (results) {
+      })).then(_.flatten);
-        return _.flatten(results);
-      });
     };
 
     p.getITService = function(/* optional */ serviceids) {

plugins/datasource-zabbix/zabbixCache.js

@@ -70,6 +70,14 @@ function (angular, _, utils) {
       return this._items;
     };
 
+    p.getHost = function(hostid) {
+      return _.find(this._hosts, {'hostid': hostid});
+    };
+
+    p.getItem = function(itemid) {
+      return _.find(this._items, {'itemid': itemid});
+    };
+
     /**
      * Convert host.get response to cache format
      * host.groups - array of group ids