From d716c266ba7dcd92c4f78c8ed618b96ff42a80f6 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 11 Jul 2015 17:53:00 +0300
Subject: [PATCH] iss #36 - Some refactoring.

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

diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index b57fefb..f001733 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -92,8 +92,7 @@ function (angular, _, kbn) {
               if (target.hostFilter && _.every(items, _.identity.hosts)) {
 
                 // Use templated variables in filter
-                var pattern = templateSrv.replace(target.hostFilter);
-                var host_pattern = new RegExp(pattern);
+                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);
@@ -108,8 +107,7 @@ function (angular, _, kbn) {
               if (target.itemFilter) {
 
                 // Use templated variables in filter
-                var pattern = templateSrv.replace(target.itemFilter);
-                var item_pattern = new RegExp(pattern);
+                var item_pattern = new RegExp(templateSrv.replace(target.itemFilter));
                 return _.filter(items, function (item) {
                   return item_pattern.test(zabbixHelperSrv.expandItemName(item));
                 });