From 560d476102156ee59d0ffd1274701bf99abd62b7 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 24 Jul 2015 20:51:44 +0300
Subject: [PATCH 01/19] Refactoring - resolve some code inspection problems for
 JSDoc.

---
 zabbix/zabbixAPIWrapper.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/zabbix/zabbixAPIWrapper.js b/zabbix/zabbixAPIWrapper.js
index 0399915..3954b36 100644
--- a/zabbix/zabbixAPIWrapper.js
+++ b/zabbix/zabbixAPIWrapper.js
@@ -245,8 +245,8 @@ function (angular, _) {
     /**
      * Get the list of hosts
      *
-     * @param  {array} groupids
-     * @return {array}          array of Zabbix host objects
+     * @param  {string|string[]} groupids
+     * @return {Object}          array of Zabbix host objects
      */
     p.performHostSuggestQuery = function(groupids) {
       var params = {
@@ -269,7 +269,7 @@ function (angular, _) {
      *
      * @param  {array} hostids
      * @param  {array} groupids
-     * @return {array}          array of Zabbix application objects
+     * @return {Object}          array of Zabbix application objects
      */
     p.performAppSuggestQuery = function(hostids, /* optional */ groupids) {
       var params = {
@@ -289,10 +289,10 @@ function (angular, _) {
     /**
      * Items request
      *
-     * @param  {string or Array} hostids          ///////////////////////////
-     * @param  {string or Array} applicationids   // Zabbix API parameters //
-     * @param  {string or Array} groupids         ///////////////////////////
-     * @return {string or Array}                  Array of Zabbix API item objects
+     * @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, /* optional */ groupids) {
       var params = {

From e6c5dd35bf71d988501d4af956cab42b28efed9e Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 24 Jul 2015 20:53:50 +0300
Subject: [PATCH 02/19] iss #19 - implements getITService() and getSLA()
 methods.

---
 zabbix/zabbixAPIWrapper.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/zabbix/zabbixAPIWrapper.js b/zabbix/zabbixAPIWrapper.js
index 3954b36..c0b8980 100644
--- a/zabbix/zabbixAPIWrapper.js
+++ b/zabbix/zabbixAPIWrapper.js
@@ -508,6 +508,25 @@ function (angular, _) {
       });
     };
 
+    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);
+    };
+
     return ZabbixAPI;
 
   });

From f5cd2a0830f36e1c0a72b23207bf624bbaf2c0f2 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 24 Jul 2015 23:28:24 +0300
Subject: [PATCH 03/19] Fixed layout in query editor.

---
 zabbix/partials/query.editor.html | 67 ++++++++++++++-----------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index 30b767b..4fccecb 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -55,15 +55,13 @@
         <!-- Select Host Group -->
         <li class="tight-form-item input-small" style="width: 5em">Group</li>
         <li>
-          <label>
-            <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>
-          </label>
+          <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">
@@ -73,15 +71,13 @@
         <!-- Select Host -->
         <li class="tight-form-item input-small" style="width: 3em">Host</li>
         <li>
-          <label>
-            <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>
-          </label>
+          <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">
@@ -105,7 +101,9 @@
       </ul>
 
       <div class="clearfix"></div>
+    </div>
 
+    <div class="tight-form">
       <ul class="tight-form-list" role="menu">
         <li class="tight-form-item" style="min-width: 15px; text-align: center">&nbsp</li>
         <li class="tight-form-item">
@@ -116,15 +114,13 @@
         <!-- Select Application -->
         <li class="tight-form-item input-small" style="width: 5em">Application</li>
         <li>
-          <label>
-            <select class="tight-form-input input-large"
-                    ng-select="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>
-          </label>
+          <select class="tight-form-input input-large"
+                  ng-select="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">
@@ -134,15 +130,13 @@
         <!-- Select Item -->
         <li class="tight-form-item input-small" style="width: 3em">Item</li>
         <li>
-          <label>
-            <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>
-          </label>
+          <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">
@@ -178,6 +172,7 @@
                  ng-blur="targetBlur()">
         </li>
       </ul>
+
       <div class="clearfix"></div>
     </div>
 

From add7ed0f0f6be99d3ed49df0301c4f6466966e3e Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 24 Jul 2015 23:50:24 +0300
Subject: [PATCH 04/19] iss #19 - Implemented base behavior for switching
 editor to IT Services.

---
 zabbix/partials/query.editor.html | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index 4fccecb..fe8a516 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -16,6 +16,15 @@
               <i class="fa fa-bars"></i>
             </a>
             <ul class="dropdown-menu pull-right" role="menu">
+              <!-- Switch to IT Services editor -->
+              <li role="menuitem" ng-hide="target.ITService">
+                <a class="pointer" tabindex="1"
+                   ng-click="target.ITService = true">IT Services</a>
+              </li>
+              <li role="menuitem" ng-show="target.ITService">
+                <a class="pointer" tabindex="1"
+                   ng-click="target.ITService = false">Items</a>
+              </li>
               <li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
               <li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index-1)">Move up</a></li>
               <li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index+1)">Move down</a></li>
