Fixed templates.

2016-02-02 17:15:56 +03:00
parent fa10d76e2b
commit 38b83eee29
1 changed files with 5 additions and 6 deletions
--- 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);