From 48816ecccb771f02ef93f6b72c977e2002bf2a36 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 16 Jan 2016 20:35:11 +0300
Subject: [PATCH 01/58] Fixed linter errors.

---
 plugins/datasource-zabbix/datasource.js     | 1 +
 plugins/datasource-zabbix/zabbixCacheSrv.js | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 0cf5c94..e4b4467 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -34,6 +34,7 @@ function (angular, _, dateMath) {
 
     // Initialize cache service
     this.zabbixCache = new ZabbixCache(this.zabbixAPI);
+    console.log(this.zabbixCache);
 
     /**
      * Test connection to Zabbix API
diff --git a/plugins/datasource-zabbix/zabbixCacheSrv.js b/plugins/datasource-zabbix/zabbixCacheSrv.js
index d65212a..0c6aed1 100644
--- a/plugins/datasource-zabbix/zabbixCacheSrv.js
+++ b/plugins/datasource-zabbix/zabbixCacheSrv.js
@@ -7,11 +7,9 @@ function (angular, _) {
 
   var module = angular.module('grafana.services');
 
-  module.factory('ZabbixCache', function($q, backendSrv) {
+  module.factory('ZabbixCache', function($q) {
 
     function ZabbixCache(zabbixAPI, lifetime) {
-      var self = this;
-
       this.zabbixAPI = zabbixAPI;
       this.lifetime = lifetime;
 

From d9bc27c4afd77d726899b083c426c53f682598db Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 16 Jan 2016 21:16:22 +0300
Subject: [PATCH 02/58] Working on new query editor - changed dropdown to input
 with autocomplete.

---
 .../partials/query.editor.html                | 111 ++++++------------
 plugins/datasource-zabbix/queryCtrl.js        |  45 +++++--
 plugins/datasource-zabbix/zabbixCacheSrv.js   |  18 ++-
 3 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index 383d965..7682311 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -76,7 +76,7 @@
 
   <ul class="tight-form-list" role="menu" ng-hide="target.mode == 1">
     <!-- Alias -->
-    <li ng-hide="target.mode == 2">
+    <li>
       <input type="text"
              class="tight-form-input input-medium"
              ng-model="target.alias"
@@ -84,52 +84,31 @@
              placeholder="Alias"
              ng-blur="targetBlur()">
     </li>
+
     <!-- Select Host Group -->
     <li class="tight-form-item input-small" style="width: 5em">Group</li>
     <li>
-      <select class="tight-form-input input-large"
-              ng-change="selectHostGroup()"
-              ng-model="target.group"
-              bs-tooltip="target.group.name.length > 25 ? target.group.name : ''"
-              ng-options="group.visible_name ? group.visible_name : group.name for group in metric.groupList track by group.name">
-        <option value="">-- Select host group --</option>
-      </select>
-      <a bs-tooltip="target.errors.metric"
-         style="color: rgb(229, 189, 28)"
-         ng-show="target.errors.metric">
-        <i class="fa fa-warning"></i>
-      </a>
+      <input type="text"
+        ng-model="target.groupFilter"
+        bs-typeahead="getGroupNames"
+        ng-blur="render()"
+        data-min-length=0
+        data-items=100
+        class="input-medium tight-form-input" >
     </li>
+
     <!-- Select Host -->
     <li class="tight-form-item input-small" style="width: 3em">Host</li>
     <li>
-      <select class="tight-form-input input-large"
-              ng-change="selectHost()"
-              ng-model="target.host"
-              bs-tooltip="target.host.name.length > 25 ? target.host.name : ''"
-              ng-options="host.visible_name ? host.visible_name : host.name for host in metric.hostList track by host.name">
-        <option value="">-- Select host --</option>
-      </select>
-      <a bs-tooltip="target.errors.metric"
-         style="color: rgb(229, 189, 28)"
-         ng-show="target.errors.metric">
-        <i class="icon-warning-sign"></i>
-      </a>
-    </li>
-    <!-- Host filter -->
-    <li class="tight-form-item" ng-hide="target.mode == 2">
-      Filter
-      <i class="fa fa-question-circle"
-         bs-tooltip="'Filtering hosts by regex. Select All in items and specify regex for host names.'"></i>
-    </li>
-    <li ng-hide="target.mode == 2">
       <input type="text"
-             class="tight-form-input input-large"
-             ng-model="target.hostFilter"
-             spellcheck='false'
-             placeholder="Host filter (regex)"
-             ng-blur="targetBlur()">
+        ng-model="target.hostFilter"
+        bs-typeahead="getHostNames"
+        ng-blur="render()"
+        data-min-length=0
+        data-items=100
+        class="input-large tight-form-input" >
     </li>
+
     <!-- Downsampling function -->
     <li class="tight-form-item input-medium" ng-hide="target.mode == 2">
       Downsampling
@@ -154,54 +133,32 @@
 
 <div class="tight-form" ng-hide="target.mode == 1">
   <ul class="tight-form-list" role="menu">
-    <li class="tight-form-item" style="width: 44px">&nbsp</li>
+    <li class="tight-form-item" style="width: 194px">&nbsp</li>
 
     <!-- Select Application -->
     <li class="tight-form-item input-small" style="width: 5em">Application</li>
     <li>
-      <select class="tight-form-input input-large"
-              ng-change="selectApplication()"
-              ng-model="target.application"
-              bs-tooltip="target.application.name.length > 15 ? target.application.name : ''"
-              ng-options="app.visible_name ? app.visible_name : app.name for app in metric.applicationList track by app.name">
-        <option value="">-- Select application --</option>
-      </select>
-      <a bs-tooltip="target.errors.metric"
-         style="color: rgb(229, 189, 28)"
-         ng-show="target.errors.metric">
-        <i class="icon-warning-sign"></i>
-      </a>
+      <input type="text"
+        ng-model="target.applicationFilter"
+        bs-typeahead="getApplicationNames"
+        ng-blur="render()"
+        data-min-length=0
+        data-items=100
+        class="input-medium tight-form-input" >
     </li>
+
     <!-- Select Item -->
     <li class="tight-form-item input-small" style="width: 3em">Item</li>
     <li>
-      <select class="tight-form-input input-large"
-              ng-change="selectItem()"
-              ng-model="target.item"
-              bs-tooltip="target.item.name.length > 25 ? target.item.name : ''"
-              ng-options="item.name for item in metric.itemList track by item.name">
-        <option value="">-- Select item --</option>
-      </select>
-      <a bs-tooltip="target.errors.metric"
-         style="color: rgb(229, 189, 28)"
-         ng-show="target.errors.metric">
-        <i class="icon-warning-sign"></i>
-      </a>
-    </li>
-    <!-- Item filter -->
-    <li class="tight-form-item" ng-hide="target.mode == 2">
-      Filter
-      <i class="fa fa-question-circle"
-         bs-tooltip="'Filtering items by regex. Select All in items and specify regex for item names.'"></i>
-    </li>
-    <li ng-hide="target.mode == 2">
       <input type="text"
-             class="tight-form-input input-large"
-             ng-model="target.itemFilter"
-             spellcheck='false'
-             placeholder="Item filter (regex)"
-             ng-blur="targetBlur()">
+        ng-model="target.itemFilter"
+        bs-typeahead="getItemNames"
+        ng-blur="render()"
+        data-min-length=0
+        data-items=100
+        class="input-large tight-form-input" >
     </li>
+
     <!-- Scale -->
     <li class="tight-form-item" ng-hide="target.mode == 2">
       Scale
@@ -220,7 +177,7 @@
 
   <div class="clearfix"></div>
 </div>
-<div class="tight-form" ng-hide="target.mode == 1">
+<div class="tight-form" ng-show="target.mode == 2">
   <ul class="tight-form-list" role="menu">
     <li class="tight-form-item" style="width: 44px">&nbsp</li>
     <!-- Text metric regex -->
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index e3cd929..68c286a 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -11,8 +11,12 @@ define([
 
     module.controller('ZabbixAPIQueryCtrl', function ($scope, $sce, templateSrv, zabbixHelperSrv) {
 
+      var zabbixCache = $scope.datasource.zabbixCache;
+
       $scope.init = function () {
         $scope.targetLetters = targetLetters;
+        $scope.metric = {};
+
         if (!$scope.target.mode || $scope.target.mode !== 1) {
           $scope.downsampleFunctionList = [
             {name: "avg", value: "avg"},
@@ -24,20 +28,22 @@ define([
           if (!$scope.target.downsampleFunction) {
             $scope.target.downsampleFunction = $scope.downsampleFunctionList[0];
           }
-          if (!$scope.metric) {
-            $scope.metric = {
-              hostGroupList: [],
-              hostList: [{name: '*', visible_name: 'All'}],
-              applicationList: [{name: '*', visible_name: 'All'}],
-              itemList: [{name: 'All'}]
-            };
+
+          if (zabbixCache._initialized) {
+            $scope.getMetricsFromCache();
+            console.log("Cached", $scope.metric);
+          } else {
+            zabbixCache.refresh().then(function () {
+              $scope.getMetricsFromCache();
+              console.log("From server", $scope.metric);
+            });
           }
 
           // Update host group, host, application and item lists
-          $scope.updateGroupList();
+          /*$scope.updateGroupList();
           $scope.updateHostList();
           $scope.updateAppList();
-          $scope.updateItemList();
+          $scope.updateItemList();*/
 
           setItemAlias();
         }