@@ -42,7 +51,20 @@
         </li>
       </ul>
 
-      <ul class="tight-form-list" role="menu">
+      <ul class="tight-form-list" role="menu" ng-show="target.ITService">
+        <!-- Select IT Service -->
+        <li class="tight-form-item input-small" style="width: 5em">IT Service</li>
+        <li>
+          <input type="text"
+                 class="tight-form-input input-medium"
+                 ng-model="target.itservice"
+                 spellcheck='false'
+                 placeholder="IT Service"
+                 ng-blur="targetBlur()">
+        </li>
+      </ul>
+
+      <ul class="tight-form-list" role="menu" ng-hide="target.ITService">
         <!-- Alias -->
         <li>
           <input type="text"
@@ -103,7 +125,7 @@
       <div class="clearfix"></div>
     </div>
 
-    <div class="tight-form">
+    <div class="tight-form" ng-hide="target.ITService">
       <ul class="tight-form-list" role="menu">
         <li class="tight-form-item" style="min-width: 15px; text-align: center">&nbsp</li>
         <li class="tight-form-item">

From 0202949c2de6a882415e8f1c27cf680462332c87 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 25 Jul 2015 17:04:44 +0300
Subject: [PATCH 05/19] iss #19 - Getting list of IT services and SLA property
 selection.

---
 zabbix/partials/query.editor.html | 26 +++++++++-----
 zabbix/queryCtrl.js               | 57 ++++++++++++++++++++++++-------
 2 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index fe8a516..e7f2916 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -51,16 +51,26 @@
         </li>
       </ul>
 
+      <!-- IT Service editor -->
       <ul class="tight-form-list" role="menu" ng-show="target.ITService">
-        <!-- Select IT Service -->
-        <li class="tight-form-item input-small" style="width: 5em">IT Service</li>
+        <li class="tight-form-item input-small">IT Service</li>
         <li>
-          <input type="text"
-                 class="tight-form-input input-medium"
-                 ng-model="target.itservice"
-                 spellcheck='false'
-                 placeholder="IT Service"
-                 ng-blur="targetBlur()">
+          <select class="tight-form-input input-large"
+                  ng-change="selectITService()"
+                  ng-model="target.itservice"
+                  bs-tooltip="target.itservice.name.length > 25 ? target.itservice.name : ''"
+                  ng-options="itservice.name for itservice in itserviceList track by itservice.name">
+            <option value="">-- Select IT service --</option>
+          </select>
+        </li>
+        <li class="tight-form-item input-small">SLA property</li>
+        <li>
+          <select class="tight-form-input input-medium"
+                  ng-change="selectSLAProperty()"
+                  ng-model="target.slaProperty"
+                  ng-options="slaProperty for slaProperty in slaPropertyList track by slaProperty">
+            <option value="">-- SLA property --</option>
+          </select>
         </li>
       </ul>
 
diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index 0a02a58..bca12e5 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -13,20 +13,31 @@ function (angular, _) {
 
     $scope.init = function() {
       $scope.targetLetters = targetLetters;
-      $scope.metric = {
-        hostGroupList: [],
-        hostList: [{name: '*', visible_name: 'All'}],
-        applicationList: [{name: '*', visible_name: 'All'}],
-        itemList: [{name: 'All'}]
-      };
+      if ($scope.target.ITService) {
+        $scope.slaPropertyList = [
+          "sla",
+          "okTime",
+          "problemTime",
+          "downtimeTime"
+        ];
+        $scope.itserviceList = [{name: "test"}];
+        $scope.updateITServiceList();
+      } else {
+        $scope.metric = {
+          hostGroupList: [],
+          hostList: [{name: '*', visible_name: 'All'}],
+          applicationList: [{name: '*', visible_name: 'All'}],
+          itemList: [{name: 'All'}]
+        };
 
-      // Update host group, host, application and item lists
-      $scope.updateGroupList();
-      $scope.updateHostList();
-      $scope.updateAppList();
-      $scope.updateItemList();
+        // Update host group, host, application and item lists
+        $scope.updateGroupList();
+        $scope.updateHostList();
+        $scope.updateAppList();
+        $scope.updateItemList();
 
-      setItemAlias();
+        setItemAlias();
+      }
 
       $scope.target.errors = validateTarget($scope.target);
     };
@@ -49,6 +60,17 @@ function (angular, _) {
       }
     };
 
