support template variables in itemid query mode

dist/datasource-zabbix/datasource.js

@@ -71,6 +71,13 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
     return '(' + escapedValues.join('|') + ')';
   }
 
+  function zabbixItemIdsTemplateFormat(value) {
+    if (typeof value === 'string') {
+      return value;
+    }
+    return value.join(',');
+  }
+
   /**
    * If template variables are used in request, replace it using regex format
    * and wrap with '/' for proper multi-value work. Example:
@@ -496,6 +503,7 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
             var _this5 = this;
 
             var itemids = target.itemids;
+            itemids = this.templateSrv.replace(itemids, options.scopedVars, zabbixItemIdsTemplateFormat);
             itemids = _.map(itemids.split(','), function (itemid) {
               return itemid.trim();
             });

dist/test/datasource-zabbix/datasource.js

@@ -356,6 +356,7 @@ var ZabbixAPIDatasource = function () {
       var _this5 = this;
 
       var itemids = target.itemids;
+      itemids = this.templateSrv.replace(itemids, options.scopedVars, zabbixItemIdsTemplateFormat);
       itemids = _lodash2.default.map(itemids.split(','), function (itemid) {
         return itemid.trim();
       });
@@ -741,6 +742,13 @@ function zabbixTemplateFormat(value) {
   return '(' + escapedValues.join('|') + ')';
 }
 
+function zabbixItemIdsTemplateFormat(value) {
+  if (typeof value === 'string') {
+    return value;
+  }
+  return value.join(',');
+}
+
 /**
  * If template variables are used in request, replace it using regex format
  * and wrap with '/' for proper multi-value work. Example:

src/datasource-zabbix/datasource.js

@@ -279,6 +279,7 @@ class ZabbixAPIDatasource {
 
   queryItemIdData(target, timeRange, useTrends, options) {
     let itemids = target.itemids;
+    itemids = this.templateSrv.replace(itemids, options.scopedVars, zabbixItemIdsTemplateFormat);
     itemids = _.map(itemids.split(','), itemid => itemid.trim());
 
     if (!itemids) {
@@ -647,6 +648,13 @@ function zabbixTemplateFormat(value) {
   return '(' + escapedValues.join('|') + ')';
 }
 
+function zabbixItemIdsTemplateFormat(value) {
+  if (typeof value === 'string') {
+    return value;
+  }
+  return value.join(',');
+}
+
 /**
  * If template variables are used in request, replace it using regex format
  * and wrap with '/' for proper multi-value work. Example: