From 4ddfc4becf4f0435492b00bc16d44db11a695396 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 12 Apr 2016 13:30:14 +0300
Subject: [PATCH] replaceTemplateVars() refactor.

---
 src/datasource-zabbix/datasource.js       | 16 ++++++++--------
 src/datasource-zabbix/query.controller.js |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index 07f8609..37beaa1 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -125,10 +125,10 @@ export class ZabbixAPIDatasource {
         }
 
         // Replace templated variables
-        var groupFilter = this.replaceTemplateVars(target.group.filter, options.scopedVars, self.multiValueFormat);
-        var hostFilter = this.replaceTemplateVars(target.host.filter, options.scopedVars, self.multiValueFormat);
-        var appFilter = this.replaceTemplateVars(target.application.filter, options.scopedVars, self.multiValueFormat);
-        var itemFilter = this.replaceTemplateVars(target.item.filter, options.scopedVars, self.multiValueFormat);
+        var groupFilter = this.replaceTemplateVars(target.group.filter, options.scopedVars);
+        var hostFilter = this.replaceTemplateVars(target.host.filter, options.scopedVars);
+        var appFilter = this.replaceTemplateVars(target.application.filter, options.scopedVars);
+        var itemFilter = this.replaceTemplateVars(target.item.filter, options.scopedVars);
 
         // Query numeric data
         if (!target.mode || target.mode === 0) {
@@ -288,7 +288,7 @@ export class ZabbixAPIDatasource {
     var self = this;
     var parts = [];
     _.each(query.split('.'), function (part) {
-      part = self.replaceTemplateVars(part, {}, self.multiValueFormat);
+      part = self.replaceTemplateVars(part, {});
 
       // Replace wildcard to regex
       if (part === '*') {
@@ -349,9 +349,9 @@ export class ZabbixAPIDatasource {
     // Show all triggers
     var showTriggers = [0, 1];
 
-    var buildQuery = self.queryProcessor.buildTriggerQuery(this.replaceTemplateVars(annotation.group, {}, self.multiValueFormat),
-                                                           this.replaceTemplateVars(annotation.host, {}, self.multiValueFormat),
-                                                           this.replaceTemplateVars(annotation.application, {}, self.multiValueFormat));
+    var buildQuery = self.queryProcessor.buildTriggerQuery(this.replaceTemplateVars(annotation.group, {}),
+                                                           this.replaceTemplateVars(annotation.host, {}),
+                                                           this.replaceTemplateVars(annotation.application, {}));
     return buildQuery.then(function(query) {
       return self.zabbixAPI.getTriggers(query.groupids,
                                         query.hostids,
diff --git a/src/datasource-zabbix/query.controller.js b/src/datasource-zabbix/query.controller.js
index 025530b..88453f2 100644
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -116,7 +116,6 @@ export class ZabbixQueryController extends QueryCtrl {
   suggestHosts() {
     var self = this;
     var groupFilter = this.replaceTemplateVars(this.target.group.filter);
-    console.log(groupFilter);
     return this.datasource.queryProcessor
       .filterGroups(self.metric.groupList, groupFilter)
       .then(groups => {