+    /**
+     * 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();
+      }
+    };
+
     /**
      * Call when host group selected
      */
@@ -116,6 +138,17 @@ function (angular, _) {
     // SUGGESTION QUERIES
     //////////////////////////////
 
+
+    /**
+     * Update list of IT services
+     */
+    $scope.updateITServiceList = function() {
+      $scope.datasource.zabbixAPI.getITService().then(function (iteservices) {
+        $scope.itserviceList = [];
+        $scope.itserviceList = $scope.itserviceList.concat(iteservices);
+      });
+    };
+
     /**
      * Update list of host groups
      */

From 53d6b60e6fab54f5bcfca5ba41fd8099ec2f2cfc Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 25 Jul 2015 17:17:22 +0300
Subject: [PATCH 06/19] iss #19 - Reinitialize query editor when mode switched
 to IT services.

---
 zabbix/partials/query.editor.html | 4 ++--
 zabbix/queryCtrl.js               | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index e7f2916..86dbcc2 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -19,11 +19,11 @@
               <!-- Switch to IT Services editor -->
               <li role="menuitem" ng-hide="target.ITService">
                 <a class="pointer" tabindex="1"
-                   ng-click="target.ITService = true">IT Services</a>
+                   ng-click="switchEditorMode()">IT Services</a>
               </li>
               <li role="menuitem" ng-show="target.ITService">
                 <a class="pointer" tabindex="1"
-                   ng-click="target.ITService = false">Items</a>
+                   ng-click="switchEditorMode()">Items</a>
               </li>
               <li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
               <li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index-1)">Move up</a></li>
diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index bca12e5..4fc469e 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -42,6 +42,11 @@ function (angular, _) {
       $scope.target.errors = validateTarget($scope.target);
     };
 
+    $scope.switchEditorMode = function() {
+      $scope.target.ITService = !$scope.target.ITService;
+      $scope.init();
+    };
+
     /**
      * Take alias from item name by default
      */

From d2db53fcfb636a578883baee877a3f005dd697ee Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 25 Jul 2015 17:23:35 +0300
Subject: [PATCH 07/19] iss #19 - Friendly names for SLA properties.

---
 zabbix/partials/query.editor.html | 2 +-
 zabbix/queryCtrl.js               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index 86dbcc2..6ad59f3 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -68,7 +68,7 @@
           <select class="tight-form-input input-medium"
                   ng-change="selectSLAProperty()"
                   ng-model="target.slaProperty"
-                  ng-options="slaProperty for slaProperty in slaPropertyList track by slaProperty">
+                  ng-options="slaProperty.name for slaProperty in slaPropertyList track by slaProperty.name">
             <option value="">-- SLA property --</option>
           </select>
         </li>
diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index 4fc469e..69839b3 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -15,10 +15,10 @@ function (angular, _) {
       $scope.targetLetters = targetLetters;
       if ($scope.target.ITService) {
         $scope.slaPropertyList = [
-          "sla",
-          "okTime",
-          "problemTime",
-          "downtimeTime"
+          {name: "SLA", property: "sla"},
+          {name: "OK time", property: "okTime"},
+          {name: "Problem time", property: "problemTime"},
+          {name: "Down time", property: "downtimeTime"}
         ];
         $scope.itserviceList = [{name: "test"}];
         $scope.updateITServiceList();

From 218f8b8f352a886cb95a9040cb0eebfaf0de9c30 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 25 Jul 2015 18:17:38 +0300
Subject: [PATCH 08/19] iss #19 - Get IT service data and handle response.

---
 zabbix/datasource.js      | 150 ++++++++++++++++++++------------------
 zabbix/helperFunctions.js |  18 +++++
 2 files changed, 98 insertions(+), 70 deletions(-)

diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index 8099ad7..ec0798a 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -94,93 +94,103 @@ function (angular, _, kbn) {
       // Create request for each target
       var promises = _.map(options.targets, function(target) {
 
-        // Don't show undefined and hidden targets
-        if (target.hide || !target.group || !target.host
-                        || !target.application || !target.item) {
-          return [];
-        }
+        if (!target.ITService) {
+          // Don't show undefined and hidden targets
+          if (target.hide || !target.group || !target.host
+            || !target.application || !target.item) {
+            return [];
+          }
 
-        // Replace templated variables
-        var groupname = templateSrv.replace(target.group.name);
-        var hostname  = templateSrv.replace(target.host.name);
-        var appname   = templateSrv.replace(target.application.name);
-        var itemname  = templateSrv.replace(target.item.name);
+          // Replace templated variables
+          var groupname = templateSrv.replace(target.group.name);
+          var hostname = templateSrv.replace(target.host.name);
+          var appname = templateSrv.replace(target.application.name);
+          var itemname = templateSrv.replace(target.item.name);
 
-        // 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);
+          // 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, ''));
+          // 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, ''));
 
-        // Find items by item names and perform queries
-        var self = this;
-        return this.zabbixAPI.itemFindQuery(groups, hosts, apps)
-          .then(function (items) {
+          // Find items by item names and perform queries
+          var self = this;
+          return this.zabbixAPI.itemFindQuery(groups, hosts, apps)
+            .then(function (items) {
 
-            // Filter hosts by regex
-            if (target.host.visible_name === 'All') {
-              if (target.hostFilter && _.every(items, _.identity.hosts)) {
+              // Filter hosts by regex
+              if (target.host.visible_name === 'All') {
+                if (target.hostFilter && _.every(items, _.identity.hosts)) {
 
-                // Use templated variables in filter
-                var host_pattern = new RegExp(templateSrv.replace(target.hostFilter));
-                items = _.filter(items, function (item) {
-                  return _.some(item.hosts, function (host) {
-                    return host_pattern.test(host.name);
+                  // Use templated variables in filter
+                  var host_pattern = new RegExp(templateSrv.replace(target.hostFilter));
+                  items = _.filter(items, function (item) {
+                    return _.some(item.hosts, function (host) {
+                      return host_pattern.test(host.name);
+                    });
                   });
-                });
+                }
               }
-            }
 
-            if (itemnames[0] === 'All') {
+              if (itemnames[0] === 'All') {
 
-              // Filter items by regex
-              if (target.itemFilter) {
+                // Filter items by regex
+                if (target.itemFilter) {
 
-                // Use templated variables in filter
-                var item_pattern = new RegExp(templateSrv.replace(target.itemFilter));
+                  // Use templated variables in filter
+                  var item_pattern = new RegExp(templateSrv.replace(target.itemFilter));
+                  return _.filter(items, function (item) {
+                    return item_pattern.test(zabbixHelperSrv.expandItemName(item));
+                  });
+                } else {
+                  return items;
+                }
+              } else {
+
+                // Filtering items
                 return _.filter(items, function (item) {
-                  return item_pattern.test(zabbixHelperSrv.expandItemName(item));
+                  return _.contains(itemnames, zabbixHelperSrv.expandItemName(item));
                 });
-              } else {
-                return items;
               }
-            } else {
+            }).then(function (items) {
 
-              // Filtering items
-              return _.filter(items, function (item) {
-                return _.contains(itemnames, zabbixHelperSrv.expandItemName(item));
-              });
-            }
-          }).then(function (items) {
-
-            // Don't perform query for high number of items
-            // to prevent Grafana slowdown
-            if (items.length > self.limitmetrics) {
-              var message = "Try to increase limitmetrics parameter in datasource config.<br>"
-                + "Current limitmetrics value is " + self.limitmetrics;
-              alertSrv.set("Metrics limit exceeded", message, "warning", 10000);
-              return [];
-            } else {
-              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);
-
-              if ((from < useTrendsFrom) && self.trends) {
-                return self.zabbixAPI.getTrends(items, from, to)
-                  .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale));
+              // Don't perform query for high number of items
+              // to prevent Grafana slowdown
+              if (items.length > self.limitmetrics) {
+                var message = "Try to increase limitmetrics parameter in datasource config.<br>"
+                  + "Current limitmetrics value is " + self.limitmetrics;
+                alertSrv.set("Metrics limit exceeded", message, "warning", 10000);
+                return [];
               } else {
-                return self.zabbixAPI.getHistory(items, from, to)
-                  .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
+                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);
+
+                if ((from < useTrendsFrom) && self.trends) {
+                  return self.zabbixAPI.getTrends(items, from, to)
+                    .then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale));
+                } else {
+                  return self.zabbixAPI.getHistory(items, from, to)
+                    .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
+                }
               }
-            }
-          });
+            });
+        } else {
+          // Don't show undefined and hidden targets
+          if (target.hide || !target.itservice || !target.slaProperty) {
+            return [];
+          } else {
+            return this.zabbixAPI.getSLA(target.itservice.serviceid, from, to)
+              .then(_.bind(zabbixHelperSrv.handleSLAResponse, zabbixHelperSrv, target.itservice, target.slaProperty));
+          }
+        }
       }, this);
 
       return $q.all(_.flatten(promises)).then(function (results) {
diff --git a/zabbix/helperFunctions.js b/zabbix/helperFunctions.js
index 881c69b..a07a1e2 100644
--- a/zabbix/helperFunctions.js
+++ b/zabbix/helperFunctions.js
@@ -109,6 +109,24 @@ function (angular, _) {
       });
     };
 
+    /**
+     * Convert Zabbix API service.getsla response to Grafana format
+     *
+     * @param itservice
+     * @param slaProperty
+     * @param slaObject
+     * @returns {{target: *, datapoints: *[]}}
+     */
+    this.handleSLAResponse = function (itservice, slaProperty, slaObject) {
+      var targetSLA = slaObject[itservice.serviceid].sla[0];
+      return {
+        target: itservice.name,
+        datapoints: [
+          [targetSLA[slaProperty.property], targetSLA.to * 1000]
+        ]
+      };
+    };
+
     /**
      * Expand item parameters, for example:
      * CPU $2 time ($3) --> CPU system time (avg1)

From f53ebaa9fcda03ace63b1c50a3294097c02937fb Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 25 Jul 2015 18:42:52 +0300
Subject: [PATCH 09/19] iss #19 - Fix item list updating when application
 selected.

---
 zabbix/partials/query.editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index 6ad59f3..ceda668 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -147,7 +147,7 @@
         <li class="tight-form-item input-small" style="width: 5em">Application</li>
         <li>
           <select class="tight-form-input input-large"
-                  ng-select="selectApplication()"
+                  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">

From 9855c05f64347e18f61c46873708ecc99bf2219e Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 25 Jul 2015 18:48:08 +0300
Subject: [PATCH 10/19] Refactoring - reformat code.

---
 zabbix/queryCtrl.js | 447 ++++++++++++++++++++++----------------------
 1 file changed, 223 insertions(+), 224 deletions(-)

diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index 69839b3..0ed50b2 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -1,250 +1,249 @@
 define([
-  'angular',
-  'lodash',
-  './helperFunctions'
-],
-function (angular, _) {
-  'use strict';
+    'angular',
+    'lodash',
+    './helperFunctions'
+  ],
+  function (angular, _) {
+    'use strict';
 
-  var module = angular.module('grafana.controllers');
-  var targetLetters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    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) {
 
-    $scope.init = function() {
-      $scope.targetLetters = targetLetters;
-      if ($scope.target.ITService) {
-        $scope.slaPropertyList = [
-          {name: "SLA", property: "sla"},
-          {name: "OK time", property: "okTime"},
-          {name: "Problem time", property: "problemTime"},
-          {name: "Down time", property: "downtimeTime"}
-        ];
-        $scope.itserviceList = [{name: "test"}];
-        $scope.updateITServiceList();
-      } else {
-        $scope.metric = {
-          hostGroupList: [],
-          hostList: [{name: '*', visible_name: 'All'}],
-          applicationList: [{name: '*', visible_name: 'All'}],
-          itemList: [{name: 'All'}]
-        };
+      $scope.init = function () {
+        $scope.targetLetters = targetLetters;
+        if ($scope.target.ITService) {
+          $scope.slaPropertyList = [
+            {name: "SLA", property: "sla"},
+            {name: "OK time", property: "okTime"},
+            {name: "Problem time", property: "problemTime"},
+            {name: "Down time", property: "downtimeTime"}
+          ];
+          $scope.itserviceList = [{name: "test"}];
+          $scope.updateITServiceList();
+        } else {
+          $scope.metric = {
+            hostGroupList: [],
+            hostList: [{name: '*', visible_name: 'All'}],
+            applicationList: [{name: '*', visible_name: 'All'}],
+            itemList: [{name: 'All'}]
+          };
 
-        // Update host group, host, application and item lists
-        $scope.updateGroupList();
+          // Update host group, host, application and item lists
+          $scope.updateGroupList();
+          $scope.updateHostList();
+          $scope.updateAppList();
+          $scope.updateItemList();
+
+          setItemAlias();
+        }
+
+        $scope.target.errors = validateTarget($scope.target);
+      };
+
+      $scope.switchEditorMode = function () {
+        $scope.target.ITService = !$scope.target.ITService;
+        $scope.init();
+      };
+
+      /**
+       * Take alias from item name by default
+       */
+      function setItemAlias() {
+        if (!$scope.target.alias && $scope.target.item) {
+          $scope.target.alias = $scope.target.item.name;
+        }
+      }
+
+      $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();
+        }
+      };
+
+      /**
+       * 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();
+        }
+      };
+
+      /**
+       * 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.target.errors = validateTarget($scope.target);
-    };
+      $scope.duplicate = function () {
+        var clone = angular.copy($scope.target);
+        $scope.panel.targets.push(clone);
+      };
 
-    $scope.switchEditorMode = function() {
-      $scope.target.ITService = !$scope.target.ITService;
-      $scope.init();
-    };
+      $scope.moveMetricQuery = function (fromIndex, toIndex) {
+        _.move($scope.panel.targets, fromIndex, toIndex);
+      };
 
-    /**
-     * Take alias from item name by default
-     */
-    function setItemAlias() {
-      if (!$scope.target.alias && $scope.target.item) {
-        $scope.target.alias = $scope.target.item.name;
-      }
-    }
+      //////////////////////////////
+      // SUGGESTION QUERIES
+      //////////////////////////////
 