@@ -56,11 +62,32 @@ define([
         $scope.target.errors = validateTarget($scope.target);
       };
 
+      $scope.getMetricsFromCache = function () {
+        $scope.metric = {
+          groupList: zabbixCache.getGroups(),
+          hostList: zabbixCache.getHosts(),
+          applicationList: zabbixCache.getApplications(),
+          itemList: zabbixCache.getItems()
+        };
+      };
+
+      // Get list of metric names for bs-typeahead directive
+      function getMetricNames(scope, metricList) {
+        return _.map(scope.metric[metricList], 'name');
+      }
+
+      // Map functions
+      $scope.getGroupNames = _.partial(getMetricNames, $scope, 'groupList');
+      $scope.getHostNames = _.partial(getMetricNames, $scope, 'hostList');
+      $scope.getApplicationNames = _.partial(getMetricNames, $scope, 'applicationList');
+      $scope.getItemNames = _.partial(getMetricNames, $scope, 'itemList');
+
       /**
        * Switch query editor to specified mode.
        * Modes:
        *  0 - items
        *  1 - IT services
+       *  2 - Text metrics
        */
       $scope.switchEditorMode = function (mode) {
         $scope.target.mode = mode;
diff --git a/plugins/datasource-zabbix/zabbixCacheSrv.js b/plugins/datasource-zabbix/zabbixCacheSrv.js
index 0c6aed1..3585e27 100644
--- a/plugins/datasource-zabbix/zabbixCacheSrv.js
+++ b/plugins/datasource-zabbix/zabbixCacheSrv.js
@@ -10,15 +10,21 @@ function (angular, _) {
   module.factory('ZabbixCache', function($q) {
 
     function ZabbixCache(zabbixAPI, lifetime) {
+      var self = this;
+
       this.zabbixAPI = zabbixAPI;
       this.lifetime = lifetime;
 
-      this._groups        = [];
-      this._hosts         = [];
-      this._applications  = [];
-      this._items         = [];
+      this._groups        = undefined;
+      this._hosts         = undefined;
+      this._applications  = undefined;
+      this._items         = undefined;
 
-      this.refresh();
+      this._initialized = undefined;
+
+      this.refresh().then(function () {
+        self._initialized = true;
+      });
     }
 
     var p = ZabbixCache.prototype;
@@ -32,7 +38,7 @@ function (angular, _) {
         this.zabbixAPI.getItems()
       ];
 
-      $q.all(promises).then(function (results) {
+      return $q.all(promises).then(function (results) {
         if (results.length) {
           self._groups = results[0];
 

From bd60d2e264cc4af80efe2bc677a3b915f84693c8 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 16 Jan 2016 22:53:40 +0300
Subject: [PATCH 03/58] Show only unique values and expand item names in
 bs-typeahead.

---
 plugins/datasource-zabbix/queryCtrl.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 68c286a..adb00b3 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -73,14 +73,20 @@ define([
 
       // Get list of metric names for bs-typeahead directive
       function getMetricNames(scope, metricList) {
-        return _.map(scope.metric[metricList], 'name');
+        return _.uniq(_.map(scope.metric[metricList], 'name'));
       }
 
       // Map functions
       $scope.getGroupNames = _.partial(getMetricNames, $scope, 'groupList');
       $scope.getHostNames = _.partial(getMetricNames, $scope, 'hostList');
       $scope.getApplicationNames = _.partial(getMetricNames, $scope, 'applicationList');
-      $scope.getItemNames = _.partial(getMetricNames, $scope, 'itemList');
+
+      $scope.getItemNames = function () {
+        var expandedItems = _.map($scope.metric.itemList, function (item) {
+          return zabbixHelperSrv.expandItemName(item);
+        });
+        return _.uniq(expandedItems);
+      };
 
       /**
        * Switch query editor to specified mode.

From 7a73449828d307a4c40995a83d75f3e6b610424d Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 17 Jan 2016 13:45:55 +0300
Subject: [PATCH 04/58] Cache service refactoring.

---
 plugins/datasource-zabbix/queryCtrl.js      |  8 +--
 plugins/datasource-zabbix/utils.js          | 32 +++++++++++
 plugins/datasource-zabbix/zabbixCacheSrv.js | 64 ++++++++++++++-------
 3 files changed, 77 insertions(+), 27 deletions(-)
 create mode 100644 plugins/datasource-zabbix/utils.js

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index adb00b3..f9cc3dd 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -80,13 +80,7 @@ define([
       $scope.getGroupNames = _.partial(getMetricNames, $scope, 'groupList');
       $scope.getHostNames = _.partial(getMetricNames, $scope, 'hostList');
       $scope.getApplicationNames = _.partial(getMetricNames, $scope, 'applicationList');
-
-      $scope.getItemNames = function () {
-        var expandedItems = _.map($scope.metric.itemList, function (item) {
-          return zabbixHelperSrv.expandItemName(item);
-        });
-        return _.uniq(expandedItems);
-      };
+      $scope.getItemNames = _.partial(getMetricNames, $scope, 'itemList');
 
       /**
        * Switch query editor to specified mode.
diff --git a/plugins/datasource-zabbix/utils.js b/plugins/datasource-zabbix/utils.js
new file mode 100644
index 0000000..8a73482
--- /dev/null
+++ b/plugins/datasource-zabbix/utils.js
@@ -0,0 +1,32 @@
+define([
+  'angular',
+  'lodash'
+],
+function (angular, _) {
+  'use strict';
+
+  var module = angular.module('grafana.services');
+
+  module.service('Utils', function() {
+
+    /**
+     * Expand Zabbix item name
+     *
+     * @param  {string} name item name, ie "CPU $2 time"
+     * @param  {string} key  item key, ie system.cpu.util[,system,avg1]
+     * @return {string}      expanded name, ie "CPU system time"
+     */
+    this.expandItemName = function(name, key) {
+
+      // extract params from key:
+      // "system.cpu.util[,system,avg1]" --> ["", "system", "avg1"]
+      var key_params = key.substring(key.indexOf('[') + 1, key.lastIndexOf(']')).split(',');
+
+      // replace item parameters
+      for (var i = key_params.length; i >= 1; i--) {
+        name = name.replace('$' + i, key_params[i - 1]);
+      }
+      return name;
+    };
+  });
+});
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/zabbixCacheSrv.js b/plugins/datasource-zabbix/zabbixCacheSrv.js
index 3585e27..96bd424 100644
--- a/plugins/datasource-zabbix/zabbixCacheSrv.js
+++ b/plugins/datasource-zabbix/zabbixCacheSrv.js
@@ -1,27 +1,33 @@
 define([
   'angular',
-  'lodash'
+  'lodash',
+  './utils'
 ],
 function (angular, _) {
   'use strict';
 
   var module = angular.module('grafana.services');
 
-  module.factory('ZabbixCache', function($q) {
+  // Use factory() instead service() for multiple datasources support.
+  // Each datasource instance must initialize its own cache.
+  module.factory('ZabbixCache', function($q, Utils) {
 
-    function ZabbixCache(zabbixAPI, lifetime) {
+    function ZabbixCache(zabbixAPI, ttl) {
       var self = this;
 
       this.zabbixAPI = zabbixAPI;
-      this.lifetime = lifetime;
+      this.ttl = ttl;
 
+      // Internal objects for data storing
       this._groups        = undefined;
       this._hosts         = undefined;
       this._applications  = undefined;
       this._items         = undefined;
 
+      // Check is a service initialized or not
       this._initialized = undefined;
 
+      // Set _initialized when data has loaded
       this.refresh().then(function () {
         self._initialized = true;
       });
@@ -40,19 +46,10 @@ function (angular, _) {
 
       return $q.all(promises).then(function (results) {
         if (results.length) {
-          self._groups = results[0];
-
-          self._hosts = _.forEach(results[1], function(host) {
-            host.groups = _.map(host.groups, 'groupid');
-            return host;
-          });
-
-          self._applications = groupApplications(results[2]);
-
-          self._items = _.forEach(results[3], function(item) {
-            item.applications = _.map(item.applications, 'applicationid');
-            return item;
-          });
+          self._groups        = results[0];
+          self._hosts         = convertHosts(results[1]);
+          self._applications  = convertApplications(results[2]);
+          self._items         = convertItems(results[3]);
         }
       });
     };
@@ -74,18 +71,45 @@ function (angular, _) {
     };
 
     /**
-     * Group Zabbix applications by name
+     * Convert host.get response to cache format
+     * host.groups - array of group ids
      */
-    function groupApplications(applications) {
+    function convertHosts(hosts) {
+      return _.forEach(hosts, function(host) {
+        host.groups = _.map(host.groups, 'groupid');
+        return host;
+      });
+    }
+
+    /**
+     * Group Zabbix applications by name
+     * host.hosts - array of host ids
+     */
+    function convertApplications(applications) {
       return _.map(_.groupBy(applications, 'name'), function (value, key) {
         return {
           name: key,
           applicationids: _.map(value, 'applicationid'),
-          hostids: _.uniq(_.map(_.flatten(value, 'hosts'), 'hostid'))
+          hosts: _.uniq(_.map(_.flatten(value, 'hosts'), 'hostid'))
         };
       });
     }
 
+    /**
+     * Convert item.get response to cache format
+     * item.applications - array of application ids
+     * item.item - original item name returned by api (ie "CPU $2 time")
+     * item.name - expanded name (ie "CPU system time")
+     */
+    function convertItems(items) {
+      return _.forEach(items, function(item) {
+        item.applications = _.map(item.applications, 'applicationid');
+        item.item = item.name;
+        item.name = Utils.expandItemName(item.item, item.key_);
+        return item;
+      });
+    }
+
     return ZabbixCache;
 
   });

From 0bbfa3910a99f8fa672d3d3eeb9e504dce30bff7 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 17 Jan 2016 14:11:11 +0300
Subject: [PATCH 05/58] Detect regex in metric queries.

---
 .../partials/query.editor.html                | 32 ++++++++++++-------
 plugins/datasource-zabbix/queryCtrl.js        | 29 +++++++++++++++--
 plugins/datasource-zabbix/utils.js            | 15 +++++++++
 3 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index 7682311..fd65f88 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -89,24 +89,28 @@
     <li class="tight-form-item input-small" style="width: 5em">Group</li>
     <li>
       <input type="text"
-        ng-model="target.groupFilter"
+        ng-model="target.group.filter"
         bs-typeahead="getGroupNames"
-        ng-blur="render()"
+        ng-change="onTargetPartChange(target.group)"
+        ng-blur="parseTarget()"
         data-min-length=0
         data-items=100
-        class="input-medium tight-form-input" >
+        class="input-medium tight-form-input"
+        ng-style="target.group.style">
     </li>
 
     <!-- Select Host -->
     <li class="tight-form-item input-small" style="width: 3em">Host</li>
     <li>
       <input type="text"
-        ng-model="target.hostFilter"
+        ng-model="target.host.filter"
         bs-typeahead="getHostNames"
-        ng-blur="render()"
+        ng-change="onTargetPartChange(target.host)"
+        ng-blur="parseTarget()"
         data-min-length=0
         data-items=100
-        class="input-large tight-form-input" >
+        class="input-large tight-form-input"
+        ng-style="target.host.style">
     </li>
 
     <!-- Downsampling function -->
@@ -139,24 +143,28 @@
     <li class="tight-form-item input-small" style="width: 5em">Application</li>
     <li>
       <input type="text"
-        ng-model="target.applicationFilter"
+        ng-model="target.application.filter"
         bs-typeahead="getApplicationNames"
-        ng-blur="render()"
+        ng-change="onTargetPartChange(target.application)"
+        ng-blur="parseTarget()"
         data-min-length=0
         data-items=100
-        class="input-medium tight-form-input" >
+        class="input-medium tight-form-input"
+        ng-style="target.application.style">
     </li>
 
     <!-- Select Item -->
     <li class="tight-form-item input-small" style="width: 3em">Item</li>
     <li>
       <input type="text"
-        ng-model="target.itemFilter"
+        ng-model="target.item.filter"
         bs-typeahead="getItemNames"
-        ng-blur="render()"
+        ng-change="onTargetPartChange(target.item)"
+        ng-blur="parseTarget()"
         data-min-length=0
         data-items=100
-        class="input-large tight-form-input" >
+        class="input-large tight-form-input"
+        ng-style="target.item.style">
     </li>
 
     <!-- Scale -->
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index f9cc3dd..ec83953 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -1,7 +1,8 @@
 define([
     'angular',
     'lodash',
-    './helperFunctions'
+    './helperFunctions',
+    './utils'
   ],
   function (angular, _) {
     'use strict';
@@ -9,7 +10,7 @@ define([
     var module = angular.module('grafana.controllers');
     var targetLetters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-    module.controller('ZabbixAPIQueryCtrl', function ($scope, $sce, templateSrv, zabbixHelperSrv) {
+    module.controller('ZabbixAPIQueryCtrl', function ($scope, $sce, templateSrv, zabbixHelperSrv, Utils) {
 
       var zabbixCache = $scope.datasource.zabbixCache;
 
@@ -76,12 +77,34 @@ define([
         return _.uniq(_.map(scope.metric[metricList], 'name'));
       }
 
-      // Map functions
+      // Map functions for bs-typeahead
       $scope.getGroupNames = _.partial(getMetricNames, $scope, 'groupList');
       $scope.getHostNames = _.partial(getMetricNames, $scope, 'hostList');
       $scope.getApplicationNames = _.partial(getMetricNames, $scope, 'applicationList');
       $scope.getItemNames = _.partial(getMetricNames, $scope, 'itemList');
 
+      $scope.onTargetPartChange = function (targetPart) {
+        var regexStyle = {'color': '#CCA300'};
+        targetPart.isRegex = Utils.isRegex(targetPart.filter);
+        targetPart.style = targetPart.isRegex ? regexStyle : {};
+      };
+
+      $scope.parseTarget = function() {
+        var regexStyle = {'color': '#CCA300'};
+
+        $scope.target.groupIsRegex = Utils.isRegex($scope.target.groupFilter);
+        $scope.groupStyle = $scope.target.groupIsRegex ? regexStyle : {};
+
+        $scope.target.hostIsRegex = Utils.isRegex($scope.target.hostFilter);
+        $scope.hostStyle = $scope.target.hostIsRegex ? regexStyle : {};
+
+        $scope.target.applicationIsRegex = Utils.isRegex($scope.target.applicationFilter);
+        $scope.applicationsStyle = $scope.target.applicationIsRegex ? regexStyle : {};
+
+        $scope.target.itemIsRegex = Utils.isRegex($scope.target.itemFilter);
+        $scope.itemStyle = $scope.target.itemIsRegex ? regexStyle : {};
+      };
+
       /**
        * Switch query editor to specified mode.
        * Modes:
diff --git a/plugins/datasource-zabbix/utils.js b/plugins/datasource-zabbix/utils.js
index 8a73482..900bba7 100644
--- a/plugins/datasource-zabbix/utils.js
+++ b/plugins/datasource-zabbix/utils.js
@@ -28,5 +28,20 @@ function (angular, _) {
       }
       return name;
     };
+
+    // Pattern for testing regex
+    var regexPattern = /^\/(.*)\/([gmi]*)$/m;
+
+    this.isRegex = function (str) {
+      return regexPattern.test(str);
+    };
+
+    this.buildRegex = function (str) {
+      var matches = str.match(regexPattern);
+      var pattern = matches[1];
+      var flags = matches[2] !== "" ? matches[2] : undefined;
+      return new RegExp(pattern, flags);
+    };
+
   });
 });
\ No newline at end of file

From 347b806b5452007706eb6059110095a41654a07e Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 17 Jan 2016 16:54:31 +0300
Subject: [PATCH 06/58] Filter hosts, apps and items by regex in query editor.

---
 .../partials/query.editor.html                |   6 +-
 plugins/datasource-zabbix/queryCtrl.js        | 145 +++++++++++++++---
 2 files changed, 126 insertions(+), 25 deletions(-)

diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index fd65f88..6206b58 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -92,7 +92,7 @@
         ng-model="target.group.filter"
         bs-typeahead="getGroupNames"
         ng-change="onTargetPartChange(target.group)"
-        ng-blur="parseTarget()"
+        ng-blur="onGroupBlur()"
         data-min-length=0
         data-items=100
         class="input-medium tight-form-input"
@@ -106,7 +106,7 @@
         ng-model="target.host.filter"
         bs-typeahead="getHostNames"
         ng-change="onTargetPartChange(target.host)"
-        ng-blur="parseTarget()"
+        ng-blur="onHostBlur()"
         data-min-length=0
         data-items=100
         class="input-large tight-form-input"
@@ -146,7 +146,7 @@
         ng-model="target.application.filter"
         bs-typeahead="getApplicationNames"
         ng-change="onTargetPartChange(target.application)"
-        ng-blur="parseTarget()"
+        ng-blur="onApplicationBlur()"
         data-min-length=0
         data-items=100
         class="input-medium tight-form-input"
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index ec83953..0ef8401 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -30,22 +30,19 @@ define([
             $scope.target.downsampleFunction = $scope.downsampleFunctionList[0];
           }
 
+          // Load metrics from cache
           if (zabbixCache._initialized) {
             $scope.getMetricsFromCache();
+            $scope.initFilters();
             console.log("Cached", $scope.metric);
           } else {
             zabbixCache.refresh().then(function () {
               $scope.getMetricsFromCache();
+              $scope.initFilters();
               console.log("From server", $scope.metric);
             });
           }
 
-          // Update host group, host, application and item lists
-          /*$scope.updateGroupList();
-          $scope.updateHostList();
-          $scope.updateAppList();
-          $scope.updateItemList();*/
-
           setItemAlias();
         }
         else if ($scope.target.mode === 1) {
@@ -63,6 +60,12 @@ define([
         $scope.target.errors = validateTarget($scope.target);
       };
 
+      $scope.initFilters = function () {
+        $scope.onGroupBlur();
+        $scope.onHostBlur();
+        $scope.onApplicationBlur();
+      };
+
       $scope.getMetricsFromCache = function () {
         $scope.metric = {
           groupList: zabbixCache.getGroups(),
@@ -79,9 +82,104 @@ define([
 
       // Map functions for bs-typeahead
       $scope.getGroupNames = _.partial(getMetricNames, $scope, 'groupList');
-      $scope.getHostNames = _.partial(getMetricNames, $scope, 'hostList');
-      $scope.getApplicationNames = _.partial(getMetricNames, $scope, 'applicationList');
-      $scope.getItemNames = _.partial(getMetricNames, $scope, 'itemList');
+      $scope.getHostNames = _.partial(getMetricNames, $scope, 'filteredHosts');
+      $scope.getApplicationNames = _.partial(getMetricNames, $scope, 'filteredApplications');
+      $scope.getItemNames = _.partial(getMetricNames, $scope, 'filteredItems');
+
+      $scope.filterHosts = function () {
+        var group = $scope.target.group;
+        var groups = [];
+        var hosts = [];
+
+        // Filter groups by regex
+        if (group.isRegex) {
+          var filterPattern = Utils.buildRegex(group.filter);
+          groups = _.filter($scope.metric.groupList, function (groupObj) {
+            return filterPattern.test(groupObj.name);
+          });
+        }
+        // Find hosts in selected group
+        else {
+          var finded = _.find($scope.metric.groupList, {'name': group.filter});
+          if (finded) {
+            groups.push(finded);
+          } else {
+            groups = undefined;
+          }
+        }
+
+        if (groups) {
+          var groupids = _.map(groups, 'groupid');
+          hosts = _.filter($scope.metric.hostList, function (hostObj) {
+            return _.intersection(groupids, hostObj.groups).length;
+          });
+        }
+        return hosts;
+      };
+
+      $scope.filterApplications = function () {
+        var host = $scope.target.host;
+        var hosts = [];
+        var apps = [];
+
+        // Filter hosts by regex
+        if (host.isRegex) {
+          var filterPattern = Utils.buildRegex(host.filter);
+          hosts = _.filter($scope.metric.hostList, function (hostObj) {
+            return filterPattern.test(hostObj.name);
+          });
+        }
+        // Find applications in selected host
+        else {
+          var finded = _.find($scope.metric.hostList, {'name': host.filter});
+          if (finded) {
+            hosts.push(finded);
+          } else {
+            hosts = undefined;
+          }
+        }
+
+        if (hosts) {
+          var hostsids = _.map(hosts, 'hostid');
+          apps = _.filter($scope.metric.applicationList, function (appObj) {
+            return _.intersection(hostsids, appObj.hosts).length;
+          });
+        }
+
+        return apps;
+      };
+
+      $scope.filterItems = function () {
+        var app = $scope.target.application;
+        var apps = [];
+        var items = [];
+
+        // Filter applications by regex
+        if (app.isRegex) {
+          var filterPattern = Utils.buildRegex(app.filter);
+          apps = _.filter($scope.metric.applicationList, function (appObj) {
+            return filterPattern.test(appObj.name);
+          });
+        }
+        // Find items in selected application
+        else {
+          var finded = _.find($scope.metric.applicationList, {'name': app.filter});
+          if (finded) {
+            apps.push(finded);
+          } else {
+            apps = undefined;
+          }
+        }
+
+        if (apps) {
+          var appids = _.flatten(_.map(apps, 'applicationids'));
+          items = _.filter($scope.metric.itemList, function (itemObj) {
+            return _.intersection(appids, itemObj.applications).length;
+          });
+        }
+
+        return items;
+      };
 
       $scope.onTargetPartChange = function (targetPart) {
         var regexStyle = {'color': '#CCA300'};
@@ -89,20 +187,23 @@ define([
         targetPart.style = targetPart.isRegex ? regexStyle : {};
       };
 
+      // Handle group blur and filter hosts
+      $scope.onGroupBlur = function() {
+        $scope.metric.filteredHosts = $scope.filterHosts();
+      };
+
+      // Handle host blur and filter applications
+      $scope.onHostBlur = function() {
+        $scope.metric.filteredApplications = $scope.filterApplications();
+      };
+
+      // Handle application blur and filter items
+      $scope.onApplicationBlur = function() {
+        $scope.metric.filteredItems = $scope.filterItems();
+      };
+
       $scope.parseTarget = function() {
-        var regexStyle = {'color': '#CCA300'};
-
-        $scope.target.groupIsRegex = Utils.isRegex($scope.target.groupFilter);
-        $scope.groupStyle = $scope.target.groupIsRegex ? regexStyle : {};
-
-        $scope.target.hostIsRegex = Utils.isRegex($scope.target.hostFilter);
-        $scope.hostStyle = $scope.target.hostIsRegex ? regexStyle : {};
-
-        $scope.target.applicationIsRegex = Utils.isRegex($scope.target.applicationFilter);
-        $scope.applicationsStyle = $scope.target.applicationIsRegex ? regexStyle : {};
-
-        $scope.target.itemIsRegex = Utils.isRegex($scope.target.itemFilter);
-        $scope.itemStyle = $scope.target.itemIsRegex ? regexStyle : {};
+        // Parse target
       };
 
       /**

From 038e5a2492eb908a1641438fbc38472a2976f3a4 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 17 Jan 2016 20:00:07 +0300
Subject: [PATCH 07/58] Removed unused code.

---
 plugins/datasource-zabbix/queryCtrl.js | 125 -------------------------
 1 file changed, 125 deletions(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 0ef8401..4837d95 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -247,60 +247,6 @@ define([
         }
       };
 
-      /**
-       * Call when host group selected
-       */
-      $scope.selectHostGroup = function () {
-        $scope.updateHostList();
-        $scope.updateAppList();
-        $scope.updateItemList();
-
-        $scope.target.errors = validateTarget($scope.target);
-        if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) {
-          $scope.oldTarget = angular.copy($scope.target);
-          $scope.get_data();
-        }
-      };
-
-      /**
-       * Call when host selected
-       */
-      $scope.selectHost = function () {
-        $scope.updateAppList();
-        $scope.updateItemList();
-
-        $scope.target.errors = validateTarget($scope.target);
-        if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) {
-          $scope.oldTarget = angular.copy($scope.target);
-          $scope.get_data();
-        }
-      };
-
-      /**
-       * Call when application selected
-       */
-      $scope.selectApplication = function () {
-        $scope.updateItemList();
-
-        $scope.target.errors = validateTarget($scope.target);
-        if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) {
-          $scope.oldTarget = angular.copy($scope.target);
-          $scope.get_data();
-        }
-      };
-
-      /**
-       * Call when item selected
-       */
-      $scope.selectItem = function () {
-        setItemAlias();
-        $scope.target.errors = validateTarget($scope.target);
-        if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) {
-          $scope.oldTarget = angular.copy($scope.target);
-          $scope.get_data();
-        }
-      };
-
       $scope.duplicate = function () {
         var clone = angular.copy($scope.target);
         $scope.panel.targets.push(clone);
@@ -310,10 +256,6 @@ define([
         _.move($scope.panel.targets, fromIndex, toIndex);
       };
 
-      //////////////////////////////
-      // SUGGESTION QUERIES
-      //////////////////////////////
-
       /**
        * Update list of IT services
        */
@@ -324,73 +266,6 @@ define([
         });
       };
 
-      /**
-       * Update list of host groups
-       */
-      $scope.updateGroupList = function () {
-        $scope.datasource.zabbixAPI.performHostGroupSuggestQuery().then(function (groups) {
-          $scope.metric.groupList = [{name: '*', visible_name: 'All'}];
-          addTemplatedVariables($scope.metric.groupList);
-          $scope.metric.groupList = $scope.metric.groupList.concat(groups);
-        });
-      };
-
-      /**
-       * Update list of hosts
-       */
-      $scope.updateHostList = function () {
-        var groups = $scope.target.group ? zabbixHelperSrv.splitMetrics(templateSrv.replace($scope.target.group.name)) : undefined;
-        if (groups) {
-          $scope.datasource.zabbixAPI.hostFindQuery(groups).then(function (hosts) {
-            $scope.metric.hostList = [{name: '*', visible_name: 'All'}];
-            addTemplatedVariables($scope.metric.hostList);
-            $scope.metric.hostList = $scope.metric.hostList.concat(hosts);
-          });
-        }
-      };
-
-      /**
-       * Update list of host applications
-       */
-      $scope.updateAppList = function () {
-        var groups = $scope.target.group ? zabbixHelperSrv.splitMetrics(templateSrv.replace($scope.target.group.name)) : undefined;
-        var hosts = $scope.target.host ? zabbixHelperSrv.splitMetrics(templateSrv.replace($scope.target.host.name)) : undefined;
-        if (groups && hosts) {
-          $scope.datasource.zabbixAPI.appFindQuery(hosts, groups).then(function (apps) {
-            apps = _.map(_.uniq(_.map(apps, 'name')), function (appname) {
-              return {name: appname};
-            });
-            $scope.metric.applicationList = [{name: '*', visible_name: 'All'}];
-            addTemplatedVariables($scope.metric.applicationList);
-            $scope.metric.applicationList = $scope.metric.applicationList.concat(apps);
-          });
-        }
-      };
-
-      /**
-       * Update list of items
-       */
-      $scope.updateItemList = function () {
-        var groups = $scope.target.group ? zabbixHelperSrv.splitMetrics(templateSrv.replace($scope.target.group.name)) : undefined;
-        var hosts = $scope.target.host ? zabbixHelperSrv.splitMetrics(templateSrv.replace($scope.target.host.name)) : undefined;
-        var apps = $scope.target.application ?
-                     zabbixHelperSrv.splitMetrics(templateSrv.replace($scope.target.application.name)) : undefined;
-        var itemtype = $scope.target.mode === 2 ? "text" : "numeric";
-        if (groups && hosts && apps) {
-          $scope.datasource.zabbixAPI.itemFindQuery(groups, hosts, apps, itemtype).then(function (items) {
-            // Show only unique item names
-            var uniq_items = _.map(_.uniq(items, function (item) {
-              return zabbixHelperSrv.expandItemName(item);
-            }), function (item) {
-              return {name: zabbixHelperSrv.expandItemName(item)};
-            });
-            $scope.metric.itemList = [{name: 'All'}];
-            addTemplatedVariables($scope.metric.itemList);
-            $scope.metric.itemList = $scope.metric.itemList.concat(uniq_items);
-          });
-        }
-      };
-
       /**
        * Add templated variables to list of available metrics
        *

From c41cdfc639171f989cda8e8dcc03a43104f630f8 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 17 Jan 2016 21:28:42 +0300
Subject: [PATCH 08/58] Removed zabbixHelperSrv from queryCtrl

---
 plugins/datasource-zabbix/queryCtrl.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 4837d95..a81291b 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -1,7 +1,6 @@
 define([
     'angular',
     'lodash',
-    './helperFunctions',
     './utils'
   ],
   function (angular, _) {
@@ -10,7 +9,7 @@ define([
     var module = angular.module('grafana.controllers');
     var targetLetters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-    module.controller('ZabbixAPIQueryCtrl', function ($scope, $sce, templateSrv, zabbixHelperSrv, Utils) {
+    module.controller('ZabbixAPIQueryCtrl', function ($scope, $sce, templateSrv, Utils) {
 
       var zabbixCache = $scope.datasource.zabbixCache;
 

From cb85f853f96889298ce8909c80a0271ae50f4458 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 17 Jan 2016 22:51:07 +0300
Subject: [PATCH 09/58] Changed datasource query() to working with new query
 editor.

---
 plugins/datasource-zabbix/datasource.js | 223 +++++++++++++++---------
 1 file changed, 137 insertions(+), 86 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index e4b4467..fffbd97 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -4,6 +4,7 @@ define([
   'app/core/utils/datemath',
   './directives',
   './zabbixAPIWrapper',
+  './utils',
   './helperFunctions',
   './zabbixCacheSrv',
   './queryCtrl'
@@ -13,7 +14,7 @@ function (angular, _, dateMath) {
 
   /** @ngInject */
   function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv,
-                                ZabbixAPI, zabbixHelperSrv, ZabbixCache) {
+                                ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -78,6 +79,7 @@ function (angular, _, dateMath) {
      *                            for each target.
      */
     this.query = function(options) {
+      var self = this;
 
       // get from & to in seconds
       var from = Math.ceil(dateMath.parse(options.range.from) / 1000);
@@ -89,104 +91,153 @@ function (angular, _, dateMath) {
 
         if (target.mode !== 1) {
 
-          // Don't show undefined and hidden targets
-          if (target.hide || !target.group || !target.host ||
-              !target.application || !target.item) {
+          // Don't show hidden targets
+          if (target.hide) {
             return [];
           }
 
           // Replace templated variables
-          var groupname = templateSrv.replace(target.group.name, options.scopedVars);
-          var hostname = templateSrv.replace(target.host.name, options.scopedVars);
-          var appname = templateSrv.replace(target.application.name, options.scopedVars);
-          var itemname = templateSrv.replace(target.item.name, options.scopedVars);
-
-          // Extract zabbix groups, hosts and apps from string:
-          // "{host1,host2,...,hostN}" --> [host1, host2, ..., hostN]
-          var groups = zabbixHelperSrv.splitMetrics(groupname);
-          var hosts = zabbixHelperSrv.splitMetrics(hostname);
-          var apps = zabbixHelperSrv.splitMetrics(appname);
-
-          // Remove hostnames from item names and then
-          // extract item names
-          // "hostname: itemname" --> "itemname"
-          var delete_hostname_pattern = /(?:\[[\w\.]+]:\s)/g;
-          var itemnames = zabbixHelperSrv.splitMetrics(itemname.replace(delete_hostname_pattern, ''));
-
-          var self = this;
+          var groupFilter = templateSrv.replace(target.group.filter, options.scopedVars);
+          var hostFilter = templateSrv.replace(target.host.filter, options.scopedVars);
+          var appFilter = templateSrv.replace(target.application.filter, options.scopedVars);
+          var itemFilter = templateSrv.replace(target.item.filter, options.scopedVars);
 
           // Query numeric data
           if (!target.mode) {
 
             // Find items by item names and perform queries
-            return this.zabbixAPI.itemFindQuery(groups, hosts, apps)
-              .then(function (items) {
+            var groups = [];
+            var hosts = [];
+            var apps = [];
+            var items = [];
 
-                // Filter hosts by regex
-                if (target.host.visible_name === 'All') {
-                  if (target.hostFilter && _.every(items, _.identity.hosts)) {
+            if (target.host.isRegex) {
 
-                    // Use templated variables in filter
-                    var host_pattern = new RegExp(templateSrv.replace(target.hostFilter, options.scopedVars));
-                    items = _.filter(items, function (item) {
-                      return _.some(item.hosts, function (host) {
-                        return host_pattern.test(host.name);
-                      });
-                    });
-                  }
-                }
-
-                if (itemnames[0] === 'All') {
-
-                  // Filter items by regex
-                  if (target.itemFilter) {
-
-                    // Use templated variables in filter
-                    var item_pattern = new RegExp(templateSrv.replace(target.itemFilter, options.scopedVars));
-                    return _.filter(items, function (item) {
-                      return item_pattern.test(zabbixHelperSrv.expandItemName(item));
-                    });
-                  } else {
-                    return items;
-                  }
-                } else {
-
-                  // Filtering items
-                  return _.filter(items, function (item) {
-                    return _.contains(itemnames, zabbixHelperSrv.expandItemName(item));
-                  });
-                }
-              }).then(function (items) {
-                items = _.flatten(items);
-
-                // Use alias only for single metric, otherwise use item names
-                var alias = target.item.name === 'All' || itemnames.length > 1 ?
-                              undefined : templateSrv.replace(target.alias, options.scopedVars);
-
-                var history;
-                if ((from < useTrendsFrom) && self.trends) {
-                  var points = target.downsampleFunction ? target.downsampleFunction.value : "avg";
-                  history = self.zabbixAPI.getTrends(items, from, to)
-                    .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale, points));
-                } else {
-                  history = self.zabbixAPI.getHistory(items, from, to)
-                    .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
-                }
-
-                return history.then(function (timeseries) {
-                  var timeseries_data = _.flatten(timeseries);
-                  return _.map(timeseries_data, function (timeseries) {
-
-                    // Series downsampling
-                    if (timeseries.datapoints.length > options.maxDataPoints) {
-                      var ms_interval = Math.floor((to - from) / options.maxDataPoints) * 1000;
-                      var downsampleFunc = target.downsampleFunction ? target.downsampleFunction.value : "avg";
-                      timeseries.datapoints = zabbixHelperSrv.downsampleSeries(timeseries.datapoints, to, ms_interval, downsampleFunc);
-                    }
-                    return timeseries;
-                  });
+              // Filter groups
+              if (target.group.isRegex) {
+                var groupPattern = Utils.buildRegex(groupFilter);
+                groups = _.filter(self.zabbixCache.getGroups(), function (groupObj) {
+                  return groupPattern.test(groupObj.name);
                 });
+              } else {
+                var findedGroup = _.find(self.zabbixCache.getGroups(), {'name': groupFilter});
+                if (findedGroup) {
+                  groups.push(findedGroup);
+                } else {
+                  groups = undefined;
+                }
+              }
+              if (groups) {
+                var groupids = _.map(groups, 'groupid');
+                hosts = _.filter(self.zabbixCache.getHosts(), function (hostObj) {
+                  return _.intersection(groupids, hostObj.groups).length;
+                });
+              } else {
+                // No groups finded
+                return [];
+              }
+
+              // Filter hosts
+              var hostPattern = Utils.buildRegex(hostFilter);
+              hosts = _.filter(hosts, function (hostObj) {
+                return hostPattern.test(hostObj.name);
               });
+            } else {
+              var findedHost = _.find(self.zabbixCache.getHosts(), {'name': hostFilter});
+              if (findedHost) {
+                hosts.push(findedHost);
+              } else {
+                // No hosts finded
+                return [];
+              }
+            }
+            console.log(hosts);
+
+            // Find items belongs to selected hosts
+            items = _.filter(self.zabbixCache.getItems(), function (itemObj) {
+              return _.contains(_.map(hosts, 'hostid'), itemObj.hostid);
+            });
+
+            if (target.item.isRegex) {
+
+              // Filter applications
+              if (target.application.isRegex) {
+                var appPattern = Utils.buildRegex(appFilter);
+                apps = _.filter(self.zabbixCache.getApplications(), function (appObj) {
+                  return appPattern.test(appObj.name);
+                });
+              }
+              // Don't use application filter if it empty
+              else if (appFilter === "") {
+                apps = undefined;
+              }
+              else {
+                var findedApp = _.find(self.zabbixCache.getApplications(), {'name': appFilter});
+                if (findedApp) {
+                  apps.push(findedApp);
+                } else {
+                  // No applications finded
+                  return [];
+                }
+              }
+
+              // Find items belongs to selected applications
+              if (apps) {
+                var appids = _.flatten(_.map(apps, 'applicationids'));
+                items = _.filter(items, function (itemObj) {
+                  return _.intersection(appids, itemObj.applications).length;
+                });
+              }
+
+              if (items) {
+                var itemPattern = Utils.buildRegex(itemFilter);
+                items = _.filter(items, function (itemObj) {
+                  return itemPattern.test(itemObj.name);
+                });
+              } else {
+                // No items finded
+                return [];
+              }
+            } else {
+              items = _.filter(items, {'name': hostFilter});
+              if (!items.length) {
+                // No items finded
+                return [];
+              }
+            }
+            console.log(items);
+
+            //items = _.flatten(items);
+
+            // Use alias only for single metric, otherwise use item names
+            var alias;
+            if (items.length === 1) {
+              alias = templateSrv.replace(target.alias, options.scopedVars);
+            }
+
+            var history;
+            if ((from < useTrendsFrom) && self.trends) {
+              var points = target.downsampleFunction ? target.downsampleFunction.value : "avg";
+              history = self.zabbixAPI.getTrends(items, from, to)
+                .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale, points));
+            } else {
+              history = self.zabbixAPI.getHistory(items, from, to)
+                .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
+            }
+
+            return history.then(function (timeseries) {
+              var timeseries_data = _.flatten(timeseries);
+              return _.map(timeseries_data, function (timeseries) {
+
+                // Series downsampling
+                if (timeseries.datapoints.length > options.maxDataPoints) {
+                  var ms_interval = Math.floor((to - from) / options.maxDataPoints) * 1000;
+                  var downsampleFunc = target.downsampleFunction ? target.downsampleFunction.value : "avg";
+                  timeseries.datapoints = zabbixHelperSrv.downsampleSeries(timeseries.datapoints, to, ms_interval, downsampleFunc);
+                }
+                return timeseries;
+              });
+            });
           }
 
           // Query text data

From 051438e48a83b9dd0dadfdf9eebae4e89060c313 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 18 Jan 2016 20:54:30 +0300
Subject: [PATCH 10/58] Refresh data when target was changed.

---
 .../partials/query.editor.html                |  2 +-
 plugins/datasource-zabbix/queryCtrl.js        | 30 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index 6206b58..a65af2e 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -160,7 +160,7 @@
         ng-model="target.item.filter"
         bs-typeahead="getItemNames"
         ng-change="onTargetPartChange(target.item)"
-        ng-blur="parseTarget()"
+        ng-blur="onItemBlur()"
         data-min-length=0
         data-items=100
         class="input-large tight-form-input"
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index a81291b..6d05da9 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -55,8 +55,6 @@ define([
           $scope.itserviceList = [{name: "test"}];
           $scope.updateITServiceList();
         }
-
-        $scope.target.errors = validateTarget($scope.target);
       };
 
       $scope.initFilters = function () {
@@ -189,22 +187,36 @@ define([
       // Handle group blur and filter hosts
       $scope.onGroupBlur = function() {
         $scope.metric.filteredHosts = $scope.filterHosts();
+        $scope.parseTarget();
+        $scope.get_data();
       };
 
       // Handle host blur and filter applications
       $scope.onHostBlur = function() {
         $scope.metric.filteredApplications = $scope.filterApplications();
+        $scope.parseTarget();
+        $scope.get_data();
       };
 
       // Handle application blur and filter items
       $scope.onApplicationBlur = function() {
         $scope.metric.filteredItems = $scope.filterItems();
+        $scope.parseTarget();
+        $scope.get_data();
+      };
+
+      $scope.onItemBlur = function () {
+        $scope.parseTarget();
+        $scope.get_data();
       };
 
       $scope.parseTarget = function() {
         // Parse target
       };
 
+      // Validate target and set validation info
+      $scope.validateTarget = function () {};
+
       /**
        * Switch query editor to specified mode.
        * Modes:
@@ -228,7 +240,6 @@ define([
 
       $scope.targetBlur = function () {
         setItemAlias();
-        $scope.target.errors = validateTarget($scope.target);
         if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) {
           $scope.oldTarget = angular.copy($scope.target);
           $scope.get_data();
@@ -239,7 +250,6 @@ define([
        * Call when IT service is selected.
        */
       $scope.selectITService = function () {
-        $scope.target.errors = validateTarget($scope.target);
         if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) {
           $scope.oldTarget = angular.copy($scope.target);
           $scope.get_data();
@@ -279,18 +289,6 @@ define([
         });
       }
 
-      //////////////////////////////
-      // VALIDATION
-      //////////////////////////////
-
-      function validateTarget(target) {
-        var errs = {};
-        if (!target) {
-          errs = 'Not defined';
-        }
-        return errs;
-      }
-
       $scope.init();
 
     });

From 0a310a9db3ef36d8d575489cf41a1e2a3a484afa Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 18 Jan 2016 21:47:21 +0300
Subject: [PATCH 11/58] Show host names in metric name when multiple hosts
 selected.

---
 plugins/datasource-zabbix/datasource.js      | 9 ++++++---
 plugins/datasource-zabbix/helperFunctions.js | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index fffbd97..0691a80 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -151,7 +151,6 @@ function (angular, _, dateMath) {
                 return [];
               }
             }
-            console.log(hosts);
 
             // Find items belongs to selected hosts
             items = _.filter(self.zabbixCache.getItems(), function (itemObj) {
@@ -205,9 +204,11 @@ function (angular, _, dateMath) {
                 return [];
               }
             }
-            console.log(items);
 
-            //items = _.flatten(items);
+            // Set host as host name for each item
+            items = _.each(items, function (itemObj) {
+              itemObj.host = _.find(hosts, {'hostid': itemObj.hostid}).name;
+            });
 
             // Use alias only for single metric, otherwise use item names
             var alias;
@@ -217,10 +218,12 @@ function (angular, _, dateMath) {
 
             var history;
             if ((from < useTrendsFrom) && self.trends) {
+              // Use trends
               var points = target.downsampleFunction ? target.downsampleFunction.value : "avg";
               history = self.zabbixAPI.getTrends(items, from, to)
                 .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale, points));
             } else {
+              // Use history
               history = self.zabbixAPI.getHistory(items, from, to)
                 .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
             }
diff --git a/plugins/datasource-zabbix/helperFunctions.js b/plugins/datasource-zabbix/helperFunctions.js
index f1b84fd..d844d92 100644
--- a/plugins/datasource-zabbix/helperFunctions.js
+++ b/plugins/datasource-zabbix/helperFunctions.js
@@ -47,7 +47,7 @@ function (angular, _) {
       return $q.when(_.map(grouped_history, function (history, itemid) {
         var item = indexed_items[itemid];
         return {
-          target: (item.hosts ? item.hosts[0].name+': ' : '')
+          target: (item.host ? item.host + ': ' : '')
             + (alias ? alias : self.expandItemName(item)),
           datapoints: _.map(history, function (p) {
 

From 3b98b200c07098f97259d877fc7abecfdbc33485 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 22 Jan 2016 00:18:49 +0300
Subject: [PATCH 12/58] Move ZabbixAPI core functions to own service.

---
 plugins/datasource-zabbix/zabbixAPI.js | 99 ++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 plugins/datasource-zabbix/zabbixAPI.js

diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js
new file mode 100644
index 0000000..5e041f2
--- /dev/null
+++ b/plugins/datasource-zabbix/zabbixAPI.js
@@ -0,0 +1,99 @@
+define([
+  'angular',
+],
+function (angular) {
+  'use strict';
+
+  var module = angular.module('grafana.services');
+
+  module.service('ZabbixAPI', function($q, backendSrv) {
+
+    this.init = function () {};
+
+    /**
+     * Request data from Zabbix API
+     * @return {object}  response.result
+     */
+    this._request = function(url, method, params, auth) {
+      var options = {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        url: url,
+        data: {
+          jsonrpc: '2.0',
+          method: method,
+          params: params,
+          auth: auth,
+          id: 1
+        }
+      };
+
+      if (this.basicAuth || this.withCredentials) {
+        options.withCredentials = true;
+      }
+      if (this.basicAuth) {
+        options.headers.Authorization = this.basicAuth;
+      }
+
+      var self = this;
+      return backendSrv.datasourceRequest(options).then(function (response) {
+        if (!response.data) {
+          return [];
+        }
+        // Handle Zabbix API errors
+        else if (response.data.error) {
+
+          // Handle auth errors
+          if (response.data.error.data === "Session terminated, re-login, please." ||
+              response.data.error.data === "Not authorised." ||
+              response.data.error.data === "Not authorized") {
+            return self.performZabbixAPILogin().then(function (response) {
+              self.auth = response;
+              return self.performZabbixAPIRequest(method, params);
+            });
+          }
+        }
+        return response.data.result;
+      });
+    };
+
+    /**
+     * Get authentication token.
+     * @return {string}  auth token
+     */
+    this.login = function(url, username, password) {
+      var options = {
+        url : this.url,
+        method : 'POST',
+        data: {
+          jsonrpc: '2.0',
+          method: 'user.login',
+          params: {
+            user: this.username,
+            password: this.password
+          },
+          auth: null,
+          id: 1
+        }
+      };
+
+      if (this.basicAuth || this.withCredentials) {
+        options.withCredentials = true;
+      }
+      if (this.basicAuth) {
+        options.headers = options.headers || {};
+        options.headers.Authorization = this.basicAuth;
+      }
+
+      return backendSrv.datasourceRequest(options).then(function (result) {
+        if (!result.data) {
+          return null;
+        }
+        return result.data.result;
+      });
+    };
+
+  });
+});
\ No newline at end of file

From 98fd88f9cda1052bc30612c38a26d958612693ed Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 22 Jan 2016 00:19:40 +0300
Subject: [PATCH 13/58] Creates query builder service.

---
 plugins/datasource-zabbix/datasource.js   |   3 +-
 plugins/datasource-zabbix/queryBuilder.js | 157 ++++++++++++++++++++++
 2 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 plugins/datasource-zabbix/queryBuilder.js

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 0691a80..54181a9 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -13,8 +13,7 @@ function (angular, _, dateMath) {
   'use strict';
 
   /** @ngInject */
-  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv,
-                                ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {
+  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv, ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {
 
     // General data source settings
     this.name             = instanceSettings.name;
diff --git a/plugins/datasource-zabbix/queryBuilder.js b/plugins/datasource-zabbix/queryBuilder.js
new file mode 100644
index 0000000..5293409
--- /dev/null
+++ b/plugins/datasource-zabbix/queryBuilder.js
@@ -0,0 +1,157 @@
+define([
+  'angular',
+  'lodash',
+  './zabbixCacheSrv',
+  './utils'
+],
+function (angular, _) {
+  'use strict';
+
+  var module = angular.module('grafana.services');
+
+  module.service('QueryBuilderSrv', function(ZabbixCache, Utils) {
+
+    this.build = function (groupFilter, hostFilter, appFilter, itemFilter) {
+
+      // Find items by item names and perform queries
+      var groups = [];
+      var hosts = [];
+      var apps = [];
+      var items = [];
+
+      if (Utils.isRegex(hostFilter)) {
+
+        // Filter groups
+        if (Utils.isRegex(groupFilter)) {
+          var groupPattern = Utils.buildRegex(groupFilter);
+          groups = _.filter(ZabbixCache.getGroups(), function (groupObj) {
+            return groupPattern.test(groupObj.name);
+          });
+        } else {
+          var findedGroup = _.find(ZabbixCache.getGroups(), {'name': groupFilter});
+          if (findedGroup) {
+            groups.push(findedGroup);
+          } else {
+            groups = undefined;
+          }
+        }
+        if (groups) {
+          var groupids = _.map(groups, 'groupid');
+          hosts = _.filter(ZabbixCache.getHosts(), function (hostObj) {
+            return _.intersection(groupids, hostObj.groups).length;
+          });
+        } else {
+          // No groups finded
+          return [];
+        }
+
+        // Filter hosts
+        var hostPattern = Utils.buildRegex(hostFilter);
+        hosts = _.filter(hosts, function (hostObj) {
+          return hostPattern.test(hostObj.name);
+        });
+      } else {
+        var findedHost = _.find(ZabbixCache.getHosts(), {'name': hostFilter});
+        if (findedHost) {
+          hosts.push(findedHost);
+        } else {
+          // No hosts finded
+          return [];
+        }
+      }
+
+      // Find items belongs to selected hosts
+      items = _.filter(ZabbixCache.getItems(), function (itemObj) {
+        return _.contains(_.map(hosts, 'hostid'), itemObj.hostid);
+      });
+
+      if (Utils.isRegex(itemFilter)) {
+
+        // Filter applications
+        if (Utils.isRegex(appFilter)) {
+          var appPattern = Utils.buildRegex(appFilter);
+          apps = _.filter(ZabbixCache.getApplications(), function (appObj) {
+            return appPattern.test(appObj.name);
+          });
+        }
+        // Don't use application filter if it empty
+        else if (appFilter === "") {
+          apps = undefined;
+        }
+        else {
+          var findedApp = _.find(ZabbixCache.getApplications(), {'name': appFilter});
+          if (findedApp) {
+            apps.push(findedApp);
+          } else {
+            // No applications finded
+            return [];
+          }
+        }
+
+        // Find items belongs to selected applications
+        if (apps) {
+          var appids = _.flatten(_.map(apps, 'applicationids'));
+          items = _.filter(items, function (itemObj) {
+            return _.intersection(appids, itemObj.applications).length;
+          });
+        }
+
+        if (items) {
+          var itemPattern = Utils.buildRegex(itemFilter);
+          items = _.filter(items, function (itemObj) {
+            return itemPattern.test(itemObj.name);
+          });
+        } else {
+          // No items finded
+          return [];
+        }
+      } else {
+        items = _.filter(items, {'name': hostFilter});
+        if (!items.length) {
+          // No items finded
+          return [];
+        }
+      }
+
+      // Set host as host name for each item
+      items = _.each(items, function (itemObj) {
+        itemObj.host = _.find(hosts, {'hostid': itemObj.hostid}).name;
+      });
+
+      // Use alias only for single metric, otherwise use item names
+      var alias;
+      if (items.length === 1) {
+        alias = templateSrv.replace(alias, options.scopedVars);
+      }
+
+      var history;
+      if ((from < useTrendsFrom) && self.trends) {
+        // Use trends
+        var points = downsampleFunction ? downsampleFunction.value : "avg";
+        history = self.zabbixAPI.getTrends(items, from, to)
+          .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, scale, points));
+      } else {
+        // Use history
+        history = self.zabbixAPI.getHistory(items, from, to)
+          .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, scale));
+      }
+
+      return history.then(function (timeseries) {
+        var timeseries_data = _.flatten(timeseries);
+        return _.map(timeseries_data, function (timeseries) {
+
+          // Series downsampling
+          if (timeseries.datapoints.length > options.maxDataPoints) {
+            var ms_interval = Math.floor((to - from) / options.maxDataPoints) * 1000;
+            var downsampleFunc = downsampleFunction ? downsampleFunction.value : "avg";
+            timeseries.datapoints = zabbixHelperSrv.downsampleSeries(timeseries.datapoints, to, ms_interval, downsampleFunc);
+          }
+          return timeseries;
+        });
+      });
+
+      return itemFilter;
+    };
+
+  });
+});
\ No newline at end of file

From 7e0a41ed450c4e8abea3e0750c22dc837ff46468 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 12:31:29 +0300
Subject: [PATCH 14/58] Working on ZabbixAPIService for general api calls.

---
 plugins/datasource-zabbix/zabbixAPI.js        | 99 -------------------
 plugins/datasource-zabbix/zabbixAPIService.js | 89 +++++++++++++++++
 2 files changed, 89 insertions(+), 99 deletions(-)
 delete mode 100644 plugins/datasource-zabbix/zabbixAPI.js
 create mode 100644 plugins/datasource-zabbix/zabbixAPIService.js

diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js
deleted file mode 100644
index 5e041f2..0000000
--- a/plugins/datasource-zabbix/zabbixAPI.js
+++ /dev/null
@@ -1,99 +0,0 @@
-define([
-  'angular',
-],
-function (angular) {
-  'use strict';
-
-  var module = angular.module('grafana.services');
-
-  module.service('ZabbixAPI', function($q, backendSrv) {
-
-    this.init = function () {};
-
-    /**
-     * Request data from Zabbix API
-     * @return {object}  response.result
-     */
-    this._request = function(url, method, params, auth) {
-      var options = {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        url: url,
-        data: {
-          jsonrpc: '2.0',
-          method: method,
-          params: params,
-          auth: auth,
-          id: 1
-        }
-      };
-
-      if (this.basicAuth || this.withCredentials) {
-        options.withCredentials = true;
-      }
-      if (this.basicAuth) {
-        options.headers.Authorization = this.basicAuth;
-      }
-
-      var self = this;
-      return backendSrv.datasourceRequest(options).then(function (response) {
-        if (!response.data) {
-          return [];
-        }
-        // Handle Zabbix API errors
-        else if (response.data.error) {
-
-          // Handle auth errors
-          if (response.data.error.data === "Session terminated, re-login, please." ||
-              response.data.error.data === "Not authorised." ||
-              response.data.error.data === "Not authorized") {
-            return self.performZabbixAPILogin().then(function (response) {
-              self.auth = response;
-              return self.performZabbixAPIRequest(method, params);
-            });
-          }
-        }
-        return response.data.result;
-      });
-    };
-
-    /**
-     * Get authentication token.
-     * @return {string}  auth token
-     */
-    this.login = function(url, username, password) {
-      var options = {
-        url : this.url,
-        method : 'POST',
-        data: {
-          jsonrpc: '2.0',
-          method: 'user.login',
-          params: {
-            user: this.username,
-            password: this.password
-          },
-          auth: null,
-          id: 1
-        }
-      };
-
-      if (this.basicAuth || this.withCredentials) {
-        options.withCredentials = true;
-      }
-      if (this.basicAuth) {
-        options.headers = options.headers || {};
-        options.headers.Authorization = this.basicAuth;
-      }
-
-      return backendSrv.datasourceRequest(options).then(function (result) {
-        if (!result.data) {
-          return null;
-        }
-        return result.data.result;
-      });
-    };
-
-  });
-});
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/zabbixAPIService.js b/plugins/datasource-zabbix/zabbixAPIService.js
new file mode 100644
index 0000000..21c9ec7
--- /dev/null
+++ b/plugins/datasource-zabbix/zabbixAPIService.js
@@ -0,0 +1,89 @@
+/**
+ * General Zabbix API methods
+ */
+
+define([
+  'angular',
+],
+function (angular) {
+  'use strict';
+
+  var module = angular.module('grafana.services');
+
+  module.service('ZabbixAPIService', function($q, backendSrv) {
+
+    /**
+     * Request data from Zabbix API
+     * @return {object}  response.result
+     */
+    this._request = function(api_url, method, params, options, auth) {
+      var requestData = {
+        jsonrpc: '2.0',
+        method: method,
+        params: params,
+        id: 1
+      };
+
+      // Set auth parameter only if it needed
+      if (auth) {
+        requestData.auth = auth;
+      }
+
+      var requestOptions = {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        url: api_url,
+        data: requestData
+      };
+
+      // Set request options for basic auth
+      if (options.basicAuth || options.withCredentials) {
+        requestOptions.withCredentials = true;
+      }
+      if (options.basicAuth) {
+        requestOptions.headers.Authorization = options.basicAuth;
+      }
+
+      return backendSrv.datasourceRequest(requestOptions).then(function (response) {
+        // General connection issues
+        if (!response.data) {
+          return [];
+        }
+
+        // Handle Zabbix API errors
+        else if (response.data.error) {
+          throw new ZabbixException(response.data.error);
+        }
+
+        return response.data.result;
+      });
+    };
+
+    /**
+     * Get authentication token.
+     * @return {string}  auth token
+     */
+    this.login = function(api_url, username, password, options) {
+      var params = {
+        user: username,
+        password: password
+      };
+      return this._request(api_url, 'user.login', params, options, null);
+    };
+
+  });
+
+  // Define zabbix API exception type
+  function ZabbixException(error) {
+    this.code = error.code;
+    this.message = error.message;
+    this.data = error.data;
+  }
+
+  ZabbixException.prototype.toString = function() {
+    return this.name + " " + this.message;
+  };
+
+});
\ No newline at end of file

From 037b4b523afee9391c40943b0a1c7daf6adeabb2 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 13:28:24 +0300
Subject: [PATCH 15/58] Changing zabbix api wrapper for working with
 ZabbixAPIService.

---
 plugins/datasource-zabbix/zabbixAPIService.js |  8 ++++
 plugins/datasource-zabbix/zabbixAPIWrapper.js | 45 ++++++++++++++-----
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/plugins/datasource-zabbix/zabbixAPIService.js b/plugins/datasource-zabbix/zabbixAPIService.js
index 21c9ec7..32e5687 100644
--- a/plugins/datasource-zabbix/zabbixAPIService.js
+++ b/plugins/datasource-zabbix/zabbixAPIService.js
@@ -73,6 +73,14 @@ function (angular) {
       return this._request(api_url, 'user.login', params, options, null);
     };
 
+    /**
+     * Get Zabbix API version
+     * Matches the version of Zabbix starting from Zabbix 2.0.4
+     */
+    this.getVersion = function(api_url, options) {
+      return this._request(api_url, 'apiinfo.version', [], options);
+    };
+
   });
 
   // Define zabbix API exception type
diff --git a/plugins/datasource-zabbix/zabbixAPIWrapper.js b/plugins/datasource-zabbix/zabbixAPIWrapper.js
index 9fe2ff2..4b3dff3 100644
--- a/plugins/datasource-zabbix/zabbixAPIWrapper.js
+++ b/plugins/datasource-zabbix/zabbixAPIWrapper.js
@@ -1,21 +1,26 @@
 define([
   'angular',
-  'lodash'
+  'lodash',
+  './zabbixAPIService'
   ],
 function (angular, _) {
   'use strict';
 
   var module = angular.module('grafana.services');
 
-  module.factory('ZabbixAPI', function($q, backendSrv) {
+  module.factory('ZabbixAPI', function($q, backendSrv, ZabbixAPIService) {
 
+    // Initialize Zabbix API.
     function ZabbixAPI(api_url, username, password, basicAuth, withCredentials) {
-      // Initialize API parameters.
       this.url              = api_url;
       this.username         = username;
       this.password         = password;
-      this.basicAuth        = basicAuth;
-      this.withCredentials  = withCredentials;
+      this.auth             = null;
+
+      this.requestOptions = {
+        basicAuth: basicAuth,
+        withCredentials: withCredentials
+      };
     }
 
     var p = ZabbixAPI.prototype;
@@ -24,6 +29,21 @@ function (angular, _) {
     // Core methods //
     //////////////////
 
+    p.request = function(method, params) {
+      var self = this;
+      if (this.auth) {
+        return ZabbixAPIService._request(this.url, method, params, this.requestOptions, this.auth);
+      } else {
+
+        // Login first
+        return ZabbixAPIService.login(this.url, this.username, this.password, this.requestOptions)
+          .then(function(auth) {
+            self.auth = auth;
+            return ZabbixAPIService._request(self.url, method, params, self.requestOptions, self.auth);
+          });
+      }
+    };
+
     /**
      * Request data from Zabbix API
      *
@@ -123,7 +143,10 @@ function (angular, _) {
         sortfield: 'name'
       };
 
-      return this.performZabbixAPIRequest('hostgroup.get', params);
+      return this.request('hostgroup.get', params).then(function(result) {
+        console.log("getGroups", result);
+        return result;
+      });
     };
 
     p.getHosts = function() {
@@ -133,7 +156,7 @@ function (angular, _) {
         selectGroups: []
       };
 
-      return this.performZabbixAPIRequest('host.get', params);
+      return this.request('host.get', params);
     };
 
     p.getApplications = function() {
@@ -143,7 +166,7 @@ function (angular, _) {
         selectHosts: []
       };
 
-      return this.performZabbixAPIRequest('application.get', params);
+      return this.request('application.get', params);
     };
 
     p.getItems = function() {
@@ -153,7 +176,7 @@ function (angular, _) {
         selectApplications: []
       };
 
-      return this.performZabbixAPIRequest('item.get', params);
+      return this.request('item.get', params);
     };
 
     /////////////////////////
@@ -225,7 +248,7 @@ function (angular, _) {
           params.time_till = end;
         }
 
-        return this.performZabbixAPIRequest('history.get', params);
+        return this.request('history.get', params);
       }, this)).then(function (results) {
         return _.flatten(results);
       });
@@ -261,7 +284,7 @@ function (angular, _) {
           params.time_till = end;
         }
 
-        return this.performZabbixAPIRequest('trend.get', params);
+        return this.request('trend.get', params);
       }, this)).then(function (results) {
         return _.flatten(results);
       });

From bc52687bca1b3abace56f9ce5e1c9ef7cb76412f Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 14:40:58 +0300
Subject: [PATCH 16/58] Changed testDatasource() method for new api.

---
 plugins/datasource-zabbix/datasource.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 54181a9..6ce5a58 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -4,6 +4,7 @@ define([
   'app/core/utils/datemath',
   './directives',
   './zabbixAPIWrapper',
+  './zabbixAPIService',
   './utils',
   './helperFunctions',
   './zabbixCacheSrv',
@@ -13,7 +14,8 @@ function (angular, _, dateMath) {
   'use strict';
 
   /** @ngInject */
-  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv, ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {
+  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv,
+                               ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache, ZabbixAPIService) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -43,27 +45,36 @@ function (angular, _, dateMath) {
      */
     this.testDatasource = function() {
       var self = this;
-      return this.zabbixAPI.getZabbixAPIVersion().then(function (apiVersion) {
-        return self.zabbixAPI.performZabbixAPILogin().then(function (auth) {
+      return this.zabbixAPI.getVersion().then(function (version) {
+        return self.zabbixAPI.login().then(function (auth) {
           if (auth) {
             return {
               status: "success",
               title: "Success",
-              message: "Zabbix API version: " + apiVersion
+              message: "Zabbix API version: " + version
             };
           } else {
             return {
               status: "error",
               title: "Invalid user name or password",
-              message: "Zabbix API version: " + apiVersion
+              message: "Zabbix API version: " + version
             };
           }
+        }, function(error) {
+          console.log(error);
+          return {
+            status: "error",
+            title: "Connection failed",
+            message: error
+          };
         });
-      }, function(error) {
+      },
+      function(error) {
+        console.log(error);
         return {
           status: "error",
           title: "Connection failed",
-          message: "Could not connect to " + error.config.url
+          message: "Could not connect to given url"
         };
       });
     };

From 51b0a7a0eb32a218653390cc17bed676148d7b16 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 14:43:06 +0300
Subject: [PATCH 17/58] Working on new Zabbix API service.

---
 plugins/datasource-zabbix/datasource.js       |   5 +-
 plugins/datasource-zabbix/zabbixAPI.js        | 244 +++++++
 plugins/datasource-zabbix/zabbixAPIService.js |   6 +-
 plugins/datasource-zabbix/zabbixAPIWrapper.js | 650 ------------------
 4 files changed, 249 insertions(+), 656 deletions(-)
 create mode 100644 plugins/datasource-zabbix/zabbixAPI.js
 delete mode 100644 plugins/datasource-zabbix/zabbixAPIWrapper.js

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 6ce5a58..6225cc6 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -3,8 +3,7 @@ define([
   'lodash',
   'app/core/utils/datemath',
   './directives',
-  './zabbixAPIWrapper',
-  './zabbixAPIService',
+  './zabbixAPI',
   './utils',
   './helperFunctions',
   './zabbixCacheSrv',
@@ -15,7 +14,7 @@ function (angular, _, dateMath) {
 
   /** @ngInject */
   function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv,
-                               ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache, ZabbixAPIService) {
+                               ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {
 
     // General data source settings
     this.name             = instanceSettings.name;
diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js
new file mode 100644
index 0000000..73d7a88
--- /dev/null
+++ b/plugins/datasource-zabbix/zabbixAPI.js
@@ -0,0 +1,244 @@
+define([
+  'angular',
+  'lodash',
+  './zabbixAPIService'
+  ],
+function (angular, _) {
+  'use strict';
+
+  var module = angular.module('grafana.services');
+
+  module.factory('ZabbixAPI', function($q, backendSrv, ZabbixAPIService) {
+
+    // Initialize Zabbix API.
+    function ZabbixAPI(api_url, username, password, basicAuth, withCredentials) {
+      this.url              = api_url;
+      this.username         = username;
+      this.password         = password;
+      this.auth             = null;
+
+      this.requestOptions = {
+        basicAuth: basicAuth,
+        withCredentials: withCredentials
+      };
+    }
+
+    var p = ZabbixAPI.prototype;
+
+    //////////////////
+    // Core methods //
+    //////////////////
+
+    p.request = function(method, params) {
+      var self = this;
+      if (this.auth) {
+        return ZabbixAPIService._request(this.url, method, params, this.requestOptions, this.auth);
+      } else {
+
+        // Login first
+        return ZabbixAPIService.login(this.url, this.username, this.password, this.requestOptions)
+          .then(function(auth) {
+            self.auth = auth;
+            return ZabbixAPIService._request(self.url, method, params, self.requestOptions, self.auth);
+          });
+      }
+    };
+
+    /**
+     * Get authentication token.
+     */
+    p.login = function() {
+      return ZabbixAPIService.login(this.url, this.username, this.password, this.requestOptions);
+    };
+
+    /**
+     * Get Zabbix API version
+     */
+    p.getVersion = function() {
+      return ZabbixAPIService.getVersion(this.url, this.requestOptions);
+    };
+
+    /////////////////
+    // API methods //
+    /////////////////
+
+    p.getGroups = function() {
+      var params = {
+        output: ['name'],
+        sortfield: 'name'
+      };
+
+      return this.request('hostgroup.get', params);
+    };
+
+    p.getHosts = function() {
+      var params = {
+        output: ['name', 'host'],
+        sortfield: 'name',
+        selectGroups: []
+      };
+
+      return this.request('host.get', params);
+    };
+
+    p.getApplications = function() {
+      var params = {
+        output: ['name'],
+        sortfield: 'name',
+        selectHosts: []
+      };
+
+      return this.request('application.get', params);
+    };
+
+    p.getItems = function() {
+      var params = {
+        output: ['name', 'key_', 'value_type', 'hostid', 'status', 'state'],
+        sortfield: 'name',
+        selectApplications: []
+      };
+
+      return this.request('item.get', params);
+    };
+
+    /**
+     * Perform history query from Zabbix API
+     *
+     * @param  {Array}  items Array of Zabbix item objects
+     * @param  {Number} start Time in seconds
+     * @param  {Number} end   Time in seconds
+     * @return {Array}        Array of Zabbix history objects
+     */
+    p.getHistory = function(items, start, end) {
+      // Group items by value type
+      var grouped_items = _.groupBy(items, 'value_type');
+
+      // Perform request for each value type
+      return $q.all(_.map(grouped_items, function (items, value_type) {
+        var itemids = _.map(items, 'itemid');
+        var params = {
+          output: 'extend',
+          history: value_type,
+          itemids: itemids,
+          sortfield: 'clock',
+          sortorder: 'ASC',
+          time_from: start
+        };
+
+        // Relative queries (e.g. last hour) don't include an end time
+        if (end) {
+          params.time_till = end;
+        }
+
+        return this.request('history.get', params);
+      }, this)).then(function (results) {
+        return _.flatten(results);
+      });
+    };
+
+    /**
+     * Perform trends query from Zabbix API
+     * Use trends api extension from ZBXNEXT-1193 patch.
+     *
+     * @param  {Array}  items Array of Zabbix item objects
+     * @param  {Number} start Time in seconds
+     * @param  {Number} end   Time in seconds
+     * @return {Array}        Array of Zabbix trend objects
+     */
+    p.getTrends = function(items, start, end) {
+      // Group items by value type
+      var grouped_items = _.groupBy(items, 'value_type');
+
+      // Perform request for each value type
+      return $q.all(_.map(grouped_items, function (items, value_type) {
+        var itemids = _.map(items, 'itemid');
+        var params = {
+          output: 'extend',
+          trend: value_type,
+          itemids: itemids,
+          sortfield: 'clock',
+          sortorder: 'ASC',
+          time_from: start
+        };
+
+        // Relative queries (e.g. last hour) don't include an end time
+        if (end) {
+          params.time_till = end;
+        }
+
+        return this.request('trend.get', params);
+      }, this)).then(function (results) {
+        return _.flatten(results);
+      });
+    };
+
+    p.getITService = function(/* optional */ serviceids) {
+      var params = {
+        output: 'extend',
+        serviceids: serviceids
+      };
+      return this.request('service.get', params);
+    };
+
+    p.getSLA = function(serviceids, from, to) {
+      var params = {
+        serviceids: serviceids,
+        intervals: [{
+          from: from,
+          to: to
+        }]
+      };
+      return this.request('service.getsla', params);
+    };
+
+    p.getTriggers = function(limit, sortfield, groupids, hostids, applicationids, name) {
+      var params = {
+        output: 'extend',
+        expandDescription: true,
+        expandData: true,
+        monitored: true,
+        //only_true: true,
+        filter: {
+          value: 1
+        },
+        search : {
+          description: name
+        },
+        searchWildcardsEnabled: false,
+        groupids: groupids,
+        hostids: hostids,
+        applicationids: applicationids,
+        limit: limit,
+        sortfield: 'lastchange',
+        sortorder: 'DESC'
+      };
+
+      if (sortfield) {
+        params.sortfield = sortfield;
+      }
+
+      return this.request('trigger.get', params);
+    };
+
+    p.getAcknowledges = function(triggerids, from) {
+      var params = {
+        output: 'extend',
+        objectids: triggerids,
+        acknowledged: true,
+        select_acknowledges: 'extend',
+        sortfield: 'clock',
+        sortorder: 'DESC',
+        time_from: from
+      };
+
+      return this.request('event.get', params)
+        .then(function (events) {
+          return _.flatten(_.map(events, 'acknowledges'));
+        });
+    };
+
+    return ZabbixAPI;
+
+  });
+
+});
diff --git a/plugins/datasource-zabbix/zabbixAPIService.js b/plugins/datasource-zabbix/zabbixAPIService.js
index 32e5687..2212a5a 100644
--- a/plugins/datasource-zabbix/zabbixAPIService.js
+++ b/plugins/datasource-zabbix/zabbixAPIService.js
@@ -86,12 +86,12 @@ function (angular) {
   // Define zabbix API exception type
   function ZabbixException(error) {
     this.code = error.code;
-    this.message = error.message;
-    this.data = error.data;
+    this.errorType = error.message;
+    this.message = error.data;
   }
 
   ZabbixException.prototype.toString = function() {
-    return this.name + " " + this.message;
+    return this.errorType + ": " + this.message;
   };
 
 });
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/zabbixAPIWrapper.js b/plugins/datasource-zabbix/zabbixAPIWrapper.js
deleted file mode 100644
index 4b3dff3..0000000
--- a/plugins/datasource-zabbix/zabbixAPIWrapper.js
+++ /dev/null
@@ -1,650 +0,0 @@
-define([
-  'angular',
-  'lodash',
-  './zabbixAPIService'
-  ],
-function (angular, _) {
-  'use strict';
-
-  var module = angular.module('grafana.services');
-
-  module.factory('ZabbixAPI', function($q, backendSrv, ZabbixAPIService) {
-
-    // Initialize Zabbix API.
-    function ZabbixAPI(api_url, username, password, basicAuth, withCredentials) {
-      this.url              = api_url;
-      this.username         = username;
-      this.password         = password;
-      this.auth             = null;
-
-      this.requestOptions = {
-        basicAuth: basicAuth,
-        withCredentials: withCredentials
-      };
-    }
-
-    var p = ZabbixAPI.prototype;
-
-    //////////////////
-    // Core methods //
-    //////////////////
-
-    p.request = function(method, params) {
-      var self = this;
-      if (this.auth) {
-        return ZabbixAPIService._request(this.url, method, params, this.requestOptions, this.auth);
-      } else {
-
-        // Login first
-        return ZabbixAPIService.login(this.url, this.username, this.password, this.requestOptions)
-          .then(function(auth) {
-            self.auth = auth;
-            return ZabbixAPIService._request(self.url, method, params, self.requestOptions, self.auth);
-          });
-      }
-    };
-
-    /**
-     * Request data from Zabbix API
-     *
-     * @param  {string} method Zabbix API method name
-     * @param  {object} params method params
-     * @return {object}        data.result field or []
-     */
-    p.performZabbixAPIRequest = function(method, params) {
-      var options = {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        url: this.url,
-        data: {
-          jsonrpc: '2.0',
-          method: method,
-          params: params,
-          auth: this.auth,
-          id: 1
-        }
-      };
-
-      if (this.basicAuth || this.withCredentials) {
-        options.withCredentials = true;
-      }
-      if (this.basicAuth) {
-        options.headers.Authorization = this.basicAuth;
-      }
-
-      var self = this;
-      return backendSrv.datasourceRequest(options).then(function (response) {
-        if (!response.data) {
-          return [];
-        }
-        // Handle Zabbix API errors
-        else if (response.data.error) {
-
-          // Handle auth errors
-          if (response.data.error.data === "Session terminated, re-login, please." ||
-              response.data.error.data === "Not authorised." ||
-              response.data.error.data === "Not authorized") {
-            return self.performZabbixAPILogin().then(function (response) {
-              self.auth = response;
-              return self.performZabbixAPIRequest(method, params);
-            });
-          }
-        }
-        return response.data.result;
-      });
-    };
-
-    /**
-     * Get authentication token.
-     *
-     * @return {string}  auth token
-     */
-    p.performZabbixAPILogin = function() {
-      var options = {
-        url : this.url,
-        method : 'POST',
-        data: {
-          jsonrpc: '2.0',
-          method: 'user.login',
-          params: {
-            user: this.username,
-            password: this.password
-          },
-          auth: null,
-          id: 1
-        }
-      };
-
-      if (this.basicAuth || this.withCredentials) {
-        options.withCredentials = true;
-      }
-      if (this.basicAuth) {
-        options.headers = options.headers || {};
-        options.headers.Authorization = this.basicAuth;
-      }
-
-      return backendSrv.datasourceRequest(options).then(function (result) {
-        if (!result.data) {
-          return null;
-        }
-        return result.data.result;
-      });
-    };
-
-    //////////////////////////
-    // High-level functions //
-    //////////////////////////
-
-    p.getGroups = function() {
-      var params = {
-        output: ['name'],
-        sortfield: 'name'
-      };
-
-      return this.request('hostgroup.get', params).then(function(result) {
-        console.log("getGroups", result);
-        return result;
-      });
-    };
-
-    p.getHosts = function() {
-      var params = {
-        output: ['name', 'host'],
-        sortfield: 'name',
-        selectGroups: []
-      };
-
-      return this.request('host.get', params);
-    };
-
-    p.getApplications = function() {
-      var params = {
-        output: ['name'],
-        sortfield: 'name',
-        selectHosts: []
-      };
-
-      return this.request('application.get', params);
-    };
-
-    p.getItems = function() {
-      var params = {
-        output: ['name', 'key_', 'value_type', 'hostid', 'status', 'state'],
-        sortfield: 'name',
-        selectApplications: []
-      };
-
-      return this.request('item.get', params);
-    };
-
-    /////////////////////////
-    // API method wrappers //
-    /////////////////////////
-
-    /**
-     * Request version of the Zabbix API.
-     *
-     * @return {string} Zabbix API version
-     */
-    p.getZabbixAPIVersion = function() {
-      var options = {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        url: this.url,
-        data: {
-          jsonrpc: '2.0',
-          method: 'apiinfo.version',
-          params: [],
-          id: 1
-        }
-      };
-
-      if (this.basicAuth || this.withCredentials) {
-        options.withCredentials = true;
-      }
-      if (this.basicAuth) {
-        options.headers = options.headers || {};
-        options.headers.Authorization = this.basicAuth;
-      }
-
-      return backendSrv.datasourceRequest(options).then(function (result) {
-        if (!result.data) {
-          return null;
-        }
-        return result.data.result;
-      });
-    };
-
-    /**
-     * Perform history query from Zabbix API
-     *
-     * @param  {Array}  items Array of Zabbix item objects
-     * @param  {Number} start Time in seconds
-     * @param  {Number} end   Time in seconds
-     * @return {Array}        Array of Zabbix history objects
-     */
-    p.getHistory = function(items, start, end) {
-      // Group items by value type
-      var grouped_items = _.groupBy(items, 'value_type');
-
-      // Perform request for each value type
-      return $q.all(_.map(grouped_items, function (items, value_type) {
-        var itemids = _.map(items, 'itemid');
-        var params = {
-          output: 'extend',
-          history: value_type,
-          itemids: itemids,
-          sortfield: 'clock',
-          sortorder: 'ASC',
-          time_from: start
-        };
-
-        // Relative queries (e.g. last hour) don't include an end time
-        if (end) {
-          params.time_till = end;
-        }
-
-        return this.request('history.get', params);
-      }, this)).then(function (results) {
-        return _.flatten(results);
-      });
-    };
-
-    /**
-     * Perform trends query from Zabbix API
-     * Use trends api extension from ZBXNEXT-1193 patch.
-     *
-     * @param  {Array}  items Array of Zabbix item objects
-     * @param  {Number} start Time in seconds
-     * @param  {Number} end   Time in seconds
-     * @return {Array}        Array of Zabbix trend objects
-     */
-    p.getTrends = function(items, start, end) {
-      // Group items by value type
-      var grouped_items = _.groupBy(items, 'value_type');
-
-      // Perform request for each value type
-      return $q.all(_.map(grouped_items, function (items, value_type) {
-        var itemids = _.map(items, 'itemid');
-        var params = {
-          output: 'extend',
-          trend: value_type,
-          itemids: itemids,
-          sortfield: 'clock',
-          sortorder: 'ASC',
-          time_from: start
-        };
-
-        // Relative queries (e.g. last hour) don't include an end time
-        if (end) {
-          params.time_till = end;
-        }
-
-        return this.request('trend.get', params);
-      }, this)).then(function (results) {
-        return _.flatten(results);
-      });
-    };
-
-    /**
-     * Get the list of host groups
-     *
-     * @return {array}          array of Zabbix hostgroup objects
-     */
-    p.performHostGroupSuggestQuery = function() {
-      var params = {
-        output: ['name'],
-        sortfield: 'name',
-        // Return only host groups that contain hosts
-        real_hosts: true,
-        // Return only host groups that contain monitored hosts.
-        monitored_hosts: true
-      };
-
-      return this.performZabbixAPIRequest('hostgroup.get', params);
-    };
-
-    /**
-     * Get the list of hosts
-     *
-     * @param  {string|string[]} groupids
-     * @return {Object}          array of Zabbix host objects
-     */
-    p.performHostSuggestQuery = function(groupids) {
-      var params = {
-        output: ['name', 'host'],
-        sortfield: 'name',
-        // Return only hosts that have items with numeric type of information.
-        with_simple_graph_items: true,
-        // Return only monitored hosts.
-        monitored_hosts: true
-      };
-      // Return only hosts in given group
-      if (groupids) {
-        params.groupids = groupids;
-      }
-      return this.performZabbixAPIRequest('host.get', params);
-    };
-
-    /**
-     * Get the list of applications
-     *
-     * @param  {array} hostids
-     * @param  {array} groupids
-     * @return {Object}          array of Zabbix application objects
-     */
-    p.performAppSuggestQuery = function(hostids, /* optional */ groupids) {
-      var params = {
-        output: ['name'],
-        sortfield: 'name'
-      };
-      if (hostids) {
-        params.hostids = hostids;
-      }
-      else if (groupids) {
-        params.groupids = groupids;
-      }
-
-      return this.performZabbixAPIRequest('application.get', params);
-    };
-
-    /**
-     * Items request
-     *
-     * @param  {string|string[]} hostids          ///////////////////////////
-     * @param  {string|string[]} applicationids   // Zabbix API parameters //
-     * @param  {string|string[]} groupids         ///////////////////////////
-     * @return {string|string[]}                  Array of Zabbix API item objects
-     */
-    p.performItemSuggestQuery = function(hostids, applicationids, groupids, itemtype) {
-      var params = {
-        output: ['name', 'key_', 'value_type', 'delay'],
-        sortfield: 'name',
-        //Include web items in the result
-        webitems: true,
-        // Return only numeric items
-        filter: {
-          value_type: [0, 3]
-        },
-        // Return only enabled items
-        monitored: true,
-        searchByAny: true
-      };
-
-      if (itemtype === "text") {
-        params.filter.value_type = [1, 2, 4];
-      }
-
-      // Filter by hosts or by groups
-      if (hostids) {
-        params.hostids = hostids;
-      } else if (groupids) {
-        params.groupids = groupids;
-      }
-
-      // If application selected return only relative items
-      if (applicationids) {
-        params.applicationids = applicationids;
-      }
-
-      // Return host property for multiple hosts
-      if (!hostids || (_.isArray(hostids) && hostids.length  > 1)) {
-        params.selectHosts = ['name'];
-      }
-
-      return this.performZabbixAPIRequest('item.get', params);
-    };
-
-    /**
-     * Get groups by names
-     *
-     * @param  {string or array} group group names
-     * @return {array}                 array of Zabbix API hostgroup objects
-     */
-    p.getGroupByName = function (group) {
-      var params = {
-        output: ['name']
-      };
-      if (group && group[0] !== '*') {
-        params.filter = {
-          name: group
-        };
-      }
-      return this.performZabbixAPIRequest('hostgroup.get', params);
-    };
-
-    /**
-     * Search group by name.
-     *
-     * @param  {string} group group name
-     * @return {array}        groups
-     */
-    p.searchGroup = function (group) {
-      var params = {
-        output: ['name'],
-        search: {
-          name: group
-        },
-        searchWildcardsEnabled: true
-      };
-      return this.performZabbixAPIRequest('hostgroup.get', params);
-    };
-
-    /**
-     * Get hosts by names
-     *
-     * @param  {string or array} hostnames hosts names
-     * @return {array}                     array of Zabbix API host objects
-     */
-    p.getHostByName = function (hostnames) {
-      var params = {
-        output: ['host', 'name']
-      };
-      if (hostnames && hostnames[0] !== '*') {
-        params.filter = {
-          name: hostnames
-        };
-      }
-      return this.performZabbixAPIRequest('host.get', params);
-    };
-
-    /**
-     * Get applications by names
-     *
-     * @param  {string or array} application applications names
-     * @return {array}                       array of Zabbix API application objects
-     */
-    p.getAppByName = function (application) {
-      var params = {
-        output: ['name']
-      };
-      if (application && application[0] !== '*') {
-        params.filter = {
-          name: application
-        };
-      }
-      return this.performZabbixAPIRequest('application.get', params);
-    };
-
-    /**
-     * Get items belongs to passed groups, hosts and
-     * applications
-     *
-     * @param  {string or array} groups
-     * @param  {string or array} hosts
-     * @param  {string or array} apps
-     * @return {array}  array of Zabbix API item objects
-     */
-    p.itemFindQuery = function(groups, hosts, apps, itemtype) {
-      var promises = [];
-
-      // Get hostids from names
-      if (hosts && hosts[0] !== '*') {
-        promises.push(this.getHostByName(hosts));
-      }
-      // Get groupids from names
-      else if (groups) {
-        promises.push(this.getGroupByName(groups));
-      }
-      // Get applicationids from names
-      if (apps && apps[0] !== '*') {
-        promises.push(this.getAppByName(apps));
-      }
-
-      var self = this;
-      return $q.all(promises).then(function (results) {
-        results = _.flatten(results);
-        var groupids;
-        var hostids;
-        var applicationids;
-        if (groups) {
-          groupids = _.map(_.filter(results, function (object) {
-            return object.groupid;
-          }), 'groupid');
-        }
-        if (hosts && hosts[0] !== '*') {
-          hostids = _.map(_.filter(results, function (object) {
-            return object.hostid;
-          }), 'hostid');
-        }
-        if (apps && apps[0] !== '*') {
-          applicationids = _.map(_.filter(results, function (object) {
-            return object.applicationid;
-          }), 'applicationid');
-        }
-
-        return self.performItemSuggestQuery(hostids, applicationids, groupids, itemtype);
-      });
-    };
-
-    /**
-     * Find applications belongs to passed groups and hosts
-     *
-     * @param  {string or array} hosts
-     * @param  {string or array} groups
-     * @return {array}  array of Zabbix API application objects
-     */
-    p.appFindQuery = function(hosts, groups) {
-      var promises = [];
-
-      // Get hostids from names
-      if (hosts && hosts[0] !== '*') {
-        promises.push(this.getHostByName(hosts));
-      }
-      // Get groupids from names
-      else if (groups) {
-        promises.push(this.getGroupByName(groups));
-      }
-
-      var self = this;
-      return $q.all(promises).then(function (results) {
-        results = _.flatten(results);
-        var groupids;
-        var hostids;
-        if (groups) {
-          groupids = _.map(_.filter(results, function (object) {
-            return object.groupid;
-          }), 'groupid');
-        }
-        if (hosts && hosts[0] !== '*') {
-          hostids = _.map(_.filter(results, function (object) {
-            return object.hostid;
-          }), 'hostid');
-        }
-
-        return self.performAppSuggestQuery(hostids, groupids);
-      });
-    };
-
-    /**
-     * Find hosts belongs to passed groups
-     *
-     * @param  {string or array} groups
-     * @return {array}  array of Zabbix API host objects
-     */
-    p.hostFindQuery = function(groups) {
-      var self = this;
-      return this.getGroupByName(groups).then(function (results) {
-        results = _.flatten(results);
-        var groupids = _.map(_.filter(results, function (object) {
-          return object.groupid;
-        }), 'groupid');
-
-        return self.performHostSuggestQuery(groupids);
-      });
-    };
-
-    p.getITService = function(/* optional */ serviceids) {
-      var params = {
-        output: 'extend',
-        serviceids: serviceids
-      };
-      return this.performZabbixAPIRequest('service.get', params);
-    };
-
-    p.getSLA = function(serviceids, from, to) {
-      var params = {
-        serviceids: serviceids,
-        intervals: [{
-          from: from,
-          to: to
-        }]
-      };
-      return this.performZabbixAPIRequest('service.getsla', params);
-    };
-
-    p.getTriggers = function(limit, sortfield, groupids, hostids, applicationids, name) {
-      var params = {
-        output: 'extend',
-        expandDescription: true,
-        expandData: true,
-        monitored: true,
-        //only_true: true,
-        filter: {
-          value: 1
-        },
-        search : {
-          description: name
-        },
-        searchWildcardsEnabled: false,
-        groupids: groupids,
-        hostids: hostids,
-        applicationids: applicationids,
-        limit: limit,
-        sortfield: 'lastchange',
-        sortorder: 'DESC'
-      };
-
-      if (sortfield) {
-        params.sortfield = sortfield;
-      }
-
-      return this.performZabbixAPIRequest('trigger.get', params);
-    };
-
-    p.getAcknowledges = function(triggerids, from) {
-      var params = {
-        output: 'extend',
-        objectids: triggerids,
-        acknowledged: true,
-        select_acknowledges: 'extend',
-        sortfield: 'clock',
-        sortorder: 'DESC',
-        time_from: from
-      };
-
-      return this.performZabbixAPIRequest('event.get', params)
-        .then(function (events) {
-          return _.flatten(_.map(events, 'acknowledges'));
-        });
-    };
-
-    return ZabbixAPI;
-
-  });
-
-});

From 3ee15a0a7ee0ac84424da0e6f2b47104f9d04e1b Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 18:31:19 +0300
Subject: [PATCH 18/58] Handle "Session terminated..." error.

---
 plugins/datasource-zabbix/zabbixAPI.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js
index 73d7a88..8f12599 100644
--- a/plugins/datasource-zabbix/zabbixAPI.js
+++ b/plugins/datasource-zabbix/zabbixAPI.js
@@ -32,7 +32,21 @@ function (angular, _) {
     p.request = function(method, params) {
       var self = this;
       if (this.auth) {
-        return ZabbixAPIService._request(this.url, method, params, this.requestOptions, this.auth);
+        return ZabbixAPIService._request(this.url, method, params, this.requestOptions, this.auth)
+          .then(function(result) {
+            return result;
+          },
+
+          // Handle errors
+          function(error) {
+            if (error.message === "Session terminated, re-login, please.") {
+              return ZabbixAPIService.login(self.url, self.username, self.password, self.requestOptions)
+                .then(function(auth) {
+                  self.auth = auth;
+                  return ZabbixAPIService._request(self.url, method, params, self.requestOptions, self.auth);
+                });
+            }
+          });
       } else {
 
         // Login first

From 6b71f42c48cd3083757e74ec3e5e319ddb676ef6 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 20:31:45 +0300
Subject: [PATCH 19/58] Build query true QueryBuilder.

---
 plugins/datasource-zabbix/datasource.js       | 127 +++---------------
 plugins/datasource-zabbix/queryBuilder.js     |  76 ++++-------
 plugins/datasource-zabbix/queryCtrl.js        |   4 +-
 plugins/datasource-zabbix/utils.js            |  11 +-
 .../{zabbixCacheSrv.js => zabbixCache.js}     |   6 +-
 5 files changed, 48 insertions(+), 176 deletions(-)
 rename plugins/datasource-zabbix/{zabbixCacheSrv.js => zabbixCache.js} (95%)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 6225cc6..e25349d 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -2,19 +2,19 @@ define([
   'angular',
   'lodash',
   'app/core/utils/datemath',
+  './queryBuilder',
   './directives',
   './zabbixAPI',
-  './utils',
   './helperFunctions',
-  './zabbixCacheSrv',
+  './zabbixCache',
   './queryCtrl'
 ],
-function (angular, _, dateMath) {
+function (angular, _, dateMath, QueryBuilder) {
   'use strict';
 
   /** @ngInject */
-  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv,
-                               ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {
+  function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv,
+                               ZabbixAPI, zabbixHelperSrv, ZabbixCache) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -35,7 +35,13 @@ function (angular, _, dateMath) {
 
     // Initialize cache service
     this.zabbixCache = new ZabbixCache(this.zabbixAPI);
-    console.log(this.zabbixCache);
+
+    // Initialize query builder
+    this.queryBuilder = new QueryBuilder(this.zabbixCache);
+
+    ////////////////////////
+    // Datasource methods //
+    ////////////////////////
 
     /**
      * Test connection to Zabbix API
@@ -79,7 +85,7 @@ function (angular, _, dateMath) {
     };
 
     /**
-     * Calls for each panel in dashboard.
+     * Query panel data. Calls for each panel in dashboard.
      *
      * @param  {Object} options   Query options. Contains time range, targets
      *                            and other info.
@@ -112,112 +118,9 @@ function (angular, _, dateMath) {
           var itemFilter = templateSrv.replace(target.item.filter, options.scopedVars);
 
           // Query numeric data
-          if (!target.mode) {
+          if (!target.mode || target.mode === 0) {
 
-            // Find items by item names and perform queries
-            var groups = [];
-            var hosts = [];
-            var apps = [];
-            var items = [];
-
-            if (target.host.isRegex) {
-
-              // Filter groups
-              if (target.group.isRegex) {
-                var groupPattern = Utils.buildRegex(groupFilter);
-                groups = _.filter(self.zabbixCache.getGroups(), function (groupObj) {
-                  return groupPattern.test(groupObj.name);
-                });
-              } else {
-                var findedGroup = _.find(self.zabbixCache.getGroups(), {'name': groupFilter});
-                if (findedGroup) {
-                  groups.push(findedGroup);
-                } else {
-                  groups = undefined;
-                }
-              }
-              if (groups) {
-                var groupids = _.map(groups, 'groupid');
-                hosts = _.filter(self.zabbixCache.getHosts(), function (hostObj) {
-                  return _.intersection(groupids, hostObj.groups).length;
-                });
-              } else {
-                // No groups finded
-                return [];
-              }
-
-              // Filter hosts
-              var hostPattern = Utils.buildRegex(hostFilter);
-              hosts = _.filter(hosts, function (hostObj) {
-                return hostPattern.test(hostObj.name);
-              });
-            } else {
-              var findedHost = _.find(self.zabbixCache.getHosts(), {'name': hostFilter});
-              if (findedHost) {
-                hosts.push(findedHost);
-              } else {
-                // No hosts finded
-                return [];
-              }
-            }
-
-            // Find items belongs to selected hosts
-            items = _.filter(self.zabbixCache.getItems(), function (itemObj) {
-              return _.contains(_.map(hosts, 'hostid'), itemObj.hostid);
-            });
-
-            if (target.item.isRegex) {
-
-              // Filter applications
-              if (target.application.isRegex) {
-                var appPattern = Utils.buildRegex(appFilter);
-                apps = _.filter(self.zabbixCache.getApplications(), function (appObj) {
-                  return appPattern.test(appObj.name);
-                });
-              }
-              // Don't use application filter if it empty
-              else if (appFilter === "") {
-                apps = undefined;
-              }
-              else {
-                var findedApp = _.find(self.zabbixCache.getApplications(), {'name': appFilter});
-                if (findedApp) {
-                  apps.push(findedApp);
-                } else {
-                  // No applications finded
-                  return [];
-                }
-              }
-
-              // Find items belongs to selected applications
-              if (apps) {
-                var appids = _.flatten(_.map(apps, 'applicationids'));
-                items = _.filter(items, function (itemObj) {
-                  return _.intersection(appids, itemObj.applications).length;
-                });
-              }
-
-              if (items) {
-                var itemPattern = Utils.buildRegex(itemFilter);
-                items = _.filter(items, function (itemObj) {
-                  return itemPattern.test(itemObj.name);
-                });
-              } else {
-                // No items finded
-                return [];
-              }
-            } else {
-              items = _.filter(items, {'name': hostFilter});
-              if (!items.length) {
-                // No items finded
-                return [];
-              }
-            }
-
-            // Set host as host name for each item
-            items = _.each(items, function (itemObj) {
-              itemObj.host = _.find(hosts, {'hostid': itemObj.hostid}).name;
-            });
+            var items = self.queryBuilder.build(groupFilter, hostFilter, appFilter, itemFilter);
 
             // Use alias only for single metric, otherwise use item names
             var alias;
diff --git a/plugins/datasource-zabbix/queryBuilder.js b/plugins/datasource-zabbix/queryBuilder.js
index 5293409..8bdba8a 100644
--- a/plugins/datasource-zabbix/queryBuilder.js
+++ b/plugins/datasource-zabbix/queryBuilder.js
@@ -1,15 +1,14 @@
 define([
   'angular',
   'lodash',
-  './zabbixCacheSrv',
   './utils'
 ],
-function (angular, _) {
+function (angular, _, utils) {
   'use strict';
 
-  var module = angular.module('grafana.services');
+  function QueryBuilder(zabbixCacheInstance) {
 
-  module.service('QueryBuilderSrv', function(ZabbixCache, Utils) {
+    this.cache = zabbixCacheInstance;
 
     this.build = function (groupFilter, hostFilter, appFilter, itemFilter) {
 
@@ -19,16 +18,16 @@ function (angular, _) {
       var apps = [];
       var items = [];
 
-      if (Utils.isRegex(hostFilter)) {
+      if (utils.isRegex(hostFilter)) {
 
         // Filter groups
-        if (Utils.isRegex(groupFilter)) {
-          var groupPattern = Utils.buildRegex(groupFilter);
-          groups = _.filter(ZabbixCache.getGroups(), function (groupObj) {
+        if (utils.isRegex(groupFilter)) {
+          var groupPattern = utils.buildRegex(groupFilter);
+          groups = _.filter(this.cache.getGroups(), function (groupObj) {
             return groupPattern.test(groupObj.name);
           });
         } else {
-          var findedGroup = _.find(ZabbixCache.getGroups(), {'name': groupFilter});
+          var findedGroup = _.find(this.cache.getGroups(), {'name': groupFilter});
           if (findedGroup) {
             groups.push(findedGroup);
           } else {
@@ -37,7 +36,7 @@ function (angular, _) {
         }
         if (groups) {
           var groupids = _.map(groups, 'groupid');
-          hosts = _.filter(ZabbixCache.getHosts(), function (hostObj) {
+          hosts = _.filter(this.cache.getHosts(), function (hostObj) {
             return _.intersection(groupids, hostObj.groups).length;
           });
         } else {
@@ -46,12 +45,12 @@ function (angular, _) {
         }
 
         // Filter hosts
-        var hostPattern = Utils.buildRegex(hostFilter);
+        var hostPattern = utils.buildRegex(hostFilter);
         hosts = _.filter(hosts, function (hostObj) {
           return hostPattern.test(hostObj.name);
         });
       } else {
-        var findedHost = _.find(ZabbixCache.getHosts(), {'name': hostFilter});
+        var findedHost = _.find(this.cache.getHosts(), {'name': hostFilter});
         if (findedHost) {
           hosts.push(findedHost);
         } else {
@@ -61,16 +60,16 @@ function (angular, _) {
       }
 
       // Find items belongs to selected hosts
-      items = _.filter(ZabbixCache.getItems(), function (itemObj) {
+      items = _.filter(this.cache.getItems(), function (itemObj) {
         return _.contains(_.map(hosts, 'hostid'), itemObj.hostid);
       });
 
-      if (Utils.isRegex(itemFilter)) {
+      if (utils.isRegex(itemFilter)) {
 
         // Filter applications
-        if (Utils.isRegex(appFilter)) {
-          var appPattern = Utils.buildRegex(appFilter);
-          apps = _.filter(ZabbixCache.getApplications(), function (appObj) {
+        if (utils.isRegex(appFilter)) {
+          var appPattern = utils.buildRegex(appFilter);
+          apps = _.filter(this.cache.getApplications(), function (appObj) {
             return appPattern.test(appObj.name);
           });
         }
@@ -79,7 +78,7 @@ function (angular, _) {
           apps = undefined;
         }
         else {
-          var findedApp = _.find(ZabbixCache.getApplications(), {'name': appFilter});
+          var findedApp = _.find(this.cache.getApplications(), {'name': appFilter});
           if (findedApp) {
             apps.push(findedApp);
           } else {
@@ -97,7 +96,7 @@ function (angular, _) {
         }
 
         if (items) {
-          var itemPattern = Utils.buildRegex(itemFilter);
+          var itemPattern = utils.buildRegex(itemFilter);
           items = _.filter(items, function (itemObj) {
             return itemPattern.test(itemObj.name);
           });
@@ -118,40 +117,11 @@ function (angular, _) {
         itemObj.host = _.find(hosts, {'hostid': itemObj.hostid}).name;
       });
 
-      // Use alias only for single metric, otherwise use item names
-      var alias;
-      if (items.length === 1) {
-        alias = templateSrv.replace(alias, options.scopedVars);
-      }
-
-      var history;
-      if ((from < useTrendsFrom) && self.trends) {
-        // Use trends
-        var points = downsampleFunction ? downsampleFunction.value : "avg";
-        history = self.zabbixAPI.getTrends(items, from, to)
-          .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, scale, points));
-      } else {
-        // Use history
-        history = self.zabbixAPI.getHistory(items, from, to)
-          .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, scale));
-      }
-
-      return history.then(function (timeseries) {
-        var timeseries_data = _.flatten(timeseries);
-        return _.map(timeseries_data, function (timeseries) {
-
-          // Series downsampling
-          if (timeseries.datapoints.length > options.maxDataPoints) {
-            var ms_interval = Math.floor((to - from) / options.maxDataPoints) * 1000;
-            var downsampleFunc = downsampleFunction ? downsampleFunction.value : "avg";
-            timeseries.datapoints = zabbixHelperSrv.downsampleSeries(timeseries.datapoints, to, ms_interval, downsampleFunc);
-          }
-          return timeseries;
-        });
-      });
-
-      return itemFilter;
+      return items;
     };
 
-  });
+  }
+
+  return QueryBuilder;
+
 });
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 6d05da9..4c8dbc4 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -3,13 +3,13 @@ define([
     'lodash',
     './utils'
   ],
-  function (angular, _) {
+  function (angular, _, Utils) {
     'use strict';
 
     var module = angular.module('grafana.controllers');
     var targetLetters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-    module.controller('ZabbixAPIQueryCtrl', function ($scope, $sce, templateSrv, Utils) {
+    module.controller('ZabbixAPIQueryCtrl', function ($scope, $sce, templateSrv) {
 
       var zabbixCache = $scope.datasource.zabbixCache;
 
diff --git a/plugins/datasource-zabbix/utils.js b/plugins/datasource-zabbix/utils.js
index 900bba7..003ce53 100644
--- a/plugins/datasource-zabbix/utils.js
+++ b/plugins/datasource-zabbix/utils.js
@@ -1,13 +1,10 @@
 define([
-  'angular',
   'lodash'
 ],
-function (angular, _) {
+function () {
   'use strict';
 
-  var module = angular.module('grafana.services');
-
-  module.service('Utils', function() {
+  function utils() {
 
     /**
      * Expand Zabbix item name
@@ -43,5 +40,7 @@ function (angular, _) {
       return new RegExp(pattern, flags);
     };
 
-  });
+  }
+
+  return new utils();
 });
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/zabbixCacheSrv.js b/plugins/datasource-zabbix/zabbixCache.js
similarity index 95%
rename from plugins/datasource-zabbix/zabbixCacheSrv.js
rename to plugins/datasource-zabbix/zabbixCache.js
index 96bd424..e5d63f8 100644
--- a/plugins/datasource-zabbix/zabbixCacheSrv.js
+++ b/plugins/datasource-zabbix/zabbixCache.js
@@ -3,14 +3,14 @@ define([
   'lodash',
   './utils'
 ],
-function (angular, _) {
+function (angular, _, utils) {
   'use strict';
 
   var module = angular.module('grafana.services');
 
   // Use factory() instead service() for multiple datasources support.
   // Each datasource instance must initialize its own cache.
-  module.factory('ZabbixCache', function($q, Utils) {
+  module.factory('ZabbixCache', function($q) {
 
     function ZabbixCache(zabbixAPI, ttl) {
       var self = this;
@@ -105,7 +105,7 @@ function (angular, _) {
       return _.forEach(items, function(item) {
         item.applications = _.map(item.applications, 'applicationid');
         item.item = item.name;
-        item.name = Utils.expandItemName(item.item, item.key_);
+        item.name = utils.expandItemName(item.item, item.key_);
         return item;
       });
     }

From fa220cc45adb701a9892b66492a72289175672c8 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 22:12:03 +0300
Subject: [PATCH 20/58] Handle history response in query builder.

---
 plugins/datasource-zabbix/datasource.js   |  27 ++-
 plugins/datasource-zabbix/queryBuilder.js | 282 ++++++++++++++--------
 plugins/datasource-zabbix/zabbixAPI.js    |  48 ++--
 plugins/datasource-zabbix/zabbixCache.js  |   8 +
 4 files changed, 233 insertions(+), 132 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index e25349d..f5e62c1 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/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";
-              history = self.zabbixAPI.getTrends(items, from, to)
-                .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale, points));
+              var valueType = target.downsampleFunction ? target.downsampleFunction.value : "avg";
+              getHistory = self.zabbixAPI.getTrends(items, from, to).then(function(history) {
+                return self.queryBuilder.handleTrends(history, addHostName, valueType);
+              });
             } else {
+
               // Use history
-              history = self.zabbixAPI.getHistory(items, from, to)
-                .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
+              getHistory = self.zabbixAPI.getHistory(items, from, to).then(function(history) {
+                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) {
 
diff --git a/plugins/datasource-zabbix/queryBuilder.js b/plugins/datasource-zabbix/queryBuilder.js
index 8bdba8a..053ecf8 100644
--- a/plugins/datasource-zabbix/queryBuilder.js
+++ b/plugins/datasource-zabbix/queryBuilder.js
@@ -6,122 +6,206 @@ define([
 function (angular, _, utils) {
   'use strict';
 
-  function QueryBuilder(zabbixCacheInstance) {
+  var module = angular.module('grafana.services');
 
-    this.cache = zabbixCacheInstance;
+  module.factory('QueryBuilder', function() {
 
-    this.build = function (groupFilter, hostFilter, appFilter, itemFilter) {
+    function QueryBuilder(zabbixCacheInstance) {
+      var self = this;
 
-      // Find items by item names and perform queries
-      var groups = [];
-      var hosts = [];
-      var apps = [];
-      var items = [];
+      this.cache = zabbixCacheInstance;
 
-      if (utils.isRegex(hostFilter)) {
+      /**
+       * Build query - convert target filters to array of Zabbix items
+       */
+      this.build = function (groupFilter, hostFilter, appFilter, itemFilter) {
 
-        // Filter groups
-        if (utils.isRegex(groupFilter)) {
-          var groupPattern = utils.buildRegex(groupFilter);
-          groups = _.filter(this.cache.getGroups(), function (groupObj) {
-            return groupPattern.test(groupObj.name);
-          });
-        } else {
-          var findedGroup = _.find(this.cache.getGroups(), {'name': groupFilter});
-          if (findedGroup) {
-            groups.push(findedGroup);
+        // Find items by item names and perform queries
+        var groups = [];
+        var hosts = [];
+        var apps = [];
+        var items = [];
+
+        if (utils.isRegex(hostFilter)) {
+
+          // Filter groups
+          if (utils.isRegex(groupFilter)) {
+            var groupPattern = utils.buildRegex(groupFilter);
+            groups = _.filter(this.cache.getGroups(), function (groupObj) {
+              return groupPattern.test(groupObj.name);
+            });
           } else {
-            groups = undefined;
+            var findedGroup = _.find(this.cache.getGroups(), {'name': groupFilter});
+            if (findedGroup) {
+              groups.push(findedGroup);
+            } else {
+              groups = undefined;
+            }
           }
-        }
-        if (groups) {
-          var groupids = _.map(groups, 'groupid');
-          hosts = _.filter(this.cache.getHosts(), function (hostObj) {
-            return _.intersection(groupids, hostObj.groups).length;
-          });
-        } else {
-          // No groups finded
-          return [];
-        }
-
-        // Filter hosts
-        var hostPattern = utils.buildRegex(hostFilter);
-        hosts = _.filter(hosts, function (hostObj) {
-          return hostPattern.test(hostObj.name);
-        });
-      } else {
-        var findedHost = _.find(this.cache.getHosts(), {'name': hostFilter});
-        if (findedHost) {
-          hosts.push(findedHost);
-        } else {
-          // No hosts finded
-          return [];
-        }
-      }
-
-      // Find items belongs to selected hosts
-      items = _.filter(this.cache.getItems(), function (itemObj) {
-        return _.contains(_.map(hosts, 'hostid'), itemObj.hostid);
-      });
-
-      if (utils.isRegex(itemFilter)) {
-
-        // Filter applications
-        if (utils.isRegex(appFilter)) {
-          var appPattern = utils.buildRegex(appFilter);
-          apps = _.filter(this.cache.getApplications(), function (appObj) {
-            return appPattern.test(appObj.name);
-          });
-        }
-        // Don't use application filter if it empty
-        else if (appFilter === "") {
-          apps = undefined;
-        }
-        else {
-          var findedApp = _.find(this.cache.getApplications(), {'name': appFilter});
-          if (findedApp) {
-            apps.push(findedApp);
+          if (groups) {
+            var groupids = _.map(groups, 'groupid');
+            hosts = _.filter(this.cache.getHosts(), function (hostObj) {
+              return _.intersection(groupids, hostObj.groups).length;
+            });
           } else {
-            // No applications finded
+            // No groups finded
+            return [];
+          }
+
+          // Filter hosts
+          var hostPattern = utils.buildRegex(hostFilter);
+          hosts = _.filter(hosts, function (hostObj) {
+            return hostPattern.test(hostObj.name);
+          });
+        } else {
+          var findedHost = _.find(this.cache.getHosts(), {'name': hostFilter});
+          if (findedHost) {
+            hosts.push(findedHost);
+          } else {
+            // No hosts finded
             return [];
           }
         }
 
-        // Find items belongs to selected applications
-        if (apps) {
-          var appids = _.flatten(_.map(apps, 'applicationids'));
-          items = _.filter(items, function (itemObj) {
-            return _.intersection(appids, itemObj.applications).length;
-          });
+        // Find items belongs to selected hosts
+        items = _.filter(this.cache.getItems(), function (itemObj) {
+          return _.contains(_.map(hosts, 'hostid'), itemObj.hostid);
+        });
+
+        if (utils.isRegex(itemFilter)) {
+
+          // Filter applications
+          if (utils.isRegex(appFilter)) {
+            var appPattern = utils.buildRegex(appFilter);
+            apps = _.filter(this.cache.getApplications(), function (appObj) {
+              return appPattern.test(appObj.name);
+            });
+          }
+          // Don't use application filter if it empty
+          else if (appFilter === "") {
+            apps = undefined;
+          }
+          else {
+            var findedApp = _.find(this.cache.getApplications(), {'name': appFilter});
+            if (findedApp) {
+              apps.push(findedApp);
+            } else {
+              // No applications finded
+              return [];
+            }
+          }
+
+          // Find items belongs to selected applications
+          if (apps) {
+            var appids = _.flatten(_.map(apps, 'applicationids'));
+            items = _.filter(items, function (itemObj) {
+              return _.intersection(appids, itemObj.applications).length;
+            });
+          }
+
+          if (items) {
+            var itemPattern = utils.buildRegex(itemFilter);
+            items = _.filter(items, function (itemObj) {
+              return itemPattern.test(itemObj.name);
+            });
+          } else {
+            // No items finded
+            return [];
+          }
+        } else {
+          items = _.filter(items, {'name': hostFilter});
+          if (!items.length) {
+            // No items finded
+            return [];
+          }
         }
 
-        if (items) {
-          var itemPattern = utils.buildRegex(itemFilter);
-          items = _.filter(items, function (itemObj) {
-            return itemPattern.test(itemObj.name);
-          });
-        } else {
-          // No items finded
-          return [];
-        }
-      } else {
-        items = _.filter(items, {'name': hostFilter});
-        if (!items.length) {
-          // No items finded
-          return [];
-        }
+        // Set host as host name for each item
+        items = _.each(items, function (itemObj) {
+          itemObj.host = _.find(hosts, {'hostid': itemObj.hostid}).name;
+        });
+
+        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
+        ];
       }
 
-      // Set host as host name for each item
-      items = _.each(items, function (itemObj) {
-        itemObj.host = _.find(hosts, {'hostid': itemObj.hostid}).name;
-      });
+      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 items;
-    };
+        return [
+          Number(value),
+          point.clock * 1000
+        ];
+      }
+    }
 
-  }
-
-  return QueryBuilder;
+    return QueryBuilder;
+  });
 
 });
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js
index 8f12599..00b41dd 100644
--- a/plugins/datasource-zabbix/zabbixAPI.js
+++ b/plugins/datasource-zabbix/zabbixAPI.js
@@ -118,12 +118,14 @@ function (angular, _) {
     /**
      * Perform history query from Zabbix API
      *
-     * @param  {Array}  items Array of Zabbix item objects
-     * @param  {Number} start Time in seconds
-     * @param  {Number} end   Time in seconds
-     * @return {Array}        Array of Zabbix history objects
+     * @param  {Array}  items       Array of Zabbix item objects
+     * @param  {Number} time_from   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,30 +138,30 @@ 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) {
-          params.time_till = end;
+        if (time_till) {
+          params.time_till = time_till;
         }
 
-        return this.request('history.get', params);
-      }, this)).then(function (results) {
-        return _.flatten(results);
-      });
+        return self.request('history.get', params);
+      })).then(_.flatten);
     };
 
     /**
      * Perform trends query from Zabbix API
      * Use trends api extension from ZBXNEXT-1193 patch.
      *
-     * @param  {Array}  items Array of Zabbix item objects
-     * @param  {Number} start Time in seconds
-     * @param  {Number} end   Time in seconds
-     * @return {Array}        Array of Zabbix trend objects
+     * @param  {Array}  items       Array of Zabbix item objects
+     * @param  {Number} time_from   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) {
-          params.time_till = end;
+        if (time_till) {
+          params.time_till = time_till;
         }
 
-        return this.request('trend.get', params);
-      }, this)).then(function (results) {
-        return _.flatten(results);
-      });
+        return self.request('trend.get', params);
+      })).then(_.flatten);
     };
 
     p.getITService = function(/* optional */ serviceids) {
diff --git a/plugins/datasource-zabbix/zabbixCache.js b/plugins/datasource-zabbix/zabbixCache.js
index e5d63f8..2a73773 100644
--- a/plugins/datasource-zabbix/zabbixCache.js
+++ b/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

From 4fe7f68dd275462f183c147f84ef39dad213b054 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 23:08:59 +0300
Subject: [PATCH 21/58] Removed unnecessary _.flatten

---
 plugins/datasource-zabbix/datasource.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index f5e62c1..833d5f4 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -149,8 +149,7 @@ function (angular, _, dateMath) {
               });
             }
 
-            return getHistory.then(function (timeseries) {
-              var timeseries_data = _.flatten(timeseries);
+            return getHistory.then(function (timeseries_data) {
               return _.map(timeseries_data, function (timeseries) {
 
                 // Series downsampling
@@ -212,10 +211,11 @@ function (angular, _, dateMath) {
         }
       }, this);
 
-      return $q.all(_.flatten(promises)).then(function (results) {
-        var timeseries_data = _.flatten(results);
-        return { data: timeseries_data };
-      });
+      return $q.all(_.flatten(promises))
+        .then(_.flatten)
+        .then(function (timeseries_data) {
+          return { data: timeseries_data };
+        });
     };
 
     ////////////////

From f4fc5fa2c1b1e2a2ee8a42f8ce4e9d94a5f5b9d4 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 23:17:40 +0300
Subject: [PATCH 22/58] Hide unnecessary items in query editor.

---
 .../datasource-zabbix/partials/query.editor.html   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index a65af2e..888bdaf 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -76,14 +76,14 @@
 
   <ul class="tight-form-list" role="menu" ng-hide="target.mode == 1">
     <!-- Alias -->
-    <li>
+    <!-- <li>
       <input type="text"
              class="tight-form-input input-medium"
              ng-model="target.alias"
              spellcheck='false'
              placeholder="Alias"
              ng-blur="targetBlur()">
-    </li>
+    </li> -->
 
     <!-- Select Host Group -->
     <li class="tight-form-item input-small" style="width: 5em">Group</li>
@@ -114,7 +114,7 @@
     </li>
 
     <!-- Downsampling function -->
-    <li class="tight-form-item input-medium" ng-hide="target.mode == 2">
+    <!-- <li class="tight-form-item input-medium" ng-hide="target.mode == 2">
       Downsampling
     </li>
     <li ng-hide="target.mode == 2">
@@ -129,7 +129,7 @@
          ng-show="target.errors.metric">
         <i class="icon-warning-sign"></i>
       </a>
-    </li>
+    </li> -->
   </ul>
 
   <div class="clearfix"></div>
@@ -137,7 +137,7 @@
 
 <div class="tight-form" ng-hide="target.mode == 1">
   <ul class="tight-form-list" role="menu">
-    <li class="tight-form-item" style="width: 194px">&nbsp</li>
+    <li class="tight-form-item" style="width: 44px">&nbsp</li>
 
     <!-- Select Application -->
     <li class="tight-form-item input-small" style="width: 5em">Application</li>
@@ -168,7 +168,7 @@
     </li>
 
     <!-- Scale -->
-    <li class="tight-form-item" ng-hide="target.mode == 2">
+    <!-- <li class="tight-form-item" ng-hide="target.mode == 2">
       Scale
       <i class="fa fa-question-circle"
          bs-tooltip="'Set a custom multiplier for series values, for example -1 to invert series'"></i>
@@ -180,7 +180,7 @@
              spellcheck='false'
              placeholder="1"
              ng-blur="targetBlur()">
-    </li>
+    </li> -->
   </ul>
 
   <div class="clearfix"></div>

From 675f202b53b18b36f725cec71c140ce8c762f579 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 10:20:38 +0300
Subject: [PATCH 23/58] Renamed queryBulder to queryProcessor.

---
 plugins/datasource-zabbix/datasource.js       | 21 +++++++------------
 .../{queryBuilder.js => queryProcessor.js}    |  6 +++---
 2 files changed, 11 insertions(+), 16 deletions(-)
 rename plugins/datasource-zabbix/{queryBuilder.js => queryProcessor.js} (98%)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 833d5f4..88dd736 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -2,7 +2,7 @@ define([
   'angular',
   'lodash',
   'app/core/utils/datemath',
-  './queryBuilder',
+  './queryProcessor',
   './directives',
   './zabbixAPI',
   './helperFunctions',
@@ -14,7 +14,7 @@ function (angular, _, dateMath) {
 
   /** @ngInject */
   function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv,
-                               ZabbixAPI, zabbixHelperSrv, ZabbixCache, QueryBuilder) {
+                               ZabbixAPI, zabbixHelperSrv, ZabbixCache, QueryProcessor) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -37,7 +37,7 @@ function (angular, _, dateMath) {
     this.zabbixCache = new ZabbixCache(this.zabbixAPI);
 
     // Initialize query builder
-    this.queryBuilder = new QueryBuilder(this.zabbixCache);
+    this.queryProcessor = new QueryProcessor(this.zabbixCache);
 
     console.log(this.zabbixCache);
 
@@ -47,7 +47,6 @@ function (angular, _, dateMath) {
 
     /**
      * Test connection to Zabbix API
-     *
      * @return {object} Connection status and Zabbix API version
      */
     this.testDatasource = function() {
@@ -88,12 +87,8 @@ function (angular, _, dateMath) {
 
     /**
      * Query panel data. Calls for each panel in dashboard.
-     *
-     * @param  {Object} options   Query options. Contains time range, targets
-     *                            and other info.
-     *
-     * @return {Object}           Grafana metrics object with timeseries data
-     *                            for each target.
+     * @param  {Object} options   Contains time range, targets and other info.
+     * @return {Object} Grafana metrics object with timeseries data for each target.
      */
     this.query = function(options) {
       var self = this;
@@ -122,7 +117,7 @@ function (angular, _, dateMath) {
           // Query numeric data
           if (!target.mode || target.mode === 0) {
 
-            var items = self.queryBuilder.build(groupFilter, hostFilter, appFilter, itemFilter);
+            var items = self.queryProcessor.build(groupFilter, hostFilter, appFilter, itemFilter);
 
             // Use alias only for single metric, otherwise use item names
             var alias;
@@ -139,13 +134,13 @@ function (angular, _, dateMath) {
               // Use trends
               var valueType = target.downsampleFunction ? target.downsampleFunction.value : "avg";
               getHistory = self.zabbixAPI.getTrends(items, from, to).then(function(history) {
-                return self.queryBuilder.handleTrends(history, addHostName, valueType);
+                return self.queryProcessor.handleTrends(history, addHostName, valueType);
               });
             } else {
 
               // Use history
               getHistory = self.zabbixAPI.getHistory(items, from, to).then(function(history) {
-                return self.queryBuilder.handleHistory(history, addHostName);
+                return self.queryProcessor.handleHistory(history, addHostName);
               });
             }
 
diff --git a/plugins/datasource-zabbix/queryBuilder.js b/plugins/datasource-zabbix/queryProcessor.js
similarity index 98%
rename from plugins/datasource-zabbix/queryBuilder.js
rename to plugins/datasource-zabbix/queryProcessor.js
index 053ecf8..396919f 100644
--- a/plugins/datasource-zabbix/queryBuilder.js
+++ b/plugins/datasource-zabbix/queryProcessor.js
@@ -8,9 +8,9 @@ function (angular, _, utils) {
 
   var module = angular.module('grafana.services');
 
-  module.factory('QueryBuilder', function() {
+  module.factory('QueryProcessor', function() {
 
-    function QueryBuilder(zabbixCacheInstance) {
+    function QueryProcessor(zabbixCacheInstance) {
       var self = this;
 
       this.cache = zabbixCacheInstance;
@@ -205,7 +205,7 @@ function (angular, _, utils) {
       }
     }
 
-    return QueryBuilder;
+    return QueryProcessor;
   });
 
 });
\ No newline at end of file

From 3ded90efecbde9642b06df1b380fb9ba2e145cd2 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 11:58:17 +0300
Subject: [PATCH 24/58] Added DataProcessingService for timeseries
 post-processing.

---
 .../dataProcessingService.js                  | 99 +++++++++++++++++++
 plugins/datasource-zabbix/datasource.js       | 13 +--
 2 files changed, 104 insertions(+), 8 deletions(-)
 create mode 100644 plugins/datasource-zabbix/dataProcessingService.js

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
new file mode 100644
index 0000000..fe4ae97
--- /dev/null
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -0,0 +1,99 @@
+define([
+  'angular',
+  'lodash',
+  'moment'
+],
+function (angular, _, moment) {
+  'use strict';
+
+  var module = angular.module('grafana.services');
+
+  module.service('DataProcessingService', function() {
+
+    /**
+     * Downsample datapoints series
+     */
+    this.downsampleSeries = function(datapoints, time_to, ms_interval, func) {
+      var downsampledSeries = [];
+      var timeWindow = {
+        from: time_to * 1000 - ms_interval,
+        to: time_to * 1000
+      };
+
+      var points_sum = 0;
+      var points_num = 0;
+      var value_avg = 0;
+      var frame = [];
+
+      for (var i = datapoints.length - 1; i >= 0; i -= 1) {
+        if (timeWindow.from < datapoints[i][1] && datapoints[i][1] <= timeWindow.to) {
+          points_sum += datapoints[i][0];
+          points_num++;
+          frame.push(datapoints[i][0]);
+        }
+        else {
+          value_avg = points_num ? points_sum / points_num : 0;
+
+          if (func === "max") {
+            downsampledSeries.push([_.max(frame), timeWindow.to]);
+          }
+          else if (func === "min") {
+            downsampledSeries.push([_.min(frame), timeWindow.to]);
+          }
+
+          // avg by default
+          else {
+            downsampledSeries.push([value_avg, timeWindow.to]);
+          }
+
+          // Shift time window
+          timeWindow.to = timeWindow.from;
+          timeWindow.from -= ms_interval;
+
+          points_sum = 0;
+          points_num = 0;
+          frame = [];
+
+          // Process point again
+          i++;
+        }
+      }
+      return downsampledSeries.reverse();
+    };
+
+    /**
+     * Group points by given time interval
+     * datapoints: [[<value>, <unixtime>], ...]
+     */
+    this.groupBy = function(datapoints, ms_interval, groupByCallback) {
+      var frames = _.groupBy(datapoints, function(point) {
+        var group_time = Number(moment.utc(point[1]).startOf('minute').valueOf());
+        group_time = Math.ceil(point[1] / ms_interval) * ms_interval;
+        return group_time;
+      });
+
+      // frame: { '<unixtime>': [[<value>, <unixtime>], ...] }
+      // return [{ '<unixtime>': <value> }, { '<unixtime>': <value> }, ...]
+      var grouped = _.mapValues(frames, function(frame) {
+        var points = _.map(frame, function(point) {
+          return point[0];
+        });
+        return groupByCallback(points);
+      });
+
+      // Convert points to Grafana format
+      return _.map(grouped, function(value, timestamp) {
+        return [Number(value), Number(timestamp)];
+      });
+    };
+
+    this.AVERAGE = function(values) {
+      var sum = 0;
+      _.each(values, function(value) {
+        sum += value;
+      });
+      return sum / values.length;
+    };
+
+  });
+});
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 88dd736..8cc3602 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -6,6 +6,7 @@ define([
   './directives',
   './zabbixAPI',
   './helperFunctions',
+  './dataProcessingService',
   './zabbixCache',
   './queryCtrl'
 ],
@@ -13,8 +14,8 @@ function (angular, _, dateMath) {
   'use strict';
 
   /** @ngInject */
-  function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv,
-                               ZabbixAPI, zabbixHelperSrv, ZabbixCache, QueryProcessor) {
+  function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv, zabbixHelperSrv,
+                               ZabbixAPI, ZabbixCache, QueryProcessor, DataProcessingService) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -119,12 +120,6 @@ function (angular, _, dateMath) {
 
             var items = self.queryProcessor.build(groupFilter, hostFilter, appFilter, itemFilter);
 
-            // Use alias only for single metric, otherwise use item names
-            var alias;
-            if (items.length === 1) {
-              alias = templateSrv.replace(target.alias, options.scopedVars);
-            }
-
             // Add hostname for items from multiple hosts
             var addHostName = target.host.isRegex;
 
@@ -153,6 +148,8 @@ function (angular, _, dateMath) {
                   var downsampleFunc = target.downsampleFunction ? target.downsampleFunction.value : "avg";
                   timeseries.datapoints = zabbixHelperSrv.downsampleSeries(timeseries.datapoints, to, ms_interval, downsampleFunc);
                 }
+                var groupBuInterval = 60000;
+                timeseries.datapoints = DataProcessingService.groupBy(timeseries.datapoints, groupBuInterval, DataProcessingService.AVERAGE);
                 return timeseries;
               });
             });

From c64dd1d87425431d8a6cdcc61f35a4cff7b38ca1 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 12:59:17 +0300
Subject: [PATCH 25/58] Replaced old downsampleSeries() method by new
 DataProcessingService.groupBy()

---
 plugins/datasource-zabbix/datasource.js | 13 +++++++------
 plugins/datasource-zabbix/utils.js      | 11 +++++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 8cc3602..648dd3b 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -2,6 +2,7 @@ define([
   'angular',
   'lodash',
   'app/core/utils/datemath',
+  './utils',
   './queryProcessor',
   './directives',
   './zabbixAPI',
@@ -10,7 +11,7 @@ define([
   './zabbixCache',
   './queryCtrl'
 ],
-function (angular, _, dateMath) {
+function (angular, _, dateMath, utils) {
   'use strict';
 
   /** @ngInject */
@@ -141,15 +142,15 @@ function (angular, _, dateMath) {
 
             return getHistory.then(function (timeseries_data) {
               return _.map(timeseries_data, function (timeseries) {
+                var groupBuInterval = utils.parseInterval(options.interval);
 
                 // Series downsampling
                 if (timeseries.datapoints.length > options.maxDataPoints) {
-                  var ms_interval = Math.floor((to - from) / options.maxDataPoints) * 1000;
-                  var downsampleFunc = target.downsampleFunction ? target.downsampleFunction.value : "avg";
-                  timeseries.datapoints = zabbixHelperSrv.downsampleSeries(timeseries.datapoints, to, ms_interval, downsampleFunc);
+                  timeseries.datapoints = DataProcessingService.groupBy(timeseries.datapoints,
+                                                                        groupBuInterval,
+                                                                        DataProcessingService.AVERAGE);
                 }
-                var groupBuInterval = 60000;
-                timeseries.datapoints = DataProcessingService.groupBy(timeseries.datapoints, groupBuInterval, DataProcessingService.AVERAGE);
+
                 return timeseries;
               });
             });
diff --git a/plugins/datasource-zabbix/utils.js b/plugins/datasource-zabbix/utils.js
index 003ce53..240da61 100644
--- a/plugins/datasource-zabbix/utils.js
+++ b/plugins/datasource-zabbix/utils.js
@@ -1,7 +1,8 @@
 define([
-  'lodash'
+  'lodash',
+  'moment'
 ],
-function () {
+function (_, moment) {
   'use strict';
 
   function utils() {
@@ -40,6 +41,12 @@ function () {
       return new RegExp(pattern, flags);
     };
 
+    this.parseInterval = function(interval) {
+      var intervalPattern = /(^[\d]+)(y|M|w|d|h|m|s)/g;
+      var momentInterval = intervalPattern.exec(interval);
+      return moment.duration(Number(momentInterval[1]), momentInterval[2]).valueOf();
+    };
+
   }
 
   return new utils();

From 69bee3db0bd09da5b0dd0dd723ea75c3f225281d Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 13:23:47 +0300
Subject: [PATCH 26/58] Added MIN and MAX function for groupBy()

---
 plugins/datasource-zabbix/dataProcessingService.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index fe4ae97..279d610 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -95,5 +95,13 @@ function (angular, _, moment) {
       return sum / values.length;
     };
 
+    this.MIN = function(values) {
+      return _.min(values);
+    };
+
+    this.MAX = function(values) {
+      return _.max(values);
+    };
+
   });
 });
\ No newline at end of file

From efeb69084adf850fc6868e42481c671a3b6df0b0 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 19:17:56 +0300
Subject: [PATCH 27/58] Downsample panel data after all transformations.

---
 plugins/datasource-zabbix/datasource.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 648dd3b..c610ee5 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -145,10 +145,11 @@ function (angular, _, dateMath, utils) {
                 var groupBuInterval = utils.parseInterval(options.interval);
 
                 // Series downsampling
-                if (timeseries.datapoints.length > options.maxDataPoints) {
-                  timeseries.datapoints = DataProcessingService.groupBy(timeseries.datapoints,
-                                                                        groupBuInterval,
-                                                                        DataProcessingService.AVERAGE);
+                var dp = timeseries.datapoints;
+                if (false) {
+                  dp = DataProcessingService.groupBy(dp, groupBuInterval,
+                                                     DataProcessingService.AVERAGE);
+                  timeseries.datapoints = dp;
                 }
 
                 return timeseries;
@@ -204,10 +205,22 @@ function (angular, _, dateMath, utils) {
         }
       }, this);
 
+      // Data for panel (all targets)
       return $q.all(_.flatten(promises))
         .then(_.flatten)
         .then(function (timeseries_data) {
-          return { data: timeseries_data };
+          var data = _.map(timeseries_data, function(timeseries) {
+
+            // Series downsampling
+            var DPS = DataProcessingService;
+            var groupBuInterval = utils.parseInterval(options.interval);
+            if (timeseries.datapoints.length > options.maxDataPoints) {
+              timeseries.datapoints = DPS.groupBy(timeseries.datapoints, groupBuInterval,
+                                                  DPS.AVERAGE);
+            }
+            return timeseries;
+          });
+          return { data: data };
         });
     };
 

From 1e20e7eecfc62f99540f5154c5ca5a59b595e42d Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 19:38:59 +0300
Subject: [PATCH 28/58] Load default values for new target.

---
 plugins/datasource-zabbix/queryCtrl.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 4c8dbc4..87dfff0 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -17,7 +17,19 @@ define([
         $scope.targetLetters = targetLetters;
         $scope.metric = {};
 
-        if (!$scope.target.mode || $scope.target.mode !== 1) {
+        // Load default values
+        var targetDefaults = {
+          mode: 0,
+          group: { filter: "" },
+          host: { filter: "" },
+          application: { filter: "" },
+          item: { filter: "" }
+        };
+        _.defaults($scope.target, targetDefaults);
+
+        if ($scope.target.mode ===0 ||
+            $scope.target.mode === 2) {
+
           $scope.downsampleFunctionList = [
             {name: "avg", value: "avg"},
             {name: "min", value: "min"},

From 2f4242854f008e23a0b2df5ea8c514abf646c41a Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 19:49:46 +0300
Subject: [PATCH 29/58] Fixed items search (no items returned when item name
 selected from typeahead).

---
 plugins/datasource-zabbix/queryProcessor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/queryProcessor.js b/plugins/datasource-zabbix/queryProcessor.js
index 396919f..20e14fb 100644
--- a/plugins/datasource-zabbix/queryProcessor.js
+++ b/plugins/datasource-zabbix/queryProcessor.js
@@ -113,7 +113,7 @@ function (angular, _, utils) {
             return [];
           }
         } else {
-          items = _.filter(items, {'name': hostFilter});
+          items = _.filter(items, {'name': itemFilter});
           if (!items.length) {
             // No items finded
             return [];

From 13f3f3824f5464825a1623c4fab2c5fbbecd3d36 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 22:05:30 +0300
Subject: [PATCH 30/58] Fixed items filtering in query editor.

---
 plugins/datasource-zabbix/queryCtrl.js | 34 +++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 87dfff0..4098671 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -160,9 +160,27 @@ define([
 
       $scope.filterItems = function () {
         var app = $scope.target.application;
+        var host = $scope.target.host;
+        var hosts = [];
         var apps = [];
         var items = [];
 
+        // Filter hosts by regex
+        if (host.isRegex) {
+          var hostFilterPattern = Utils.buildRegex(host.filter);
+          hosts = _.filter($scope.metric.hostList, function (hostObj) {
+            return hostFilterPattern.test(hostObj.name);
+          });
+        }
+        else {
+          var findedHosts = _.find($scope.metric.hostList, {'name': host.filter});
+          if (findedHosts) {
+            hosts.push(findedHosts);
+          } else {
+            hosts = undefined;
+          }
+        }
+
         // Filter applications by regex
         if (app.isRegex) {
           var filterPattern = Utils.buildRegex(app.filter);
@@ -171,13 +189,20 @@ define([
           });
         }
         // Find items in selected application
-        else {
+        else if (app.filter) {
           var finded = _.find($scope.metric.applicationList, {'name': app.filter});
           if (finded) {
             apps.push(finded);
           } else {
             apps = undefined;
           }
+        } else {
+          apps = undefined;
+          if (hosts) {
+            items = _.filter($scope.metric.itemList, function (itemObj) {
+              return _.find(hosts, {'hostid': itemObj.hostid });
+            });
+          }
         }
 
         if (apps) {
@@ -185,6 +210,13 @@ define([
           items = _.filter($scope.metric.itemList, function (itemObj) {
             return _.intersection(appids, itemObj.applications).length;
           });
+          items = _.filter(items, function (itemObj) {
+            return _.find(hosts, {'hostid': itemObj.hostid });
+          });
+        }
+
+        if (true) {
+          items = _.filter(items, {'status': '0'});
         }
 
         return items;

From 96602e2811b6dbf8f86f01ca048abc75b1c8ce90 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 22:33:53 +0300
Subject: [PATCH 31/58] Added "Show disabled items" checkbox to query editor.

---
 plugins/datasource-zabbix/partials/query.editor.html | 7 +++++++
 plugins/datasource-zabbix/queryCtrl.js               | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index 888bdaf..81b5c90 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -112,6 +112,13 @@
         class="input-large tight-form-input"
         ng-style="target.host.style">
     </li>
+    <li class="tight-form-item" ng-hide="target.mode == 2">
+      Show disabled items&nbsp;
+      <editor-checkbox text=""
+        model="target.showDisabledItems"
+        change="onApplicationBlur()">
+      </editor-checkbox>
+    </li>
 
     <!-- Downsampling function -->
     <!-- <li class="tight-form-item input-medium" ng-hide="target.mode == 2">
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 4098671..49bd0d8 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -215,7 +215,7 @@ define([
           });
         }
 
-        if (true) {
+        if (!$scope.target.showDisabledItems) {
           items = _.filter(items, {'status': '0'});
         }
 

From 38f8e04d22a4564dd61acfa6e5caa309a0ee578e Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 24 Jan 2016 22:52:19 +0300
Subject: [PATCH 32/58] Added initial target options menu.

---
 .../datasource-zabbix/partials/query.editor.html |  3 +++
 plugins/datasource-zabbix/queryCtrl.js           | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index 81b5c90..3348f26 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -173,6 +173,9 @@
         class="input-large tight-form-input"
         ng-style="target.item.style">
     </li>
+    <li class="tight-form-item query-keyword">Options</li>
+    <li class="dropdown" dropdown-typeahead="optionsMenu" dropdown-typeahead-on-select="addSelectPart(selectParts, $item, $subItem)">
+    </li>
 
     <!-- Scale -->
     <!-- <li class="tight-form-item" ng-hide="target.mode == 2">
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 49bd0d8..f6a112a 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -17,6 +17,22 @@ define([
         $scope.targetLetters = targetLetters;
         $scope.metric = {};
 
+        $scope.optionsMenu = [
+          {text: "Transformations", submenu: [
+            {text: "groupBy", value: null},
+            {text: "scale", value: null}
+          ]},
+          {text: "Aggregations", submenu: [
+            {text: "sum", value: null},
+            {text: "average", value: null},
+            {text: "min", value: null},
+            {text: "max", value: null}
+          ]},
+          {text: "Alias", submenu: [
+            {text: "set alias", value: null},
+          ]},
+        ];
+
         // Load default values
         var targetDefaults = {
           mode: 0,

From fcf0bdfaca8c01efd0e3ad0053f9360923ccf0d1 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 26 Jan 2016 21:51:12 +0300
Subject: [PATCH 33/58] Added initial metric functions directives based on
 graphite query editor.

---
 .../datasource-zabbix/addMetricFunction.js    | 107 ++++++++
 plugins/datasource-zabbix/datasource.js       |   4 +-
 .../datasource-zabbix/metricFunctionEditor.js | 244 ++++++++++++++++++
 plugins/datasource-zabbix/metricFunctions.js  | 189 ++++++++++++++
 .../partials/query.editor.html                |  16 +-
 plugins/datasource-zabbix/queryCtrl.js        |  56 ++--
 6 files changed, 597 insertions(+), 19 deletions(-)
 create mode 100644 plugins/datasource-zabbix/addMetricFunction.js
 create mode 100644 plugins/datasource-zabbix/metricFunctionEditor.js
 create mode 100644 plugins/datasource-zabbix/metricFunctions.js

diff --git a/plugins/datasource-zabbix/addMetricFunction.js b/plugins/datasource-zabbix/addMetricFunction.js
new file mode 100644
index 0000000..4bc4014
--- /dev/null
+++ b/plugins/datasource-zabbix/addMetricFunction.js
@@ -0,0 +1,107 @@
+define([
+  'angular',
+  'lodash',
+  'jquery',
+  './metricFunctions'
+],
+function (angular, _, $, metricFunctions) {
+  'use strict';
+
+  angular
+    .module('grafana.directives')
+    .directive('addMetricFunction', function($compile) {
+      var inputTemplate = '<input type="text"'+
+                            ' class="tight-form-input input-medium tight-form-input"' +
+                            ' spellcheck="false" style="display:none"></input>';
+
+      var buttonTemplate = '<a  class="tight-form-item tight-form-func dropdown-toggle"' +
+                              ' tabindex="1" gf-dropdown="functionMenu" data-toggle="dropdown">' +
+                              '<i class="fa fa-plus"></i></a>';
+
+      return {
+        link: function($scope, elem) {
+          var categories = metricFunctions.getCategories();
+          var allFunctions = getAllFunctionNames(categories);
+
+          $scope.functionMenu = createFunctionDropDownMenu(categories);
+
+          var $input = $(inputTemplate);
+          var $button = $(buttonTemplate);
+          $input.appendTo(elem);
+          $button.appendTo(elem);
+
+          $input.attr('data-provide', 'typeahead');
+          $input.typeahead({
+            source: allFunctions,
+            minLength: 1,
+            items: 10,
+            updater: function (value) {
+              var funcDef = metricFunctions.getFuncDef(value);
+              if (!funcDef) {
+                // try find close match
+                value = value.toLowerCase();
+                funcDef = _.find(allFunctions, function(funcName) {
+                  return funcName.toLowerCase().indexOf(value) === 0;
+                });
+
+                if (!funcDef) { return; }
+              }
+
+              $scope.$apply(function() {
+                $scope.addFunction(funcDef);
+              });
+
+              $input.trigger('blur');
+              return '';
+            }
+          });
+
+          $button.click(function() {
+            $button.hide();
+            $input.show();
+            $input.focus();
+          });
+
+          $input.keyup(function() {
+            elem.toggleClass('open', $input.val() === '');
+          });
+
+          $input.blur(function() {
+            // clicking the function dropdown menu wont
+            // work if you remove class at once
+            setTimeout(function() {
+              $input.val('');
+              $input.hide();
+              $button.show();
+              elem.removeClass('open');
+            }, 200);
+          });
+
+          $compile(elem.contents())($scope);
+        }
+      };
+    });
+
+  function getAllFunctionNames(categories) {
+    return _.reduce(categories, function(list, category) {
+      _.each(category, function(func) {
+        list.push(func.name);
+      });
+      return list;
+    }, []);
+  }
+
+  function createFunctionDropDownMenu(categories) {
+    return _.map(categories, function(list, category) {
+      return {
+        text: category,
+        submenu: _.map(list, function(value) {
+          return {
+            text: value.name,
+            click: "addFunction('" + value.name + "')",
+          };
+        })
+      };
+    });
+  }
+});
diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index c610ee5..bfc4b24 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -9,7 +9,9 @@ define([
   './helperFunctions',
   './dataProcessingService',
   './zabbixCache',
-  './queryCtrl'
+  './queryCtrl',
+  './addMetricFunction',
+  './metricFunctionEditor'
 ],
 function (angular, _, dateMath, utils) {
   'use strict';
diff --git a/plugins/datasource-zabbix/metricFunctionEditor.js b/plugins/datasource-zabbix/metricFunctionEditor.js
new file mode 100644
index 0000000..2b14d69
--- /dev/null
+++ b/plugins/datasource-zabbix/metricFunctionEditor.js
@@ -0,0 +1,244 @@
+define([
+  'angular',
+  'lodash',
+  'jquery',
+],
+function (angular, _, $) {
+  'use strict';
+
+  angular
+    .module('grafana.directives')
+    .directive('metricFunctionEditor', function($compile, templateSrv) {
+
+      var funcSpanTemplate = '<a ng-click="">{{func.def.name}}</a><span>(</span>';
+      var paramTemplate = '<input type="text" style="display:none"' +
+                          ' class="input-mini tight-form-func-param"></input>';
+
+      var funcControlsTemplate =
+         '<div class="tight-form-func-controls">' +
+           '<span class="pointer fa fa-arrow-left"></span>' +
+           '<span class="pointer fa fa-question-circle"></span>' +
+           '<span class="pointer fa fa-remove" ></span>' +
+           '<span class="pointer fa fa-arrow-right"></span>' +
+         '</div>';
+
+      return {
+        restrict: 'A',
+        link: function postLink($scope, elem) {
+          var $funcLink = $(funcSpanTemplate);
+          var $funcControls = $(funcControlsTemplate);
+          var func = $scope.func;
+          var funcDef = func.def;
+          var scheduledRelink = false;
+          var paramCountAtLink = 0;
+
+          function clickFuncParam(paramIndex) {
+            /*jshint validthis:true */
+
+            var $link = $(this);
+            var $input = $link.next();
+
+            $input.val(func.params[paramIndex]);
+            $input.css('width', ($link.width() + 16) + 'px');
+
+            $link.hide();
+            $input.show();
+            $input.focus();
+            $input.select();
+
+            var typeahead = $input.data('typeahead');
+            if (typeahead) {
+              $input.val('');
+              typeahead.lookup();
+            }
+          }
+
+          function scheduledRelinkIfNeeded() {
+            if (paramCountAtLink === func.params.length) {
+              return;
+            }
+
+            if (!scheduledRelink) {
+              scheduledRelink = true;
+              setTimeout(function() {
+                relink();
+                scheduledRelink = false;
+              }, 200);
+            }
+          }
+
+          function inputBlur(paramIndex) {
+            /*jshint validthis:true */
+            var $input = $(this);
+            var $link = $input.prev();
+            var newValue = $input.val();
+
+            if (newValue !== '' || func.def.params[paramIndex].optional) {
+              $link.html(templateSrv.highlightVariablesAsHtml(newValue));
+
+              func.updateParam($input.val(), paramIndex);
+              scheduledRelinkIfNeeded();
+
+              $scope.$apply($scope.targetChanged);
+            }
+
+            $input.hide();
+            $link.show();
+          }
+
+          function inputKeyPress(paramIndex, e) {
+            /*jshint validthis:true */
+            if(e.which === 13) {
+              inputBlur.call(this, paramIndex);
+            }
+          }
+
+          function inputKeyDown() {
+            /*jshint validthis:true */
+            this.style.width = (3 + this.value.length) * 8 + 'px';
+          }
+
+          function addTypeahead($input, paramIndex) {
+            $input.attr('data-provide', 'typeahead');
+
+            var options = funcDef.params[paramIndex].options;
+            if (funcDef.params[paramIndex].type === 'int') {
+              options = _.map(options, function(val) { return val.toString(); });
+            }
+
+            $input.typeahead({
+              source: options,
+              minLength: 0,
+              items: 20,
+              updater: function (value) {
+                setTimeout(function() {
+                  inputBlur.call($input[0], paramIndex);
+                }, 0);
+                return value;
+              }
+            });
+
+            var typeahead = $input.data('typeahead');
+            typeahead.lookup = function () {
+              this.query = this.$element.val() || '';
+              return this.process(this.source);
+            };
+          }
+
+          function toggleFuncControls() {
+            var targetDiv = elem.closest('.tight-form');
+
+            if (elem.hasClass('show-function-controls')) {
+              elem.removeClass('show-function-controls');
+              targetDiv.removeClass('has-open-function');
+              $funcControls.hide();
+              return;
+            }
+
+            elem.addClass('show-function-controls');
+            targetDiv.addClass('has-open-function');
+
+            $funcControls.show();
+          }
+
+          function addElementsAndCompile() {
+            $funcControls.appendTo(elem);
+            $funcLink.appendTo(elem);
+
+            _.each(funcDef.params, function(param, index) {
+              if (param.optional && func.params.length <= index) {
+                return;
+              }
+
+              if (index > 0) {
+                $('<span>, </span>').appendTo(elem);
+              }
+
+              var paramValue = templateSrv.highlightVariablesAsHtml(func.params[index]);
+              var $paramLink = $('<a ng-click="" class="graphite-func-param-link">' + paramValue + '</a>');
+              var $input = $(paramTemplate);
+
+              paramCountAtLink++;
+
+              $paramLink.appendTo(elem);
+              $input.appendTo(elem);
+
+              $input.blur(_.partial(inputBlur, index));
+              $input.keyup(inputKeyDown);
+              $input.keypress(_.partial(inputKeyPress, index));
+              $paramLink.click(_.partial(clickFuncParam, index));
+
+              if (funcDef.params[index].options) {
+                addTypeahead($input, index);
+              }
+
+            });
+
+            $('<span>)</span>').appendTo(elem);
+
+            $compile(elem.contents())($scope);
+          }
+
+          function ifJustAddedFocusFistParam() {
+            if ($scope.func.added) {
+              $scope.func.added = false;
+              setTimeout(function() {
+                elem.find('.graphite-func-param-link').first().click();
+              }, 10);
+            }
+          }
+
+          function registerFuncControlsToggle() {
+            $funcLink.click(toggleFuncControls);
+          }
+
+          function registerFuncControlsActions() {
+            $funcControls.click(function(e) {
+              var $target = $(e.target);
+              if ($target.hasClass('fa-remove')) {
+                toggleFuncControls();
+                $scope.$apply(function() {
+                  $scope.removeFunction($scope.func);
+                });
+                return;
+              }
+
+              if ($target.hasClass('fa-arrow-left')) {
+                $scope.$apply(function() {
+                  _.move($scope.target.functions, $scope.$index, $scope.$index - 1);
+                  $scope.targetChanged();
+                });
+                return;
+              }
+
+              if ($target.hasClass('fa-arrow-right')) {
+                $scope.$apply(function() {
+                  _.move($scope.target.functions, $scope.$index, $scope.$index + 1);
+                  $scope.targetChanged();
+                });
+                return;
+              }
+
+              if ($target.hasClass('fa-question-circle')) {
+                window.open("http://graphite.readthedocs.org/en/latest/functions.html#graphite.render.functions." + funcDef.name,'_blank');
+                return;
+              }
+            });
+          }
+
+          function relink() {
+            elem.children().remove();
+
+            addElementsAndCompile();
+            ifJustAddedFocusFistParam();
+            registerFuncControlsToggle();
+            registerFuncControlsActions();
+          }
+
+          relink();
+        }
+      };
+
+    });
+
+});
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
new file mode 100644
index 0000000..b60854e
--- /dev/null
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -0,0 +1,189 @@
+define([
+  'lodash',
+  'jquery'
+],
+function (_, $) {
+  'use strict';
+
+  var index = [];
+  var categories = {
+    Transform: [],
+    Aggregate: [],
+    Alias: []
+  };
+
+  function addFuncDef(funcDef) {
+    funcDef.params = funcDef.params || [];
+    funcDef.defaultParams = funcDef.defaultParams || [];
+
+    if (funcDef.category) {
+      funcDef.category.push(funcDef);
+    }
+    index[funcDef.name] = funcDef;
+    index[funcDef.shortName || funcDef.name] = funcDef;
+  }
+
+  var optionalSeriesRefArgs = [
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true }
+  ];
+
+  addFuncDef({
+    name: 'scaleToSeconds',
+    category: categories.Transform,
+    params: [{ name: 'seconds', type: 'int' }],
+    defaultParams: [1],
+  });
+
+  addFuncDef({
+    name: 'groupBy',
+    category: categories.Transform,
+    params: [
+      { name: 'interval', type: 'string'},
+      { name: 'function', type: 'string', options: ['avg', 'min', 'max'] }
+    ],
+    defaultParams: ['1m', 'avg'],
+  });
+
+  addFuncDef({
+    name: 'perSecond',
+    category: categories.Transform,
+    params: [{ name: "max value", type: "int", optional: true }],
+    defaultParams: [],
+  });
+
+  addFuncDef({
+    name: 'aggregate',
+    category: categories.Aggregate,
+    params: [
+      { name: 'function', type: 'string', options: ['sum', 'avg', 'min', 'max'] }
+    ],
+    defaultParams: ['sum'],
+  });
+
+  addFuncDef({
+    name: "holtWintersConfidenceBands",
+    category: categories.Aggregate,
+    params: [{ name: "delta", type: 'int' }],
+    defaultParams: [3]
+  });
+
+  addFuncDef({
+    name: 'alias',
+    category: categories.Alias,
+    params: [
+      { name: 'alias', type: 'string'}
+    ],
+    defaultParams: [],
+  });
+
+  addFuncDef({
+    name: 'averageSeries',
+    shortName: 'avg',
+    category: categories.Alias,
+    params: optionalSeriesRefArgs,
+    defaultParams: [''],
+  });
+
+  _.each(categories, function(funcList, catName) {
+    categories[catName] = _.sortBy(funcList, 'name');
+  });
+
+  function FuncInstance(funcDef, options) {
+    this.def = funcDef;
+    this.params = [];
+
+    if (options && options.withDefaultParams) {
+      this.params = funcDef.defaultParams.slice(0);
+    }
+
+    this.updateText();
+  }
+
+  FuncInstance.prototype.render = function(metricExp) {
+    var str = this.def.name + '(';
+    var parameters = _.map(this.params, function(value, index) {
+
+      var paramType = this.def.params[index].type;
+      if (paramType === 'int' || paramType === 'value_or_series' || paramType === 'boolean') {
+        return value;
+      }
+      else if (paramType === 'int_or_interval' && $.isNumeric(value)) {
+        return value;
+      }
+
+      return "'" + value + "'";
+
+    }, this);
+
+    if (metricExp) {
+      parameters.unshift(metricExp);
+    }
+
+    return str + parameters.join(', ') + ')';
+  };
+
+  FuncInstance.prototype._hasMultipleParamsInString = function(strValue, index) {
+    if (strValue.indexOf(',') === -1) {
+      return false;
+    }
+
+    return this.def.params[index + 1] && this.def.params[index + 1].optional;
+  };
+
+  FuncInstance.prototype.updateParam = function(strValue, index) {
+    // handle optional parameters
+    // if string contains ',' and next param is optional, split and update both
+    if (this._hasMultipleParamsInString(strValue, index)) {
+      _.each(strValue.split(','), function(partVal, idx) {
+        this.updateParam(partVal.trim(), idx);
+      }, this);
+      return;
+    }
+
+    if (strValue === '' && this.def.params[index].optional) {
+      this.params.splice(index, 1);
+    }
+    else {
+      this.params[index] = strValue;
+    }
+
+    this.updateText();
+  };
+
+  FuncInstance.prototype.updateText = function () {
+    if (this.params.length === 0) {
+      this.text = this.def.name + '()';
+      return;
+    }
+
+    var text = this.def.name + '(';
+    text += this.params.join(', ');
+    text += ')';
+    this.text = text;
+  };
+
+  return {
+    createFuncInstance: function(funcDef, options) {
+      if (_.isString(funcDef)) {
+        if (!index[funcDef]) {
+          throw { message: 'Method not found ' + name };
+        }
+        funcDef = index[funcDef];
+      }
+      return new FuncInstance(funcDef, options);
+    },
+
+    getFuncDef: function(name) {
+      return index[name];
+    },
+
+    getCategories: function() {
+      return categories;
+    }
+  };
+
+});
diff --git a/plugins/datasource-zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
index 3348f26..b5ff671 100644
--- a/plugins/datasource-zabbix/partials/query.editor.html
+++ b/plugins/datasource-zabbix/partials/query.editor.html
@@ -174,7 +174,11 @@
         ng-style="target.item.style">
     </li>
     <li class="tight-form-item query-keyword">Options</li>
-    <li class="dropdown" dropdown-typeahead="optionsMenu" dropdown-typeahead-on-select="addSelectPart(selectParts, $item, $subItem)">
+    <li ng-repeat="func in target.functions">
+      <span metric-function-editor class="tight-form-item tight-form-func">
+      </span>
+    </li>
+    <li class="dropdown" add-metric-function>
     </li>
 
     <!-- Scale -->
@@ -195,6 +199,16 @@
 
   <div class="clearfix"></div>
 </div>
+<div class="tight-form" ng-hide="target.mode == 1" ng-if="target.options">
+  <ul class="tight-form-list" role="menu">
+    <li class="tight-form-item" style="width: 44px">&nbsp</li>
+
+    <!-- Select Application -->
+    <li class="tight-form-item query-keyword" style="width: 5em">Options</li>
+  </ul>
+  <div class="clearfix"></div>
+</div>
+
 <div class="tight-form" ng-show="target.mode == 2">
   <ul class="tight-form-list" role="menu">
     <li class="tight-form-item" style="width: 44px">&nbsp</li>
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index f6a112a..a1a826c 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -1,9 +1,10 @@
 define([
     'angular',
     'lodash',
+    './metricFunctions',
     './utils'
   ],
-  function (angular, _, Utils) {
+  function (angular, _, metricFunctions, Utils) {
     'use strict';
 
     var module = angular.module('grafana.controllers');
@@ -16,22 +17,7 @@ define([
       $scope.init = function () {
         $scope.targetLetters = targetLetters;
         $scope.metric = {};
-
-        $scope.optionsMenu = [
-          {text: "Transformations", submenu: [
-            {text: "groupBy", value: null},
-            {text: "scale", value: null}
-          ]},
-          {text: "Aggregations", submenu: [
-            {text: "sum", value: null},
-            {text: "average", value: null},
-            {text: "min", value: null},
-            {text: "max", value: null}
-          ]},
-          {text: "Alias", submenu: [
-            {text: "set alias", value: null},
-          ]},
-        ];
+        $scope.target.functions = [];
 
         // Load default values
         var targetDefaults = {
@@ -274,9 +260,45 @@ define([
         // Parse target
       };
 
+      $scope.targetChanged = function() {
+        console.log($scope.target.functions);
+      };
+
       // Validate target and set validation info
       $scope.validateTarget = function () {};
 
+      $scope.addFunction = function(funcDef) {
+        var newFunc = metricFunctions.createFuncInstance(funcDef, { withDefaultParams: true });
+        newFunc.added = true;
+        $scope.target.functions.push(newFunc);
+
+        $scope.moveAliasFuncLast();
+
+        if (!newFunc.params.length && newFunc.added) {
+          $scope.targetChanged();
+        }
+      };
+
+      $scope.removeFunction = function(func) {
+        $scope.target.functions = _.without($scope.target.functions, func);
+        $scope.targetChanged();
+      };
+
+      $scope.moveAliasFuncLast = function() {
+        var aliasFunc = _.find($scope.target.functions, function(func) {
+          return func.def.name === 'alias' ||
+            func.def.name === 'aliasByNode' ||
+            func.def.name === 'aliasByMetric';
+        });
+
+        if (aliasFunc) {
+          $scope.target.functions = _.without($scope.target.functions, aliasFunc);
+          $scope.target.functions.push(aliasFunc);
+        }
+      };
+
+      $scope.functionChanged = function() {};
+
       /**
        * Switch query editor to specified mode.
        * Modes:

From 63729a590474b4cf4b751e248fbaf1a7e0c2c91e Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 26 Jan 2016 22:59:11 +0300
Subject: [PATCH 34/58] Changed groupBy() function for working with
 grafana-style intervals.

---
 plugins/datasource-zabbix/dataProcessingService.js | 8 +++++---
 plugins/datasource-zabbix/datasource.js            | 9 +++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index 279d610..3565e2e 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -1,9 +1,10 @@
 define([
   'angular',
   'lodash',
-  'moment'
+  'moment',
+  './utils'
 ],
-function (angular, _, moment) {
+function (angular, _, moment, utils) {
   'use strict';
 
   var module = angular.module('grafana.services');
@@ -65,7 +66,8 @@ function (angular, _, moment) {
      * Group points by given time interval
      * datapoints: [[<value>, <unixtime>], ...]
      */
-    this.groupBy = function(datapoints, ms_interval, groupByCallback) {
+    this.groupBy = function(interval, groupByCallback, datapoints) {
+      var ms_interval = utils.parseInterval(interval);
       var frames = _.groupBy(datapoints, function(point) {
         var group_time = Number(moment.utc(point[1]).startOf('minute').valueOf());
         group_time = Math.ceil(point[1] / ms_interval) * ms_interval;
diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index bfc4b24..f340465 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -144,12 +144,11 @@ function (angular, _, dateMath, utils) {
 
             return getHistory.then(function (timeseries_data) {
               return _.map(timeseries_data, function (timeseries) {
-                var groupBuInterval = utils.parseInterval(options.interval);
 
-                // Series downsampling
+                // Metric data processing
                 var dp = timeseries.datapoints;
                 if (false) {
-                  dp = DataProcessingService.groupBy(dp, groupBuInterval,
+                  dp = DataProcessingService.groupBy(dp, options.interval,
                                                      DataProcessingService.AVERAGE);
                   timeseries.datapoints = dp;
                 }
@@ -215,10 +214,8 @@ function (angular, _, dateMath, utils) {
 
             // Series downsampling
             var DPS = DataProcessingService;
-            var groupBuInterval = utils.parseInterval(options.interval);
             if (timeseries.datapoints.length > options.maxDataPoints) {
-              timeseries.datapoints = DPS.groupBy(timeseries.datapoints, groupBuInterval,
-                                                  DPS.AVERAGE);
+              timeseries.datapoints = DPS.groupBy(options.interval, DPS.AVERAGE, timeseries.datapoints);
             }
             return timeseries;
           });

From 2d86c8a578493e9e512e353597b3349af9816e66 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 26 Jan 2016 23:42:54 +0300
Subject: [PATCH 35/58] Added initial metric functions processing.

---
 .../datasource-zabbix/dataProcessingService.js   | 16 ++++++++++++++++
 plugins/datasource-zabbix/datasource.js          |  9 +++++++++
 plugins/datasource-zabbix/metricFunctions.js     | 15 +++++++++++++++
 plugins/datasource-zabbix/queryCtrl.js           |  1 +
 4 files changed, 41 insertions(+)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index 3565e2e..a79bad8 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -10,6 +10,7 @@ function (angular, _, moment, utils) {
   var module = angular.module('grafana.services');
 
   module.service('DataProcessingService', function() {
+    var self = this;
 
     /**
      * Downsample datapoints series
@@ -105,5 +106,20 @@ function (angular, _, moment, utils) {
       return _.max(values);
     };
 
+    this.aggregationFunctions = {
+      avg: this.AVERAGE,
+      min: this.MIN,
+      max: this.MAX,
+    };
+
+    this.groupByWrapper = function(interval, groupFunc, datapoints) {
+      var groupByCallback = self.aggregationFunctions[groupFunc];
+      return self.groupBy(interval, groupByCallback, datapoints);
+    };
+
+    this.metricFunctions = {
+      groupBy: this.groupByWrapper,
+    };
+
   });
 });
\ No newline at end of file
diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index f340465..cd9a7be 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -153,6 +153,15 @@ function (angular, _, dateMath, utils) {
                   timeseries.datapoints = dp;
                 }
 
+                var functions = _.map(target.functions, function(func) {
+                  return func.bindFunction(DataProcessingService.metricFunctions);
+                });
+                if (functions.length) {
+                  //console.log(functions);
+                  dp = functions[0](dp);
+                  timeseries.datapoints = dp;
+                }
+
                 return timeseries;
               });
             });
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index b60854e..c35bcbd 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -103,6 +103,21 @@ function (_, $) {
     this.updateText();
   }
 
+  FuncInstance.prototype.bindFunction = function(metricFunctions) {
+    var func = metricFunctions[this.def.name];
+    if (func) {
+
+      // Bind function arguments
+      var bindedFunc = func;
+      for (var i = 0; i < this.params.length; i++) {
+        bindedFunc = _.partial(bindedFunc, this.params[i]);
+      }
+      return bindedFunc;
+    } else {
+      throw { message: 'Method not found ' + this.def.name };
+    }
+  };
+
   FuncInstance.prototype.render = function(metricExp) {
     var str = this.def.name + '(';
     var parameters = _.map(this.params, function(value, index) {
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index a1a826c..c096f79 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -262,6 +262,7 @@ define([
 
       $scope.targetChanged = function() {
         console.log($scope.target.functions);
+        $scope.get_data();
       };
 
       // Validate target and set validation info

From d30ad45b9f4aade3185371de66f6f943166789de Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 27 Jan 2016 00:31:06 +0300
Subject: [PATCH 36/58] Fix functions flushing when editor reopened.

---
 plugins/datasource-zabbix/queryCtrl.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index c096f79..77ac082 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -17,7 +17,6 @@ define([
       $scope.init = function () {
         $scope.targetLetters = targetLetters;
         $scope.metric = {};
-        $scope.target.functions = [];
 
         // Load default values
         var targetDefaults = {
@@ -25,7 +24,8 @@ define([
           group: { filter: "" },
           host: { filter: "" },
           application: { filter: "" },
-          item: { filter: "" }
+          item: { filter: "" },
+          functions: [],
         };
         _.defaults($scope.target, targetDefaults);
 

From 14e55fcbf05a26dadc8e01c52102e621b7114f95 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 27 Jan 2016 22:08:58 +0300
Subject: [PATCH 37/58] Process all transform functions.

---
 .../datasource-zabbix/addMetricFunction.js    |  1 +
 .../dataProcessingService.js                  |  5 ++--
 plugins/datasource-zabbix/datasource.js       | 28 +++++++++----------
 plugins/datasource-zabbix/queryCtrl.js        |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/plugins/datasource-zabbix/addMetricFunction.js b/plugins/datasource-zabbix/addMetricFunction.js
index 4bc4014..7f6f569 100644
--- a/plugins/datasource-zabbix/addMetricFunction.js
+++ b/plugins/datasource-zabbix/addMetricFunction.js
@@ -92,6 +92,7 @@ function (angular, _, $, metricFunctions) {
   }
 
   function createFunctionDropDownMenu(categories) {
+    console.log(categories);
     return _.map(categories, function(list, category) {
       return {
         text: category,
diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index a79bad8..e79cdb5 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -2,9 +2,10 @@ define([
   'angular',
   'lodash',
   'moment',
-  './utils'
+  './utils',
+  './metricFunctions'
 ],
-function (angular, _, moment, utils) {
+function (angular, _, moment, utils, metricFunctions) {
   'use strict';
 
   var module = angular.module('grafana.services');
diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index cd9a7be..87906b3 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -3,6 +3,7 @@ define([
   'lodash',
   'app/core/utils/datemath',
   './utils',
+  './metricFunctions',
   './queryProcessor',
   './directives',
   './zabbixAPI',
@@ -13,7 +14,7 @@ define([
   './addMetricFunction',
   './metricFunctionEditor'
 ],
-function (angular, _, dateMath, utils) {
+function (angular, _, dateMath, utils, metricFunctions) {
   'use strict';
 
   /** @ngInject */
@@ -145,22 +146,21 @@ function (angular, _, dateMath, utils) {
             return getHistory.then(function (timeseries_data) {
               return _.map(timeseries_data, function (timeseries) {
 
-                // Metric data processing
-                var dp = timeseries.datapoints;
-                if (false) {
-                  dp = DataProcessingService.groupBy(dp, options.interval,
-                                                     DataProcessingService.AVERAGE);
-                  timeseries.datapoints = dp;
-                }
-
-                var functions = _.map(target.functions, function(func) {
+                // Filter only transform functions
+                var transformFunctions = _.map(metricFunctions.getCategories()['Transform'], 'name');
+                var transFuncDefs = _.filter(target.functions, function(func) {
+                  return _.contains(transformFunctions, func.def.name);
+                });
+                var functions = _.map(transFuncDefs, function(func) {
                   return func.bindFunction(DataProcessingService.metricFunctions);
                 });
-                if (functions.length) {
-                  //console.log(functions);
-                  dp = functions[0](dp);
-                  timeseries.datapoints = dp;
+
+                // Metric data processing
+                var dp = timeseries.datapoints;
+                for (var i = 0; i < functions.length; i++) {
+                  dp = functions[i](dp);
                 }
+                timeseries.datapoints = dp;
 
                 return timeseries;
               });
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 77ac082..2be8afe 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -261,7 +261,7 @@ define([
       };
 
       $scope.targetChanged = function() {
-        console.log($scope.target.functions);
+        //console.log($scope.target);
         $scope.get_data();
       };
 

From 0680f653709eaf790737f4bf6c28857e208d0ce7 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 27 Jan 2016 23:19:27 +0300
Subject: [PATCH 38/58] Added aggregation functions processing.

---
 .../dataProcessingService.js                  | 13 ++++++--
 plugins/datasource-zabbix/datasource.js       | 27 +++++++++++++--
 plugins/datasource-zabbix/metricFunctions.js  | 33 +++++++++++++++++--
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index e79cdb5..8012692 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -2,10 +2,9 @@ define([
   'angular',
   'lodash',
   'moment',
-  './utils',
-  './metricFunctions'
+  './utils'
 ],
-function (angular, _, moment, utils, metricFunctions) {
+function (angular, _, moment, utils) {
   'use strict';
 
   var module = angular.module('grafana.services');
@@ -118,8 +117,16 @@ function (angular, _, moment, utils, metricFunctions) {
       return self.groupBy(interval, groupByCallback, datapoints);
     };
 
+    this.aggregateWrapper = function(groupByCallback, interval, datapoints) {
+      var flattenedPoints = _.flatten(datapoints, true);
+      return self.groupBy(interval, groupByCallback, flattenedPoints);
+    };
+
     this.metricFunctions = {
       groupBy: this.groupByWrapper,
+      average: _.partial(this.aggregateWrapper, this.AVERAGE),
+      min: _.partial(this.aggregateWrapper, this.MIN),
+      max: _.partial(this.aggregateWrapper, this.MAX),
     };
 
   });
diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 87906b3..3d92601 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -144,7 +144,7 @@ function (angular, _, dateMath, utils, metricFunctions) {
             }
 
             return getHistory.then(function (timeseries_data) {
-              return _.map(timeseries_data, function (timeseries) {
+              timeseries_data = _.map(timeseries_data, function (timeseries) {
 
                 // Filter only transform functions
                 var transformFunctions = _.map(metricFunctions.getCategories()['Transform'], 'name');
@@ -164,6 +164,27 @@ function (angular, _, dateMath, utils, metricFunctions) {
 
                 return timeseries;
               });
+
+              // Aggregations
+              var aggregationFunctions = _.map(metricFunctions.getCategories()['Aggregate'], 'name');
+              var aggFuncDefs = _.filter(target.functions, function(func) {
+                return _.contains(aggregationFunctions, func.def.name);
+              });
+              var functions = _.map(aggFuncDefs, function(func) {
+                return func.bindFunction(DataProcessingService.metricFunctions);
+              });
+              var dp = _.map(timeseries_data, 'datapoints');
+
+              if (functions.length) {
+                for (var i = 0; i < functions.length; i++) {
+                  dp = functions[i](dp);
+                }
+                timeseries_data = {
+                  target: 'agg',
+                  datapoints: dp
+                };
+              }
+              return timeseries_data;
             });
           }
 
@@ -219,9 +240,9 @@ function (angular, _, dateMath, utils, metricFunctions) {
       return $q.all(_.flatten(promises))
         .then(_.flatten)
         .then(function (timeseries_data) {
-          var data = _.map(timeseries_data, function(timeseries) {
 
-            // Series downsampling
+          // Series downsampling
+          var data = _.map(timeseries_data, function(timeseries) {
             var DPS = DataProcessingService;
             if (timeseries.datapoints.length > options.maxDataPoints) {
               timeseries.datapoints = DPS.groupBy(options.interval, DPS.AVERAGE, timeseries.datapoints);
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index c35bcbd..24885c6 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -65,10 +65,37 @@ function (_, $) {
   });
 
   addFuncDef({
-    name: "holtWintersConfidenceBands",
+    name: 'sum',
     category: categories.Aggregate,
-    params: [{ name: "delta", type: 'int' }],
-    defaultParams: [3]
+    params: [],
+    defaultParams: [],
+  });
+
+  addFuncDef({
+    name: 'average',
+    category: categories.Aggregate,
+    params: [
+      { name: 'interval', type: 'string' }
+    ],
+    defaultParams: ['1m'],
+  });
+
+  addFuncDef({
+    name: 'min',
+    category: categories.Aggregate,
+    params: [
+      { name: 'interval', type: 'string' }
+    ],
+    defaultParams: ['1m'],
+  });
+
+  addFuncDef({
+    name: 'max',
+    category: categories.Aggregate,
+    params: [
+      { name: 'interval', type: 'string' }
+    ],
+    defaultParams: ['1m'],
   });
 
   addFuncDef({

From 865d5f17776a367687e82660932c30485b399ce6 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 27 Jan 2016 23:30:05 +0300
Subject: [PATCH 39/58] Fixed dashboard saving error due recursive target.

---
 plugins/datasource-zabbix/metricFunctions.js | 29 +++++++-------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index 24885c6..279024c 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -17,7 +17,7 @@ function (_, $) {
     funcDef.defaultParams = funcDef.defaultParams || [];
 
     if (funcDef.category) {
-      funcDef.category.push(funcDef);
+      categories[funcDef.category].push(funcDef);
     }
     index[funcDef.name] = funcDef;
     index[funcDef.shortName || funcDef.name] = funcDef;
@@ -33,14 +33,14 @@ function (_, $) {
 
   addFuncDef({
     name: 'scaleToSeconds',
-    category: categories.Transform,
+    category: 'Transform',
     params: [{ name: 'seconds', type: 'int' }],
     defaultParams: [1],
   });
 
   addFuncDef({
     name: 'groupBy',
-    category: categories.Transform,
+    category: 'Transform',
     params: [
       { name: 'interval', type: 'string'},
       { name: 'function', type: 'string', options: ['avg', 'min', 'max'] }
@@ -50,30 +50,21 @@ function (_, $) {
 
   addFuncDef({
     name: 'perSecond',
-    category: categories.Transform,
+    category: 'Transform',
     params: [{ name: "max value", type: "int", optional: true }],
     defaultParams: [],
   });
 
-  addFuncDef({
-    name: 'aggregate',
-    category: categories.Aggregate,
-    params: [
-      { name: 'function', type: 'string', options: ['sum', 'avg', 'min', 'max'] }
-    ],
-    defaultParams: ['sum'],
-  });
-
   addFuncDef({
     name: 'sum',
-    category: categories.Aggregate,
+    category: 'Aggregate',
     params: [],
     defaultParams: [],
   });
 
   addFuncDef({
     name: 'average',
-    category: categories.Aggregate,
+    category: 'Aggregate',
     params: [
       { name: 'interval', type: 'string' }
     ],
@@ -82,7 +73,7 @@ function (_, $) {
 
   addFuncDef({
     name: 'min',
-    category: categories.Aggregate,
+    category: 'Aggregate',
     params: [
       { name: 'interval', type: 'string' }
     ],
@@ -91,7 +82,7 @@ function (_, $) {
 
   addFuncDef({
     name: 'max',
-    category: categories.Aggregate,
+    category: 'Aggregate',
     params: [
       { name: 'interval', type: 'string' }
     ],
@@ -100,7 +91,7 @@ function (_, $) {
 
   addFuncDef({
     name: 'alias',
-    category: categories.Alias,
+    category: 'Alias',
     params: [
       { name: 'alias', type: 'string'}
     ],
@@ -110,7 +101,7 @@ function (_, $) {
   addFuncDef({
     name: 'averageSeries',
     shortName: 'avg',
-    category: categories.Alias,
+    category: 'Alias',
     params: optionalSeriesRefArgs,
     defaultParams: [''],
   });

From 95cae7ee4d8df37d6924f140c43627407e5b465e Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 27 Jan 2016 23:31:42 +0300
Subject: [PATCH 40/58] Removed unused data logging in console.

---
 plugins/datasource-zabbix/addMetricFunction.js | 1 -
 plugins/datasource-zabbix/queryCtrl.js         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/datasource-zabbix/addMetricFunction.js b/plugins/datasource-zabbix/addMetricFunction.js
index 7f6f569..4bc4014 100644
--- a/plugins/datasource-zabbix/addMetricFunction.js
+++ b/plugins/datasource-zabbix/addMetricFunction.js
@@ -92,7 +92,6 @@ function (angular, _, $, metricFunctions) {
   }
 
   function createFunctionDropDownMenu(categories) {
-    console.log(categories);
     return _.map(categories, function(list, category) {
       return {
         text: category,
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 2be8afe..b993419 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -47,7 +47,7 @@ define([
           if (zabbixCache._initialized) {
             $scope.getMetricsFromCache();
             $scope.initFilters();
-            console.log("Cached", $scope.metric);
+            //console.log("Cached", $scope.metric);
           } else {
             zabbixCache.refresh().then(function () {
               $scope.getMetricsFromCache();

From 7565cb0114dc4309630eb91d0e00bae9364eec92 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 18:38:31 +0300
Subject: [PATCH 41/58] Fixed bug with aggregation functions bind when
 dashboard loaded.

---
 plugins/datasource-zabbix/datasource.js      |  6 ++++--
 plugins/datasource-zabbix/metricFunctions.js | 13 ++++++++-----
 plugins/datasource-zabbix/queryCtrl.js       |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 3d92601..a9ff939 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -152,7 +152,8 @@ function (angular, _, dateMath, utils, metricFunctions) {
                   return _.contains(transformFunctions, func.def.name);
                 });
                 var functions = _.map(transFuncDefs, function(func) {
-                  return func.bindFunction(DataProcessingService.metricFunctions);
+                  var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
+                  return funcInstance.bindFunction(DataProcessingService.metricFunctions);
                 });
 
                 // Metric data processing
@@ -171,7 +172,8 @@ function (angular, _, dateMath, utils, metricFunctions) {
                 return _.contains(aggregationFunctions, func.def.name);
               });
               var functions = _.map(aggFuncDefs, function(func) {
-                return func.bindFunction(DataProcessingService.metricFunctions);
+                var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
+                return funcInstance.bindFunction(DataProcessingService.metricFunctions);
               });
               var dp = _.map(timeseries_data, 'datapoints');
 
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index 279024c..74ac76e 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -110,11 +110,14 @@ function (_, $) {
     categories[catName] = _.sortBy(funcList, 'name');
   });
 
-  function FuncInstance(funcDef, options) {
+  function FuncInstance(funcDef, params) {
     this.def = funcDef;
-    this.params = [];
 
-    if (options && options.withDefaultParams) {
+    if (params) {
+      this.params = params;
+    } else {
+      // Create with default params
+      this.params = [];
       this.params = funcDef.defaultParams.slice(0);
     }
 
@@ -200,14 +203,14 @@ function (_, $) {
   };
 
   return {
-    createFuncInstance: function(funcDef, options) {
+    createFuncInstance: function(funcDef, params) {
       if (_.isString(funcDef)) {
         if (!index[funcDef]) {
           throw { message: 'Method not found ' + name };
         }
         funcDef = index[funcDef];
       }
-      return new FuncInstance(funcDef, options);
+      return new FuncInstance(funcDef, params);
     },
 
     getFuncDef: function(name) {
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index b993419..3cce7b0 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -269,7 +269,7 @@ define([
       $scope.validateTarget = function () {};
 
       $scope.addFunction = function(funcDef) {
-        var newFunc = metricFunctions.createFuncInstance(funcDef, { withDefaultParams: true });
+        var newFunc = metricFunctions.createFuncInstance(funcDef);
         newFunc.added = true;
         $scope.target.functions.push(newFunc);
 

From 76630587d325c6043792169ea657e96eb7264a22 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 18:49:38 +0300
Subject: [PATCH 42/58] Fixed functions creation in query editor.

---
 plugins/datasource-zabbix/queryCtrl.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 3cce7b0..6dfe52a 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -29,6 +29,11 @@ define([
         };
         _.defaults($scope.target, targetDefaults);
 
+        // Create function instances from saved JSON
+        $scope.target.functions = _.map($scope.target.functions, function(func) {
+          return metricFunctions.createFuncInstance(func.def, func.params);
+        });
+
         if ($scope.target.mode ===0 ||
             $scope.target.mode === 2) {
 

From 79842184bcd05d2d2a49cbd0779b166427c0307c Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 19:12:08 +0300
Subject: [PATCH 43/58] Build query in asynchronous manner (fixed getting data
 at first load).

---
 plugins/datasource-zabbix/datasource.js     | 120 ++++++++++----------
 plugins/datasource-zabbix/queryCtrl.js      |   2 +-
 plugins/datasource-zabbix/queryProcessor.js |  17 ++-
 3 files changed, 77 insertions(+), 62 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index a9ff939..0880aff 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -122,72 +122,74 @@ function (angular, _, dateMath, utils, metricFunctions) {
           // Query numeric data
           if (!target.mode || target.mode === 0) {
 
-            var items = self.queryProcessor.build(groupFilter, hostFilter, appFilter, itemFilter);
+            // Build query in asynchronous manner
+            return self.queryProcessor.build(groupFilter, hostFilter, appFilter, itemFilter)
+              .then(function(items) {
+                // Add hostname for items from multiple hosts
+                var addHostName = target.host.isRegex;
 
-            // Add hostname for items from multiple hosts
-            var addHostName = target.host.isRegex;
+                var getHistory;
+                if ((from < useTrendsFrom) && self.trends) {
 
-            var getHistory;
-            if ((from < useTrendsFrom) && self.trends) {
+                  // Use trends
+                  var valueType = target.downsampleFunction ? target.downsampleFunction.value : "avg";
+                  getHistory = self.zabbixAPI.getTrends(items, from, to).then(function(history) {
+                    return self.queryProcessor.handleTrends(history, addHostName, valueType);
+                  });
+                } else {
 
-              // Use trends
-              var valueType = target.downsampleFunction ? target.downsampleFunction.value : "avg";
-              getHistory = self.zabbixAPI.getTrends(items, from, to).then(function(history) {
-                return self.queryProcessor.handleTrends(history, addHostName, valueType);
-              });
-            } else {
-
-              // Use history
-              getHistory = self.zabbixAPI.getHistory(items, from, to).then(function(history) {
-                return self.queryProcessor.handleHistory(history, addHostName);
-              });
-            }
-
-            return getHistory.then(function (timeseries_data) {
-              timeseries_data = _.map(timeseries_data, function (timeseries) {
-
-                // Filter only transform functions
-                var transformFunctions = _.map(metricFunctions.getCategories()['Transform'], 'name');
-                var transFuncDefs = _.filter(target.functions, function(func) {
-                  return _.contains(transformFunctions, func.def.name);
-                });
-                var functions = _.map(transFuncDefs, function(func) {
-                  var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
-                  return funcInstance.bindFunction(DataProcessingService.metricFunctions);
-                });
-
-                // Metric data processing
-                var dp = timeseries.datapoints;
-                for (var i = 0; i < functions.length; i++) {
-                  dp = functions[i](dp);
+                  // Use history
+                  getHistory = self.zabbixAPI.getHistory(items, from, to).then(function(history) {
+                    return self.queryProcessor.handleHistory(history, addHostName);
+                  });
                 }
-                timeseries.datapoints = dp;
 
-                return timeseries;
-              });
+                return getHistory.then(function (timeseries_data) {
+                  timeseries_data = _.map(timeseries_data, function (timeseries) {
 
-              // Aggregations
-              var aggregationFunctions = _.map(metricFunctions.getCategories()['Aggregate'], 'name');
-              var aggFuncDefs = _.filter(target.functions, function(func) {
-                return _.contains(aggregationFunctions, func.def.name);
-              });
-              var functions = _.map(aggFuncDefs, function(func) {
-                var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
-                return funcInstance.bindFunction(DataProcessingService.metricFunctions);
-              });
-              var dp = _.map(timeseries_data, 'datapoints');
+                    // Filter only transform functions
+                    var transformFunctions = _.map(metricFunctions.getCategories()['Transform'], 'name');
+                    var transFuncDefs = _.filter(target.functions, function(func) {
+                      return _.contains(transformFunctions, func.def.name);
+                    });
+                    var functions = _.map(transFuncDefs, function(func) {
+                      var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
+                      return funcInstance.bindFunction(DataProcessingService.metricFunctions);
+                    });
 
-              if (functions.length) {
-                for (var i = 0; i < functions.length; i++) {
-                  dp = functions[i](dp);
-                }
-                timeseries_data = {
-                  target: 'agg',
-                  datapoints: dp
-                };
-              }
-              return timeseries_data;
-            });
+                    // Metric data processing
+                    var dp = timeseries.datapoints;
+                    for (var i = 0; i < functions.length; i++) {
+                      dp = functions[i](dp);
+                    }
+                    timeseries.datapoints = dp;
+
+                    return timeseries;
+                  });
+
+                  // Aggregations
+                  var aggregationFunctions = _.map(metricFunctions.getCategories()['Aggregate'], 'name');
+                  var aggFuncDefs = _.filter(target.functions, function(func) {
+                    return _.contains(aggregationFunctions, func.def.name);
+                  });
+                  var functions = _.map(aggFuncDefs, function(func) {
+                    var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
+                    return funcInstance.bindFunction(DataProcessingService.metricFunctions);
+                  });
+                  var dp = _.map(timeseries_data, 'datapoints');
+
+                  if (functions.length) {
+                    for (var i = 0; i < functions.length; i++) {
+                      dp = functions[i](dp);
+                    }
+                    timeseries_data = {
+                      target: 'agg',
+                      datapoints: dp
+                    };
+                  }
+                  return timeseries_data;
+                });
+              });
           }
 
           // Query text data
diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 6dfe52a..3c19720 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -57,7 +57,7 @@ define([
             zabbixCache.refresh().then(function () {
               $scope.getMetricsFromCache();
               $scope.initFilters();
-              console.log("From server", $scope.metric);
+              //console.log("From server", $scope.metric);
             });
           }
 
diff --git a/plugins/datasource-zabbix/queryProcessor.js b/plugins/datasource-zabbix/queryProcessor.js
index 20e14fb..bd3fa94 100644
--- a/plugins/datasource-zabbix/queryProcessor.js
+++ b/plugins/datasource-zabbix/queryProcessor.js
@@ -8,7 +8,7 @@ function (angular, _, utils) {
 
   var module = angular.module('grafana.services');
 
-  module.factory('QueryProcessor', function() {
+  module.factory('QueryProcessor', function($q) {
 
     function QueryProcessor(zabbixCacheInstance) {
       var self = this;
@@ -16,9 +16,22 @@ function (angular, _, utils) {
       this.cache = zabbixCacheInstance;
 
       /**
-       * Build query - convert target filters to array of Zabbix items
+       * Build query in asynchronous manner
        */
       this.build = function (groupFilter, hostFilter, appFilter, itemFilter) {
+        if (this.cache._initialized) {
+          return $q.when(self.buildFromCache(groupFilter, hostFilter, appFilter, itemFilter));
+        } else {
+          return this.cache.refresh().then(function() {
+            return self.buildFromCache(groupFilter, hostFilter, appFilter, itemFilter);
+          });
+        }
+      };
+
+      /**
+       * Build query - convert target filters to array of Zabbix items
+       */
+      this.buildFromCache = function (groupFilter, hostFilter, appFilter, itemFilter) {
 
         // Find items by item names and perform queries
         var groups = [];

From e124838e34ff2d393ef025bd203a1062a203fd53 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 19:16:14 +0300
Subject: [PATCH 44/58] Initialize cache only if needed.

---
 plugins/datasource-zabbix/zabbixCache.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugins/datasource-zabbix/zabbixCache.js b/plugins/datasource-zabbix/zabbixCache.js
index 2a73773..ad1c9ce 100644
--- a/plugins/datasource-zabbix/zabbixCache.js
+++ b/plugins/datasource-zabbix/zabbixCache.js
@@ -13,8 +13,6 @@ function (angular, _, utils) {
   module.factory('ZabbixCache', function($q) {
 
     function ZabbixCache(zabbixAPI, ttl) {
-      var self = this;
-
       this.zabbixAPI = zabbixAPI;
       this.ttl = ttl;
 
@@ -26,11 +24,6 @@ function (angular, _, utils) {
 
       // Check is a service initialized or not
       this._initialized = undefined;
-
-      // Set _initialized when data has loaded
-      this.refresh().then(function () {
-        self._initialized = true;
-      });
     }
 
     var p = ZabbixCache.prototype;
@@ -51,6 +44,7 @@ function (angular, _, utils) {
           self._applications  = convertApplications(results[2]);
           self._items         = convertItems(results[3]);
         }
+        self._initialized = true;
       });
     };
 

From ce757409c3435b2d933d95216576999c3b465bdc Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 19:37:50 +0300
Subject: [PATCH 45/58] Datasource query() refactoring.

---
 plugins/datasource-zabbix/datasource.js | 41 ++++++++++++-------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 0880aff..acb82cc 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -148,19 +148,12 @@ function (angular, _, dateMath, utils, metricFunctions) {
                   timeseries_data = _.map(timeseries_data, function (timeseries) {
 
                     // Filter only transform functions
-                    var transformFunctions = _.map(metricFunctions.getCategories()['Transform'], 'name');
-                    var transFuncDefs = _.filter(target.functions, function(func) {
-                      return _.contains(transformFunctions, func.def.name);
-                    });
-                    var functions = _.map(transFuncDefs, function(func) {
-                      var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
-                      return funcInstance.bindFunction(DataProcessingService.metricFunctions);
-                    });
+                    var transformFunctions = bindFunctionDefs(target.functions, 'Transform');
 
                     // Metric data processing
                     var dp = timeseries.datapoints;
-                    for (var i = 0; i < functions.length; i++) {
-                      dp = functions[i](dp);
+                    for (var i = 0; i < transformFunctions.length; i++) {
+                      dp = transformFunctions[i](dp);
                     }
                     timeseries.datapoints = dp;
 
@@ -168,25 +161,18 @@ function (angular, _, dateMath, utils, metricFunctions) {
                   });
 
                   // Aggregations
-                  var aggregationFunctions = _.map(metricFunctions.getCategories()['Aggregate'], 'name');
-                  var aggFuncDefs = _.filter(target.functions, function(func) {
-                    return _.contains(aggregationFunctions, func.def.name);
-                  });
-                  var functions = _.map(aggFuncDefs, function(func) {
-                    var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
-                    return funcInstance.bindFunction(DataProcessingService.metricFunctions);
-                  });
+                  var aggregationFunctions = bindFunctionDefs(target.functions, 'Aggregate');
                   var dp = _.map(timeseries_data, 'datapoints');
-
-                  if (functions.length) {
-                    for (var i = 0; i < functions.length; i++) {
-                      dp = functions[i](dp);
+                  if (aggregationFunctions.length) {
+                    for (var i = 0; i < aggregationFunctions.length; i++) {
+                      dp = aggregationFunctions[i](dp);
                     }
                     timeseries_data = {
                       target: 'agg',
                       datapoints: dp
                     };
                   }
+
                   return timeseries_data;
                 });
               });
@@ -257,6 +243,17 @@ function (angular, _, dateMath, utils, metricFunctions) {
         });
     };
 
+    function bindFunctionDefs(functionDefs, category) {
+      var aggregationFunctions = _.map(metricFunctions.getCategories()[category], 'name');
+      var aggFuncDefs = _.filter(functionDefs, function(func) {
+        return _.contains(aggregationFunctions, func.def.name);
+      });
+      return _.map(aggFuncDefs, function(func) {
+        var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);
+        return funcInstance.bindFunction(DataProcessingService.metricFunctions);
+      });
+    }
+
     ////////////////
     // Templating //
     ////////////////

From 8a013b5d81c2813b2ef405a6613287075f10d01d Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 19:56:59 +0300
Subject: [PATCH 46/58] Show last aggregation function as metric alias.

---
 plugins/datasource-zabbix/datasource.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index acb82cc..71d7963 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -167,8 +167,12 @@ function (angular, _, dateMath, utils, metricFunctions) {
                     for (var i = 0; i < aggregationFunctions.length; i++) {
                       dp = aggregationFunctions[i](dp);
                     }
+                    var lastAgg = _.findLast(target.functions, function(func) {
+                      return _.contains(
+                        _.map(metricFunctions.getCategories()['Aggregate'], 'name'), func.def.name);
+                    });
                     timeseries_data = {
-                      target: 'agg',
+                      target: lastAgg.text,
                       datapoints: dp
                     };
                   }

From 8278ad67cb04d48c25979627d2afd5c451757f10 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 20:53:50 +0300
Subject: [PATCH 47/58] Apply alias functions.

---
 plugins/datasource-zabbix/dataProcessingService.js |  6 ++++++
 plugins/datasource-zabbix/datasource.js            | 10 ++++++++--
 plugins/datasource-zabbix/metricFunctions.js       |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index 8012692..d3972d9 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -106,6 +106,11 @@ function (angular, _, moment, utils) {
       return _.max(values);
     };
 
+    this.setAlias = function(alias, timeseries) {
+      timeseries.target = alias;
+      return timeseries;
+    };
+
     this.aggregationFunctions = {
       avg: this.AVERAGE,
       min: this.MIN,
@@ -127,6 +132,7 @@ function (angular, _, moment, utils) {
       average: _.partial(this.aggregateWrapper, this.AVERAGE),
       min: _.partial(this.aggregateWrapper, this.MIN),
       max: _.partial(this.aggregateWrapper, this.MAX),
+      setAlias: this.setAlias,
     };
 
   });
diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 71d7963..fdb0efc 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -171,10 +171,16 @@ function (angular, _, dateMath, utils, metricFunctions) {
                       return _.contains(
                         _.map(metricFunctions.getCategories()['Aggregate'], 'name'), func.def.name);
                     });
-                    timeseries_data = {
+                    timeseries_data = [{
                       target: lastAgg.text,
                       datapoints: dp
-                    };
+                    }];
+                  }
+
+                  // Apply alias functions
+                  var aliasFunctions = bindFunctionDefs(target.functions, 'Alias');
+                  for (var j = 0; j < aliasFunctions.length; j++) {
+                    _.each(timeseries_data, aliasFunctions[j]);
                   }
 
                   return timeseries_data;
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index 74ac76e..6138024 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -90,7 +90,7 @@ function (_, $) {
   });
 
   addFuncDef({
-    name: 'alias',
+    name: 'setAlias',
     category: 'Alias',
     params: [
       { name: 'alias', type: 'string'}

From 35e6ad8df554bfe7340c0e65e4df5e16dbdaf30c Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 20:56:31 +0300
Subject: [PATCH 48/58] Removed unused function definitions.

---
 plugins/datasource-zabbix/metricFunctions.js | 30 --------------------
 1 file changed, 30 deletions(-)

diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index 6138024..a708f98 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -23,21 +23,6 @@ function (_, $) {
     index[funcDef.shortName || funcDef.name] = funcDef;
   }
 
-  var optionalSeriesRefArgs = [
-    { name: 'other', type: 'value_or_series', optional: true },
-    { name: 'other', type: 'value_or_series', optional: true },
-    { name: 'other', type: 'value_or_series', optional: true },
-    { name: 'other', type: 'value_or_series', optional: true },
-    { name: 'other', type: 'value_or_series', optional: true }
-  ];
-
-  addFuncDef({
-    name: 'scaleToSeconds',
-    category: 'Transform',
-    params: [{ name: 'seconds', type: 'int' }],
-    defaultParams: [1],
-  });
-
   addFuncDef({
     name: 'groupBy',
     category: 'Transform',
@@ -48,13 +33,6 @@ function (_, $) {
     defaultParams: ['1m', 'avg'],
   });
 
-  addFuncDef({
-    name: 'perSecond',
-    category: 'Transform',
-    params: [{ name: "max value", type: "int", optional: true }],
-    defaultParams: [],
-  });
-
   addFuncDef({
     name: 'sum',
     category: 'Aggregate',
@@ -98,14 +76,6 @@ function (_, $) {
     defaultParams: [],
   });
 
-  addFuncDef({
-    name: 'averageSeries',
-    shortName: 'avg',
-    category: 'Alias',
-    params: optionalSeriesRefArgs,
-    defaultParams: [''],
-  });
-
   _.each(categories, function(funcList, catName) {
     categories[catName] = _.sortBy(funcList, 'name');
   });

From 1b58e42d738a201afb23bfb5150b4b3b664414b9 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 21:26:30 +0300
Subject: [PATCH 49/58] Fixed slicing to frames in groupBy() function.

---
 plugins/datasource-zabbix/dataProcessingService.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index d3972d9..e0be758 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -69,9 +69,16 @@ function (angular, _, moment, utils) {
      */
     this.groupBy = function(interval, groupByCallback, datapoints) {
       var ms_interval = utils.parseInterval(interval);
+
+      // Calculate frame timestamps
+      var min_timestamp = datapoints[0][1];
       var frames = _.groupBy(datapoints, function(point) {
-        var group_time = Number(moment.utc(point[1]).startOf('minute').valueOf());
-        group_time = Math.ceil(point[1] / ms_interval) * ms_interval;
+        var group_time = Math.floor(point[1] / ms_interval) * ms_interval;
+
+        // Prevent points outside of time range
+        if (group_time < min_timestamp) {
+          group_time = min_timestamp;
+        }
         return group_time;
       });
 

From 308fef223e58f4da8c1a914a8774c84fccb0d097 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 21:44:40 +0300
Subject: [PATCH 50/58] Fixed panel update when new function added.

---
 plugins/datasource-zabbix/queryCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 3c19720..faa02a1 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -280,7 +280,7 @@ define([
 
         $scope.moveAliasFuncLast();
 
-        if (!newFunc.params.length && newFunc.added) {
+        if (newFunc.params.length && newFunc.added) {
           $scope.targetChanged();
         }
       };

From 15f7134d9e295b78e8bafe2643231c29a2466815 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 28 Jan 2016 22:14:35 +0300
Subject: [PATCH 51/58] Show only needed item types in query editor.

---
 plugins/datasource-zabbix/queryCtrl.js   | 11 +++++++++--
 plugins/datasource-zabbix/zabbixCache.js | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index faa02a1..33d744e 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -34,7 +34,7 @@ define([
           return metricFunctions.createFuncInstance(func.def, func.params);
         });
 
-        if ($scope.target.mode ===0 ||
+        if ($scope.target.mode === 0 ||
             $scope.target.mode === 2) {
 
           $scope.downsampleFunctionList = [
@@ -83,11 +83,12 @@ define([
       };
 
       $scope.getMetricsFromCache = function () {
+        var item_type = $scope.editorModes[$scope.target.mode];
         $scope.metric = {
           groupList: zabbixCache.getGroups(),
           hostList: zabbixCache.getHosts(),
           applicationList: zabbixCache.getApplications(),
-          itemList: zabbixCache.getItems()
+          itemList: zabbixCache.getItems(item_type)
         };
       };
 
@@ -305,6 +306,12 @@ define([
 
       $scope.functionChanged = function() {};
 
+      $scope.editorModes = {
+        0: 'num',
+        1: 'itservice',
+        2: 'text'
+      };
+
       /**
        * Switch query editor to specified mode.
        * Modes:
diff --git a/plugins/datasource-zabbix/zabbixCache.js b/plugins/datasource-zabbix/zabbixCache.js
index ad1c9ce..57405cc 100644
--- a/plugins/datasource-zabbix/zabbixCache.js
+++ b/plugins/datasource-zabbix/zabbixCache.js
@@ -60,8 +60,22 @@ function (angular, _, utils) {
       return this._applications;
     };
 
-    p.getItems = function() {
-      return this._items;
+    p.getItems = function(type) {
+      switch (type) {
+        case 'num':
+          return _.filter(this._items, function(item) {
+            return (item.value_type === '0' ||
+                    item.value_type === '3');
+          });
+        case 'text':
+          return _.filter(this._items, function(item) {
+            return (item.value_type === '1' ||
+                    item.value_type === '2' ||
+                    item.value_type === '4');
+          });
+        default:
+          return this._items;
+      }
     };
 
     p.getHost = function(hostid) {

From fb35c83d80070c353341c35543638efd0d05f1d3 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 29 Jan 2016 10:59:46 +0300
Subject: [PATCH 52/58] Added sumSeries() aggregation.

---
 .../dataProcessingService.js                  | 94 +++++++++++++++++++
 plugins/datasource-zabbix/metricFunctions.js  |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index e0be758..c941f7e 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -97,6 +97,99 @@ function (angular, _, moment, utils) {
       });
     };
 
+    this.sumSeries = function(timeseries) {
+
+      // Calculate new points for interpolation
+      var new_timestamps = _.uniq(_.map(_.flatten(timeseries, true), function(point) {
+        return point[1];
+      }));
+      new_timestamps = _.sortBy(new_timestamps);
+
+      var interpolated_timeseries = _.map(timeseries, function(series) {
+        var timestamps = _.map(series, function(point) {
+          return point[1];
+        });
+        var new_points = _.map(_.difference(new_timestamps, timestamps), function(timestamp) {
+          return [null, timestamp];
+        });
+        var new_series = series.concat(new_points);
+        return sortByTime(new_series);
+      });
+
+      _.each(interpolated_timeseries, interpolateSeries);
+
+      var new_timeseries = [];
+      var sum;
+      for (var i = new_timestamps.length - 1; i >= 0; i--) {
+        sum = 0;
+        for (var j = interpolated_timeseries.length - 1; j >= 0; j--) {
+          sum += interpolated_timeseries[j][i][0];
+        }
+        new_timeseries.push([sum, new_timestamps[i]]);
+      }
+
+      return sortByTime(new_timeseries);
+    };
+
+    function sortByTime(series) {
+      return _.sortBy(series, function(point) {
+        return point[1];
+      });
+    }
+
+    /**
+     * Interpolate series with gaps
+     */
+    function interpolateSeries(series) {
+      var left, right;
+
+      // Interpolate series
+      for (var i = series.length - 1; i >= 0; i--) {
+        if (!series[i][0]) {
+          left = findNearestLeft(series, series[i]);
+          right = findNearestRight(series, series[i]);
+          if (!left) {
+            left = right;
+          }
+          if (!right) {
+            right = left;
+          }
+          series[i][0] = linearInterpolation(series[i][1], left, right);
+        }
+      }
+      return series;
+    }
+
+    function linearInterpolation(timestamp, left, right) {
+      if (left[1] === right[1]) {
+        return (left[0] + right[0]) / 2;
+      } else {
+        return (left[0] + (right[0] - left[0]) / (right[1] - left[1]) * (timestamp - left[1]));
+      }
+    }
+
+    function findNearestRight(series, point) {
+      var point_index = _.indexOf(series, point);
+      var nearestRight;
+      for (var i = point_index; i < series.length; i++) {
+        if (series[i][0]) {
+          return series[i];
+        }
+      }
+      return nearestRight;
+    }
+
+    function findNearestLeft(series, point) {
+      var point_index = _.indexOf(series, point);
+      var nearestLeft;
+      for (var i = point_index; i > 0; i--) {
+        if (series[i][0]) {
+          return series[i];
+        }
+      }
+      return nearestLeft;
+    }
+
     this.AVERAGE = function(values) {
       var sum = 0;
       _.each(values, function(value) {
@@ -139,6 +232,7 @@ function (angular, _, moment, utils) {
       average: _.partial(this.aggregateWrapper, this.AVERAGE),
       min: _.partial(this.aggregateWrapper, this.MIN),
       max: _.partial(this.aggregateWrapper, this.MAX),
+      sumSeries: this.sumSeries,
       setAlias: this.setAlias,
     };
 
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index a708f98..e5d8ffd 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -34,7 +34,7 @@ function (_, $) {
   });
 
   addFuncDef({
-    name: 'sum',
+    name: 'sumSeries',
     category: 'Aggregate',
     params: [],
     defaultParams: [],

From 8ae3b8b2eb8e1928927b92b82215753f200907b4 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 29 Jan 2016 16:33:45 +0300
Subject: [PATCH 53/58] Fixed panel update when function without params was
 added.

---
 plugins/datasource-zabbix/queryCtrl.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index 33d744e..d9fbaf4 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -281,7 +281,8 @@ define([
 
         $scope.moveAliasFuncLast();
 
-        if (newFunc.params.length && newFunc.added) {
+        if (newFunc.params.length && newFunc.added ||
+            newFunc.def.params.length === 0) {
           $scope.targetChanged();
         }
       };

From 2819162809c358afccdeb09e07e2c9c7892b1988 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 29 Jan 2016 16:58:28 +0300
Subject: [PATCH 54/58] Added medianBy() aggregation.

---
 plugins/datasource-zabbix/dataProcessingService.js | 12 ++++++++++++
 plugins/datasource-zabbix/metricFunctions.js       | 11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index c941f7e..9adb408 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -190,6 +190,11 @@ function (angular, _, moment, utils) {
       return nearestLeft;
     }
 
+    this.medianBy = function(interval, timeseries) {
+      var flatten_series = _.flatten(timeseries, true);
+      return self.groupBy(interval, self.MEDIAN, flatten_series);
+    };
+
     this.AVERAGE = function(values) {
       var sum = 0;
       _.each(values, function(value) {
@@ -206,6 +211,11 @@ function (angular, _, moment, utils) {
       return _.max(values);
     };
 
+    this.MEDIAN = function(values) {
+      var sorted = _.sortBy(values);
+      return sorted[Math.floor(sorted.length / 2)];
+    };
+
     this.setAlias = function(alias, timeseries) {
       timeseries.target = alias;
       return timeseries;
@@ -215,6 +225,7 @@ function (angular, _, moment, utils) {
       avg: this.AVERAGE,
       min: this.MIN,
       max: this.MAX,
+      median: this.MEDIAN
     };
 
     this.groupByWrapper = function(interval, groupFunc, datapoints) {
@@ -233,6 +244,7 @@ function (angular, _, moment, utils) {
       min: _.partial(this.aggregateWrapper, this.MIN),
       max: _.partial(this.aggregateWrapper, this.MAX),
       sumSeries: this.sumSeries,
+      medianBy: this.medianBy,
       setAlias: this.setAlias,
     };
 
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index e5d8ffd..da68293 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -28,7 +28,7 @@ function (_, $) {
     category: 'Transform',
     params: [
       { name: 'interval', type: 'string'},
-      { name: 'function', type: 'string', options: ['avg', 'min', 'max'] }
+      { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'median'] }
     ],
     defaultParams: ['1m', 'avg'],
   });
@@ -40,6 +40,15 @@ function (_, $) {
     defaultParams: [],
   });
 
+  addFuncDef({
+    name: 'medianBy',
+    category: 'Aggregate',
+    params: [
+      { name: 'interval', type: 'string'}
+    ],
+    defaultParams: ['1m'],
+  });
+
   addFuncDef({
     name: 'average',
     category: 'Aggregate',

From 2676ca246b2b93cfe5c10db2f6d94bb27475e4e5 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 29 Jan 2016 17:30:18 +0300
Subject: [PATCH 55/58] Aggregation functions refactoring.

---
 plugins/datasource-zabbix/dataProcessingService.js | 11 +++--------
 plugins/datasource-zabbix/metricFunctions.js       |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/plugins/datasource-zabbix/dataProcessingService.js b/plugins/datasource-zabbix/dataProcessingService.js
index 9adb408..b976b4a 100644
--- a/plugins/datasource-zabbix/dataProcessingService.js
+++ b/plugins/datasource-zabbix/dataProcessingService.js
@@ -92,9 +92,9 @@ function (angular, _, moment, utils) {
       });
 
       // Convert points to Grafana format
-      return _.map(grouped, function(value, timestamp) {
+      return sortByTime(_.map(grouped, function(value, timestamp) {
         return [Number(value), Number(timestamp)];
-      });
+      }));
     };
 
     this.sumSeries = function(timeseries) {
@@ -190,11 +190,6 @@ function (angular, _, moment, utils) {
       return nearestLeft;
     }
 
-    this.medianBy = function(interval, timeseries) {
-      var flatten_series = _.flatten(timeseries, true);
-      return self.groupBy(interval, self.MEDIAN, flatten_series);
-    };
-
     this.AVERAGE = function(values) {
       var sum = 0;
       _.each(values, function(value) {
@@ -243,8 +238,8 @@ function (angular, _, moment, utils) {
       average: _.partial(this.aggregateWrapper, this.AVERAGE),
       min: _.partial(this.aggregateWrapper, this.MIN),
       max: _.partial(this.aggregateWrapper, this.MAX),
+      median: _.partial(this.aggregateWrapper, this.MEDIAN),
       sumSeries: this.sumSeries,
-      medianBy: this.medianBy,
       setAlias: this.setAlias,
     };
 
diff --git a/plugins/datasource-zabbix/metricFunctions.js b/plugins/datasource-zabbix/metricFunctions.js
index da68293..cf55092 100644
--- a/plugins/datasource-zabbix/metricFunctions.js
+++ b/plugins/datasource-zabbix/metricFunctions.js
@@ -41,7 +41,7 @@ function (_, $) {
   });
 
   addFuncDef({
-    name: 'medianBy',
+    name: 'median',
     category: 'Aggregate',
     params: [
       { name: 'interval', type: 'string'}

From 71e60fb80839b89278fdbc9320a6f391da4aa049 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 29 Jan 2016 18:35:13 +0300
Subject: [PATCH 56/58] Fixed query editor slowdown when opened.

---
 plugins/datasource-zabbix/queryCtrl.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/datasource-zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
index d9fbaf4..6c95110 100644
--- a/plugins/datasource-zabbix/queryCtrl.js
+++ b/plugins/datasource-zabbix/queryCtrl.js
@@ -60,8 +60,6 @@ define([
               //console.log("From server", $scope.metric);
             });
           }
-
-          setItemAlias();
         }
         else if ($scope.target.mode === 1) {
           $scope.slaPropertyList = [
@@ -77,9 +75,9 @@ define([
       };
 
       $scope.initFilters = function () {
-        $scope.onGroupBlur();
-        $scope.onHostBlur();
-        $scope.onApplicationBlur();
+        $scope.metric.filteredHosts = $scope.filterHosts();
+        $scope.metric.filteredApplications = $scope.filterApplications();
+        $scope.metric.filteredItems = $scope.filterItems();
       };
 
       $scope.getMetricsFromCache = function () {

From 075fed6668902acc065a6ecd3e1f4ecaf4dbbc16 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 29 Jan 2016 19:03:34 +0300
Subject: [PATCH 57/58] Don't request undefined targets.

---
 plugins/datasource-zabbix/datasource.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index fdb0efc..493761d 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -108,8 +108,9 @@ function (angular, _, dateMath, utils, metricFunctions) {
 
         if (target.mode !== 1) {
 
-          // Don't show hidden targets
-          if (target.hide) {
+          // Don't request undefined and hidden targets
+          if (target.hide || !target.group ||
+              !target.host || !target.item) {
             return [];
           }
 

From 4231d3769a78441f07e1a829e16cc27b42a6093c Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 30 Jan 2016 22:30:23 +0300
Subject: [PATCH 58/58] Updated datasource.metricFindQuery() for working with
 cache.

---
 plugins/datasource-zabbix/datasource.js     |  52 +++-----
 plugins/datasource-zabbix/queryProcessor.js | 127 ++++++++++++++++++++
 plugins/datasource-zabbix/utils.js          |   4 +-
 3 files changed, 147 insertions(+), 36 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 493761d..40f1378 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -277,6 +277,8 @@ function (angular, _, dateMath, utils, metricFunctions) {
      *                        of metrics in "{metric1,metcic2,...,metricN}" format.
      */
     this.metricFindQuery = function (query) {
+      var metrics;
+
       // Split query. Query structure:
       // group.host.app.item
       var parts = [];
@@ -294,49 +296,22 @@ function (angular, _, dateMath, utils, metricFunctions) {
 
       // Get items
       if (parts.length === 4) {
-        return this.zabbixAPI.itemFindQuery(template.group, template.host, template.app)
-          .then(function (result) {
-            return _.map(result, function (item) {
-              var itemname = zabbixHelperSrv.expandItemName(item);
-              return {
-                text: itemname,
-                expandable: false
-              };
-            });
-          });
+        var items = this.queryProcessor.filterItems(template.host, template.app, true);
+        metrics = _.map(items, formatMetric);
       }
       // Get applications
       else if (parts.length === 3) {
-        return this.zabbixAPI.appFindQuery(template.host, template.group).then(function (result) {
-          return _.map(result, function (app) {
-            return {
-              text: app.name,
-              expandable: false
-            };
-          });
-        });
+        var apps = this.queryProcessor.filterApplications(template.host);
+        metrics = _.map(apps, formatMetric);
       }
       // Get hosts
       else if (parts.length === 2) {
-        return this.zabbixAPI.hostFindQuery(template.group).then(function (result) {
-          return _.map(result, function (host) {
-            return {
-              text: host.name,
-              expandable: false
-            };
-          });
-        });
+        var hosts = this.queryProcessor.filterHosts(template.group);
+        metrics = _.map(hosts, formatMetric);
       }
       // Get groups
       else if (parts.length === 1) {
-        return this.zabbixAPI.getGroupByName(template.group).then(function (result) {
-          return _.map(result, function (hostgroup) {
-            return {
-              text: hostgroup.name,
-              expandable: false
-            };
-          });
-        });
+        metrics = _.map(this.zabbixCache.getGroups(template.group), formatMetric);
       }
       // Return empty object for invalid request
       else {
@@ -344,8 +319,17 @@ function (angular, _, dateMath, utils, metricFunctions) {
         d.resolve([]);
         return d.promise;
       }
+
+      return $q.when(metrics);
     };
 
+    function formatMetric(metricObj) {
+      return {
+        text: metricObj.name,
+        expandable: false
+      };
+    }
+
     /////////////////
     // Annotations //
     /////////////////
diff --git a/plugins/datasource-zabbix/queryProcessor.js b/plugins/datasource-zabbix/queryProcessor.js
index bd3fa94..aa6cf7b 100644
--- a/plugins/datasource-zabbix/queryProcessor.js
+++ b/plugins/datasource-zabbix/queryProcessor.js
@@ -28,6 +28,133 @@ function (angular, _, utils) {
         }
       };
 
+      this.filterHosts = function(groupFilter) {
+        var groups = [];
+        var hosts = [];
+        var groupList = self.cache.getGroups();
+
+        // Filter groups by regex
+        if (utils.isRegex(groupFilter)) {
+          var filterPattern = utils.buildRegex(groupFilter);
+          groups = _.filter(groupList, function (groupObj) {
+            return filterPattern.test(groupObj.name);
+          });
+        }
+        // Find hosts in selected group
+        else {
+          var finded = _.find(groupList, {'name': groupFilter});
+          if (finded) {
+            groups.push(finded);
+          } else {
+            groups = undefined;
+          }
+        }
+
+        if (groups) {
+          var groupids = _.map(groups, 'groupid');
+          hosts = _.filter(self.cache.getHosts(), function (hostObj) {
+            return _.intersection(groupids, hostObj.groups).length;
+          });
+        }
+        return hosts;
+      };
+
+      this.filterApplications = function(hostFilter) {
+        var hosts = [];
+        var apps = [];
+        var hostList = this.cache.getHosts();
+
+        // Filter hosts by regex
+        if (utils.isRegex(hostFilter)) {
+          var filterPattern = utils.buildRegex(hostFilter);
+          hosts = _.filter(hostList, function (hostObj) {
+            return filterPattern.test(hostObj.name);
+          });
+        }
+        // Find applications in selected host
+        else {
+          var finded = _.find(hostList, {'name': hostFilter});
+          if (finded) {
+            hosts.push(finded);
+          } else {
+            hosts = undefined;
+          }
+        }
+
+        if (hosts) {
+          var hostsids = _.map(hosts, 'hostid');
+          apps = _.filter(this.cache.getApplications(), function (appObj) {
+            return _.intersection(hostsids, appObj.hosts).length;
+          });
+        }
+
+        return apps;
+      };
+
+      this.filterItems = function (hostFilter, appFilter, showDisabledItems) {
+        var hosts = [];
+        var apps = [];
+        var items = [];
+        var hostList = this.cache.getHosts();
+        var applicationList = this.cache.getApplications();
+
+        // Filter hosts by regex
+        if (utils.isRegex(hostFilter)) {
+          var hostFilterPattern = utils.buildRegex(hostFilter);
+          hosts = _.filter(hostList, function (hostObj) {
+            return hostFilterPattern.test(hostObj.name);
+          });
+        }
+        else {
+          var findedHosts = _.find(hostList, {'name': hostFilter});
+          if (findedHosts) {
+            hosts.push(findedHosts);
+          } else {
+            hosts = undefined;
+          }
+        }
+
+        // Filter applications by regex
+        if (utils.isRegex(appFilter)) {
+          var filterPattern = utils.buildRegex(appFilter);
+          apps = _.filter(applicationList, function (appObj) {
+            return filterPattern.test(appObj.name);
+          });
+        }
+        // Find items in selected application
+        else if (appFilter) {
+          var finded = _.find(applicationList, {'name': appFilter});
+          if (finded) {
+            apps.push(finded);
+          } else {
+            apps = undefined;
+          }
+        } else {
+          apps = undefined;
+          if (hosts) {
+            items = _.filter(this.cache.getItems(), function (itemObj) {
+              return _.find(hosts, {'hostid': itemObj.hostid });
+            });
+          }
+        }
+
+        if (apps) {
+          var appids = _.flatten(_.map(apps, 'applicationids'));
+          items = _.filter(this.cache.getItems(), function (itemObj) {
+            return _.intersection(appids, itemObj.applications).length;
+          });
+          items = _.filter(items, function (itemObj) {
+            return _.find(hosts, {'hostid': itemObj.hostid });
+          });
+        }
+
+        if (!showDisabledItems) {
+          items = _.filter(items, {'status': '0'});
+        }
+
+        return items;
+      };
+
       /**
        * Build query - convert target filters to array of Zabbix items
        */
diff --git a/plugins/datasource-zabbix/utils.js b/plugins/datasource-zabbix/utils.js
index 240da61..c2ba09c 100644
--- a/plugins/datasource-zabbix/utils.js
+++ b/plugins/datasource-zabbix/utils.js
@@ -5,7 +5,7 @@ define([
 function (_, moment) {
   'use strict';
 
-  function utils() {
+  function Utils() {
 
     /**
      * Expand Zabbix item name
@@ -49,5 +49,5 @@ function (_, moment) {
 
   }
 
-  return new utils();
+  return new Utils();
 });
\ No newline at end of file