From 38b83eee292e0887622fe889947b2d53dc59c833 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 2 Feb 2016 17:15:56 +0300 Subject: [PATCH] Fixed templates. --- plugins/datasource-zabbix/datasource.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js index 6417b7e..18ee021 100644 --- a/plugins/datasource-zabbix/datasource.js +++ b/plugins/datasource-zabbix/datasource.js @@ -285,13 +285,12 @@ function (angular, _, dateMath, utils, metricFunctions) { var parts = []; _.each(query.split('.'), function (part) { part = templateSrv.replace(part); - if (part[0] === '{') { - // Convert multiple mettrics to array - // "{metric1,metcic2,...,metricN}" --> [metric1, metcic2,..., metricN] - parts.push(zabbixHelperSrv.splitMetrics(part)); - } else { - parts.push(part); + + // Replace wildcard to regex + if (part === '*') { + part = '/.*/'; } + parts.push(part); }); var template = _.object(['group', 'host', 'app', 'item'], parts);