Allow to use names with dot in template queries, fixes #254

src/datasource-zabbix/datasource.js

@@ -302,7 +302,7 @@ class ZabbixAPIDatasource {
     let parts = [];
 
     // Split query. Query structure: group.host.app.item
-    _.each(query.split('.'), part => {
+    _.each(utils.splitTemplateQuery(query), part => {
       part = this.replaceTemplateVars(part, {});
 
       // Replace wildcard to regex

src/datasource-zabbix/utils.js

@@ -52,10 +52,6 @@ function splitKeyParams(paramStr) {
   return params;
 }
 
-///////////
-// MACRO //
-///////////
-
 const MACRO_PATTERN = /{\$[A-Z0-9_\.]+}/g;
 
 export function containsMacro(itemName) {
@@ -91,6 +87,31 @@ function escapeMacro(macro) {
   return macro;
 }
 
+/**
+ * Split template query to parts of zabbix entities
+ * group.host.app.item -> [group, host, app, item]
+ * {group}{host.com} -> [group, host.com]
+ */
+export function splitTemplateQuery(query) {
+  let splitPattern = /{[^{}]*}/g;
+  let split;
+
+  if (isContainsBraces(query)) {
+    let result = query.match(splitPattern);
+    split = _.map(result, part => {
+      return _.trim(part, '{}');
+    });
+  } else {
+    split = query.split('.');
+  }
+
+  return split;
+}
+
+function isContainsBraces(query) {
+  return query.includes('{') && query.includes('}');
+}
+
 // Pattern for testing regex
 export const regexPattern = /^\/(.*)\/([gmi]*)$/m;