-    $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();
-      }
-    };
-
-    /**
-     * 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();
-      }
-    };
-
-    /**
-     * 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);
-    };
-
-    $scope.moveMetricQuery = function(fromIndex, toIndex) {
-      _.move($scope.panel.targets, fromIndex, toIndex);
-    };
-
-    //////////////////////////////
-    // SUGGESTION QUERIES
-    //////////////////////////////
-
-
-    /**
-     * Update list of IT services
-     */
-    $scope.updateITServiceList = function() {
-      $scope.datasource.zabbixAPI.getITService().then(function (iteservices) {
-        $scope.itserviceList = [];
-        $scope.itserviceList = $scope.itserviceList.concat(iteservices);
-      });
-    };
-
-    /**
-     * 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 IT services
+       */
+      $scope.updateITServiceList = function () {
+        $scope.datasource.zabbixAPI.getITService().then(function (iteservices) {
+          $scope.itserviceList = [];
+          $scope.itserviceList = $scope.itserviceList.concat(iteservices);
         });
-      }
-    };
+      };
 
-    /**
-     * 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};
+      /**
+       * 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);
           });
-          $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;
-      if (groups && hosts && apps) {
-        $scope.datasource.zabbixAPI.itemFindQuery(groups, hosts, apps).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)};
+      /**
+       * 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;
+        if (groups && hosts && apps) {
+          $scope.datasource.zabbixAPI.itemFindQuery(groups, hosts, apps).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
+       *
+       * @param {Array} metricList List of metrics which variables add to
+       */
+      function addTemplatedVariables(metricList) {
+        _.each(templateSrv.variables, function (variable) {
+          metricList.push({
+            name: '$' + variable.name,
+            templated: true
           });
-          $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
-     *
-     * @param {Array} metricList List of metrics which variables add to
-     */
-    function addTemplatedVariables(metricList) {
-      _.each(templateSrv.variables, function(variable) {
-        metricList.push({
-          name: '$' + variable.name,
-          templated: true
-        });
-      });
-    }
+      //////////////////////////////
+      // VALIDATION
+      //////////////////////////////
 
-    //////////////////////////////
-    // VALIDATION
-    //////////////////////////////
-
-    function validateTarget(target) {
-      var errs = {};
-      if (!target) {
-        errs = 'Not defined';
+      function validateTarget(target) {
+        var errs = {};
+        if (!target) {
+          errs = 'Not defined';
+        }
+        return errs;
       }
-      return errs;
-    }
+
+    });
 
   });
