Fix filtering items by tag set with variable, closes #1283

src/datasource-zabbix/zabbix/zabbix.ts

@@ -292,14 +292,7 @@ export class Zabbix implements ZabbixConnector {
     if (this.isZabbix54OrHigher()) {
       items = await this.zabbixAPI.getItems(apps.hostids, undefined, options.itemtype);
       if (itemTagFilter) {
-        items = items.filter(item => {
+        items = filterItemsByTag(items, itemTagFilter);
-          if (item.tags) {
-            const tags: ZBXItemTag[] = item.tags.map(t => utils.itemTagToString(t));
-            return tags.includes(itemTagFilter);
-          } else {
-            return false;
-          }
-        });
       }
     } else {
       if (apps.appFilterEmpty) {
@@ -578,3 +571,28 @@ function getHostIds(items) {
   });
   return _.uniq(_.flatten(hostIds));
 }
+
+function filterItemsByTag(items: any[], itemTagFilter: string) {
+  if (utils.isRegex(itemTagFilter)) {
+    const filterPattern = utils.buildRegex(itemTagFilter);
+    return items.filter((item) => {
+      if (item.tags) {
+        const tags: string[] = item.tags.map(t => utils.itemTagToString(t));
+        return tags.some((tag) => {
+          return filterPattern.test(tag);
+        });
+      } else {
+        return false;
+      }
+    });
+  } else {
+    return items.filter(item => {
+      if (item.tags) {
+        const tags: string[] = item.tags.map(t => utils.itemTagToString(t));
+        return tags.includes(itemTagFilter);
+      } else {
+        return false;
+      }
+    });
+  }
+}