From dace394060d42a5103cfe8370a1ce57597503469 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 27 May 2015 17:00:25 +0300
Subject: [PATCH] Refactoring of query() method.

---
 zabbix/datasource.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index 69fdf3c..bc541c5 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -51,18 +51,13 @@ function (angular, _, kbn) {
           var pattern = /([\w.]+(?:\[[^\[]*\])|[\w.]+)/g;
           var keys = item_key.match(pattern);
 
-          var self = this;
-
           return _.map(keys, function (key) {
+            var self = this;
             return this.findZabbixItem(hostname, key).then(function (items) {
-              if (items.length) {
-                var item = items[0];
-                var itemname = expandItemName(item);
+              return $q.all(_.map(items, function (item) {
                 return self.performTimeSeriesQuery(item, from, to).then(_.partial(
-                  self.handleZabbixAPIResponse, itemname));
-              } else {
-                return [];
-              }
+                  self.handleZabbixAPIResponse, expandItemName(item)));
+              }, this));
             });
           }, this);
         }