-
-});

From 23e6e6d67e73ecd88c8886685b810b001d2cfe62 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 25 Jul 2015 18:51:46 +0300
Subject: [PATCH 11/19] Refactoring - fixed linter errors.

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

diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index 0ed50b2..f2b181d 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -202,7 +202,8 @@ define([
       $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 apps = $scope.target.application ?
+                     zabbixHelperSrv.splitMetrics(templateSrv.replace($scope.target.application.name)) : undefined;
         if (groups && hosts && apps) {
           $scope.datasource.zabbixAPI.itemFindQuery(groups, hosts, apps).then(function (items) {
             // Show only unique item names

From 83200bc63ffd27eebf6f17a8c290c3f007ce19e4 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 26 Jul 2015 09:51:05 +0300
Subject: [PATCH 12/19] iss #19 - Return two points with from and to time and
 same value for graph displaying.

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

diff --git a/zabbix/helperFunctions.js b/zabbix/helperFunctions.js
index a07a1e2..a3711f1 100644
--- a/zabbix/helperFunctions.js
+++ b/zabbix/helperFunctions.js
@@ -120,8 +120,9 @@ function (angular, _) {
     this.handleSLAResponse = function (itservice, slaProperty, slaObject) {
       var targetSLA = slaObject[itservice.serviceid].sla[0];
       return {
-        target: itservice.name,
+        target: itservice.name + ' ' + slaProperty.name,
         datapoints: [
+          [targetSLA[slaProperty.property], targetSLA.from * 1000],
           [targetSLA[slaProperty.property], targetSLA.to * 1000]
         ]
       };

From 5e02025eaf32f2c0326e04129c8e2119bcc6eeda Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 27 Jul 2015 17:07:51 +0300
Subject: [PATCH 13/19] iss #19 - Added status request for IT service.

---
 zabbix/helperFunctions.js | 24 +++++++++++++++++-------
 zabbix/queryCtrl.js       |  1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/zabbix/helperFunctions.js b/zabbix/helperFunctions.js
index a3711f1..4f076b3 100644
--- a/zabbix/helperFunctions.js
+++ b/zabbix/helperFunctions.js
@@ -119,13 +119,23 @@ function (angular, _) {
      */
     this.handleSLAResponse = function (itservice, slaProperty, slaObject) {
       var targetSLA = slaObject[itservice.serviceid].sla[0];
-      return {
-        target: itservice.name + ' ' + slaProperty.name,
-        datapoints: [
-          [targetSLA[slaProperty.property], targetSLA.from * 1000],
-          [targetSLA[slaProperty.property], targetSLA.to * 1000]
-        ]
-      };
+      if (slaProperty.property === 'status') {
+        var targetStatus = slaObject[itservice.serviceid].status;
+        return {
+          target: itservice.name + ' ' + slaProperty.name,
+          datapoints: [
+            [targetStatus, targetSLA.to * 1000]
+          ]
+        };
+      } else {
+        return {
+          target: itservice.name + ' ' + slaProperty.name,
+          datapoints: [
+            [targetSLA[slaProperty.property], targetSLA.from * 1000],
+            [targetSLA[slaProperty.property], targetSLA.to * 1000]
+          ]
+        };
+      }
     };
 
     /**
diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index f2b181d..88a3375 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -15,6 +15,7 @@ define([
         $scope.targetLetters = targetLetters;
         if ($scope.target.ITService) {
           $scope.slaPropertyList = [
+            {name: "Status", property: "status"},
             {name: "SLA", property: "sla"},
             {name: "OK time", property: "okTime"},
             {name: "Problem time", property: "problemTime"},

From fd67ed6194fa3de241f413368f9061e95155cbd6 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 27 Jul 2015 17:30:54 +0300
Subject: [PATCH 14/19] iss #19 - Added divider for editor mode in menu.

---
 zabbix/partials/query.editor.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index ceda668..30a53d6 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -25,6 +25,7 @@
                 <a class="pointer" tabindex="1"
                    ng-click="switchEditorMode()">Items</a>
               </li>
+              <li class="divider" role="menuitem"></li>
               <li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
               <li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index-1)">Move up</a></li>
               <li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index+1)">Move down</a></li>

From 72478c0bc66044602307dea7becf2607331ef016 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 27 Jul 2015 17:49:30 +0300
Subject: [PATCH 15/19] iss #19 - Rewrite query editor switching for more
 scalability.

---
 zabbix/partials/query.editor.html | 14 +++++++-------
 zabbix/queryCtrl.js               | 12 +++++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index 30a53d6..c7bf228 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -17,13 +17,13 @@
             </a>
             <ul class="dropdown-menu pull-right" role="menu">
               <!-- Switch to IT Services editor -->
-              <li role="menuitem" ng-hide="target.ITService">
+              <li role="menuitem" ng-hide="target.mode == 1">
                 <a class="pointer" tabindex="1"
-                   ng-click="switchEditorMode()">IT Services</a>
+                   ng-click="switchEditorMode(1)">IT services</a>
               </li>
-              <li role="menuitem" ng-show="target.ITService">
+              <li role="menuitem" ng-show="target.mode">
                 <a class="pointer" tabindex="1"
-                   ng-click="switchEditorMode()">Items</a>
+                   ng-click="switchEditorMode(0)">Items</a>
               </li>
               <li class="divider" role="menuitem"></li>
               <li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
@@ -53,7 +53,7 @@
       </ul>
 
       <!-- IT Service editor -->
-      <ul class="tight-form-list" role="menu" ng-show="target.ITService">
+      <ul class="tight-form-list" role="menu" ng-show="target.mode == 1">
         <li class="tight-form-item input-small">IT Service</li>
         <li>
           <select class="tight-form-input input-large"
@@ -75,7 +75,7 @@
         </li>
       </ul>
 
-      <ul class="tight-form-list" role="menu" ng-hide="target.ITService">
+      <ul class="tight-form-list" role="menu" ng-hide="target.mode">
         <!-- Alias -->
         <li>
           <input type="text"
@@ -136,7 +136,7 @@
       <div class="clearfix"></div>
     </div>
 
-    <div class="tight-form" ng-hide="target.ITService">
+    <div class="tight-form" ng-hide="target.mode">
       <ul class="tight-form-list" role="menu">
         <li class="tight-form-item" style="min-width: 15px; text-align: center">&nbsp</li>
         <li class="tight-form-item">
diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index 88a3375..d565d1a 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -13,7 +13,7 @@ define([
 
       $scope.init = function () {
         $scope.targetLetters = targetLetters;
-        if ($scope.target.ITService) {
+        if ($scope.target.mode === 1) {
           $scope.slaPropertyList = [
             {name: "Status", property: "status"},
             {name: "SLA", property: "sla"},
@@ -43,8 +43,14 @@ define([
         $scope.target.errors = validateTarget($scope.target);
       };
 
-      $scope.switchEditorMode = function () {
-        $scope.target.ITService = !$scope.target.ITService;
+      /**
+       * Switch query editor to specified mode.
+       * Modes:
+       *  0 - items
+       *  1 - IT services
+       */
+      $scope.switchEditorMode = function (mode) {
+        $scope.target.mode = mode;
         $scope.init();
       };
 

From 126e50a171c60616783d61d201f5168d029958ba Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 27 Jul 2015 18:20:28 +0300
Subject: [PATCH 16/19] iss #19 - Add help info for IT service properties.

---
 zabbix/partials/query.editor.html | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index c7bf228..98703dc 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -64,13 +64,13 @@
             <option value="">-- Select IT service --</option>
           </select>
         </li>
-        <li class="tight-form-item input-small">SLA property</li>
+        <li class="tight-form-item input-medium">IT service property</li>
         <li>
           <select class="tight-form-input input-medium"
                   ng-change="selectSLAProperty()"
                   ng-model="target.slaProperty"
                   ng-options="slaProperty.name for slaProperty in slaPropertyList track by slaProperty.name">
-            <option value="">-- SLA property --</option>
+            <option value="">-- Property --</option>
           </select>
         </li>
       </ul>
@@ -244,6 +244,11 @@
           max data points
         </a>
       </li>
+      <li class="tight-form-item">
+        <a ng-click="toggleEditorHelp(2)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+          IT service property
+        </a>
+      </li>
     </ul>
     <div class="clearfix"></div>
   </div>
@@ -264,6 +269,16 @@
         <li>If you override maxDataPoint and set a high value performance can be severely effected</li>
       </ul>
     </div>
-
+    <div class="grafana-info-box span6" ng-if="editorHelpIndex === 2">
+      <h5>IT service property</h5>
+      <ul>
+        <li>Zabbix returns the following availability information about IT service</li>
+        <li>Status - current status of the IT service</li>
+        <li>SLA - SLA for the given time interval</li>
+        <li>OK time - time the service was in OK state, in seconds</li>
+        <li>Problem time - time the service was in problem state, in seconds</li>
+        <li>Down time - time the service was in scheduled downtime, in seconds</li>
+      </ul>
+    </div>
   </div>
 </div>
\ No newline at end of file

From b61e715d6a877b92e3ed5554d0a58b447acbb731 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 27 Jul 2015 18:23:12 +0300
Subject: [PATCH 17/19] iss #19 - Fix panel update when IT service property
 changed.

---
 zabbix/partials/query.editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index 98703dc..f48e196 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -67,7 +67,7 @@
         <li class="tight-form-item input-medium">IT service property</li>
         <li>
           <select class="tight-form-input input-medium"
-                  ng-change="selectSLAProperty()"
+                  ng-change="selectITService()"
                   ng-model="target.slaProperty"
                   ng-options="slaProperty.name for slaProperty in slaPropertyList track by slaProperty.name">
             <option value="">-- Property --</option>

From 5b5f200a5141311fcc3b1d589ab484630afdfc40 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 27 Jul 2015 18:47:43 +0300
Subject: [PATCH 18/19] Max data points to uppercase.

---
 zabbix/partials/query.editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index f48e196..0a3a176 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -241,7 +241,7 @@
       </li>
       <li class="tight-form-item">
         <a ng-click="toggleEditorHelp(1)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
-          max data points
+          Max data points
         </a>
       </li>
       <li class="tight-form-item">

From 4ea5c2ac0c48c2ae7ad0753e0fa927ac5da18d45 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 27 Jul 2015 18:53:20 +0300
Subject: [PATCH 19/19] iss #19 - Add help info for IT services mode selection.

---
 zabbix/partials/query.editor.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index 0a3a176..1ac3ccc 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -246,6 +246,11 @@
       </li>
       <li class="tight-form-item">
         <a ng-click="toggleEditorHelp(2)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+          IT services
+        </a>
+      </li>
+      <li class="tight-form-item">
+        <a ng-click="toggleEditorHelp(3)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
           IT service property
         </a>
       </li>
@@ -269,7 +274,15 @@
         <li>If you override maxDataPoint and set a high value performance can be severely effected</li>
       </ul>
     </div>
+
     <div class="grafana-info-box span6" ng-if="editorHelpIndex === 2">
+      <h5>IT services</h5>
+      <p>
+        Select "IT services" in targets menu to activate IT services mode.
+      </p>
+    </div>
+
+    <div class="grafana-info-box span6" ng-if="editorHelpIndex === 3">
       <h5>IT service property</h5>
       <ul>
         <li>Zabbix returns the following availability information about IT service</li>