Filter triggers by tags, #487

dist/panel-triggers/migrations.js

@@ -1,9 +1,10 @@
-"use strict";
+'use strict';
 
-System.register([], function (_export, _context) {
+System.register(['lodash', './triggers_panel_ctrl'], function (_export, _context) {
   "use strict";
 
-  var CURRENT_SCHEMA_VERSION;
+  var _, DEFAULT_TARGET, CURRENT_SCHEMA_VERSION;
+
   function migratePanelSchema(panel) {
     if (isEmptyPanel(panel)) {
       return panel;
@@ -31,10 +32,18 @@ System.register([], function (_export, _context) {
       delete panel.hideHostsInMaintenance;
     }
 
+    if (schemaVersion < 4) {
+      if (panel.targets && !_.isEmpty(panel.targets)) {
+        _.each(panel.targets, function (target) {
+          _.defaultsDeep(target, DEFAULT_TARGET);
+        });
+      }
+    }
+
     return panel;
   }
 
-  _export("migratePanelSchema", migratePanelSchema);
+  _export('migratePanelSchema', migratePanelSchema);
 
   function getSchemaVersion(panel) {
     return panel.schemaVersion || 1;
@@ -44,9 +53,15 @@ System.register([], function (_export, _context) {
     return !panel.datasource && !panel.datasources && !panel.triggers && !panel.targets;
   }
   return {
-    setters: [],
+    setters: [function (_lodash) {
+      _ = _lodash.default;
+    }, function (_triggers_panel_ctrl) {
+      DEFAULT_TARGET = _triggers_panel_ctrl.DEFAULT_TARGET;
+    }],
     execute: function () {
-      CURRENT_SCHEMA_VERSION = 3;
+      _export('CURRENT_SCHEMA_VERSION', CURRENT_SCHEMA_VERSION = 4);
+
+      _export('CURRENT_SCHEMA_VERSION', CURRENT_SCHEMA_VERSION);
     }
   };
 });

dist/panel-triggers/migrations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/panel-triggers/migrations.js"],"names":["migratePanelSchema","panel","isEmptyPanel","schemaVersion","getSchemaVersion","CURRENT_SCHEMA_VERSION","datasources","datasource","targets","triggers","lastChangeField","ageField","infoField","scroll","hideHostsInMaintenance"],"mappings":";;;;;;AAGO,WAASA,kBAAT,CAA4BC,KAA5B,EAAmC;AACxC,QAAIC,aAAaD,KAAb,CAAJ,EAAyB;AACvB,aAAOA,KAAP;AACD;;AAED,QAAME,gBAAgBC,iBAAiBH,KAAjB,CAAtB;AACAA,UAAME,aAAN,GAAsBE,sBAAtB;;AAEA,QAAIF,gBAAgB,CAApB,EAAuB;AACrBF,YAAMK,WAAN,GAAoB,CAACL,MAAMM,UAAP,CAApB;AACAN,YAAMO,OAAN,GAAgB,EAAhB;AACAP,YAAMO,OAAN,CAAcP,MAAMK,WAAN,CAAkB,CAAlB,CAAd,IAAsCL,MAAMQ,QAA5C;;AAEA;AACA,aAAOR,MAAMQ,QAAb;AACA,aAAOR,MAAMM,UAAb;AACD;;AAED,QAAIJ,gBAAgB,CAApB,EAAuB;AACrB;AACA,aAAOF,MAAMS,eAAb;AACA,aAAOT,MAAMU,QAAb;AACA,aAAOV,MAAMW,SAAb;AACA,aAAOX,MAAMY,MAAb;AACA,aAAOZ,MAAMa,sBAAb;AACD;;AAED,WAAOb,KAAP;AACD;;gCA5BeD,kB;;AA8BhB,WAASI,gBAAT,CAA0BH,KAA1B,EAAiC;AAC/B,WAAOA,MAAME,aAAN,IAAuB,CAA9B;AACD;;AAED,WAASD,YAAT,CAAsBD,KAAtB,EAA6B;AAC3B,WAAO,CAACA,MAAMM,UAAP,IAAqB,CAACN,MAAMK,WAA5B,IAA2C,CAACL,MAAMQ,QAAlD,IAA8D,CAACR,MAAMO,OAA5E;AACD;;;;AAtCKH,4B,GAAyB,C","file":"migrations.js","sourcesContent":["// Actual schema version\nconst CURRENT_SCHEMA_VERSION = 3;\n\nexport function migratePanelSchema(panel) {\n  if (isEmptyPanel(panel)) {\n    return panel;\n  }\n\n  const schemaVersion = getSchemaVersion(panel);\n  panel.schemaVersion = CURRENT_SCHEMA_VERSION;\n\n  if (schemaVersion < 2) {\n    panel.datasources = [panel.datasource];\n    panel.targets = {};\n    panel.targets[panel.datasources[0]] = panel.triggers;\n\n    // delete old props\n    delete panel.triggers;\n    delete panel.datasource;\n  }\n\n  if (schemaVersion < 3) {\n    // delete old props\n    delete panel.lastChangeField;\n    delete panel.ageField;\n    delete panel.infoField;\n    delete panel.scroll;\n    delete panel.hideHostsInMaintenance;\n  }\n\n  return panel;\n}\n\nfunction getSchemaVersion(panel) {\n  return panel.schemaVersion || 1;\n}\n\nfunction isEmptyPanel(panel) {\n  return !panel.datasource && !panel.datasources && !panel.triggers && !panel.targets;\n}\n"]}
+{"version":3,"sources":["../../src/panel-triggers/migrations.js"],"names":["migratePanelSchema","panel","isEmptyPanel","schemaVersion","getSchemaVersion","CURRENT_SCHEMA_VERSION","datasources","datasource","targets","triggers","lastChangeField","ageField","infoField","scroll","hideHostsInMaintenance","_","isEmpty","each","target","defaultsDeep","DEFAULT_TARGET"],"mappings":";;;;;;;AAMO,WAASA,kBAAT,CAA4BC,KAA5B,EAAmC;AACxC,QAAIC,aAAaD,KAAb,CAAJ,EAAyB;AACvB,aAAOA,KAAP;AACD;;AAED,QAAME,gBAAgBC,iBAAiBH,KAAjB,CAAtB;AACAA,UAAME,aAAN,GAAsBE,sBAAtB;;AAEA,QAAIF,gBAAgB,CAApB,EAAuB;AACrBF,YAAMK,WAAN,GAAoB,CAACL,MAAMM,UAAP,CAApB;AACAN,YAAMO,OAAN,GAAgB,EAAhB;AACAP,YAAMO,OAAN,CAAcP,MAAMK,WAAN,CAAkB,CAAlB,CAAd,IAAsCL,MAAMQ,QAA5C;;AAEA;AACA,aAAOR,MAAMQ,QAAb;AACA,aAAOR,MAAMM,UAAb;AACD;;AAED,QAAIJ,gBAAgB,CAApB,EAAuB;AACrB;AACA,aAAOF,MAAMS,eAAb;AACA,aAAOT,MAAMU,QAAb;AACA,aAAOV,MAAMW,SAAb;AACA,aAAOX,MAAMY,MAAb;AACA,aAAOZ,MAAMa,sBAAb;AACD;;AAED,QAAIX,gBAAgB,CAApB,EAAuB;AACrB,UAAIF,MAAMO,OAAN,IAAiB,CAACO,EAAEC,OAAF,CAAUf,MAAMO,OAAhB,CAAtB,EAAgD;AAC9CO,UAAEE,IAAF,CAAOhB,MAAMO,OAAb,EAAsB,UAACU,MAAD,EAAY;AAChCH,YAAEI,YAAF,CAAeD,MAAf,EAAuBE,cAAvB;AACD,SAFD;AAGD;AACF;;AAED,WAAOnB,KAAP;AACD;;gCApCeD,kB;;AAsChB,WAASI,gBAAT,CAA0BH,KAA1B,EAAiC;AAC/B,WAAOA,MAAME,aAAN,IAAuB,CAA9B;AACD;;AAED,WAASD,YAAT,CAAsBD,KAAtB,EAA6B;AAC3B,WAAO,CAACA,MAAMM,UAAP,IAAqB,CAACN,MAAMK,WAA5B,IAA2C,CAACL,MAAMQ,QAAlD,IAA8D,CAACR,MAAMO,OAA5E;AACD;;;AAlDMO,O;;AACCK,oB,wBAAAA,c;;;wCAGKf,sB,GAAyB,C","file":"migrations.js","sourcesContent":["import _ from 'lodash';\nimport {DEFAULT_TARGET} from './triggers_panel_ctrl';\n\n// Actual schema version\nexport const CURRENT_SCHEMA_VERSION = 4;\n\nexport function migratePanelSchema(panel) {\n  if (isEmptyPanel(panel)) {\n    return panel;\n  }\n\n  const schemaVersion = getSchemaVersion(panel);\n  panel.schemaVersion = CURRENT_SCHEMA_VERSION;\n\n  if (schemaVersion < 2) {\n    panel.datasources = [panel.datasource];\n    panel.targets = {};\n    panel.targets[panel.datasources[0]] = panel.triggers;\n\n    // delete old props\n    delete panel.triggers;\n    delete panel.datasource;\n  }\n\n  if (schemaVersion < 3) {\n    // delete old props\n    delete panel.lastChangeField;\n    delete panel.ageField;\n    delete panel.infoField;\n    delete panel.scroll;\n    delete panel.hideHostsInMaintenance;\n  }\n\n  if (schemaVersion < 4) {\n    if (panel.targets && !_.isEmpty(panel.targets)) {\n      _.each(panel.targets, (target) => {\n        _.defaultsDeep(target, DEFAULT_TARGET);\n      });\n    }\n  }\n\n  return panel;\n}\n\nfunction getSchemaVersion(panel) {\n  return panel.schemaVersion || 1;\n}\n\nfunction isEmptyPanel(panel) {\n  return !panel.datasource && !panel.datasources && !panel.triggers && !panel.targets;\n}\n"]}

dist/panel-triggers/partials/triggers_tab.html

@@ -78,6 +78,13 @@
           }"
           empty-to-null>
       </div>
+      <div class="gf-form">
+        <label class="gf-form-label query-keyword width-7">Tags</label>
+        <input type="text" class="gf-form-input"
+          ng-model="editor.panel.targets[ds].tags.filter"
+          ng-blur="editor.parseTarget()"
+          placeholder="tag1:value1, tag2:value2">
+      </div>
     </div>
   </div>
 </div>

dist/panel-triggers/specs/migrations.spec.js

@@ -44,7 +44,7 @@ describe('Triggers Panel schema migration', () => {
     let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, timeoutMock, datasourceSrvMock, {}, {}, {});
 
     let expected = {
-      schemaVersion: 3,
+      schemaVersion: 4,
       datasources: ['zabbix'],
       targets: {
         'zabbix': DEFAULT_TARGET
@@ -80,7 +80,7 @@ describe('Triggers Panel schema migration', () => {
     let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, {}, datasourceSrvMock, {}, {}, {});
 
     let expected = {
-      schemaVersion: 3,
+      schemaVersion: 4,
       datasources: ['zabbix_default'],
       targets: {
         'zabbix_default': DEFAULT_TARGET

dist/panel-triggers/triggers_panel_ctrl.js

@@ -3,7 +3,7 @@
 System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'app/plugins/sdk', './options_tab', './triggers_tab', './migrations'], function (_export, _context) {
   "use strict";
 
-  var _, $, moment, utils, PanelCtrl, triggerPanelOptionsTab, triggerPanelTriggersTab, migratePanelSchema, _createClass, _get, ZABBIX_DS_ID, DEFAULT_TARGET, DEFAULT_SEVERITY, DEFAULT_TIME_FORMAT, PANEL_DEFAULTS, triggerStatusMap, TriggerPanelCtrl;
+  var _, $, moment, utils, PanelCtrl, triggerPanelOptionsTab, triggerPanelTriggersTab, migratePanelSchema, CURRENT_SCHEMA_VERSION, _createClass, _get, ZABBIX_DS_ID, DEFAULT_TARGET, DEFAULT_SEVERITY, DEFAULT_TIME_FORMAT, PANEL_DEFAULTS, triggerStatusMap, TriggerPanelCtrl;
 
   function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -63,6 +63,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
       triggerPanelTriggersTab = _triggers_tab.triggerPanelTriggersTab;
     }, function (_migrations) {
       migratePanelSchema = _migrations.migratePanelSchema;
+      CURRENT_SCHEMA_VERSION = _migrations.CURRENT_SCHEMA_VERSION;
     }],
     execute: function () {
       _createClass = function () {
@@ -114,7 +115,8 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
         group: { filter: "" },
         host: { filter: "" },
         application: { filter: "" },
-        trigger: { filter: "" }
+        trigger: { filter: "" },
+        tags: { filter: "" }
       });
 
       _export('DEFAULT_TARGET', DEFAULT_TARGET);
@@ -126,7 +128,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
       DEFAULT_TIME_FORMAT = "DD MMM YYYY HH:mm:ss";
 
       _export('PANEL_DEFAULTS', PANEL_DEFAULTS = {
-        schemaVersion: 3,
+        schemaVersion: CURRENT_SCHEMA_VERSION,
         datasources: [],
         targets: {},
         // Fields
@@ -393,6 +395,20 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
               triggerList = filterTriggers(triggerList, triggerFilter);
             }
 
+            // Filter by tags
+            var target = this.panel.targets[ds];
+            if (target.tags.filter) {
+              var tagsFilter = this.datasources[ds].replaceTemplateVars(target.tags.filter);
+              // replaceTemplateVars() builds regex-like string, so we should trim it.
+              tagsFilter = tagsFilter.replace('/^', '').replace('$/', '');
+              var tags = this.parseTags(tagsFilter);
+              triggerList = _.filter(triggerList, function (trigger) {
+                return _.every(tags, function (tag) {
+                  return _.find(trigger.tags, { tag: tag.tag, value: tag.value });
+                });
+              });
+            }
+
             return triggerList;
           }
         }, {
@@ -529,6 +545,25 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
             trigger.age = timestamp.fromNow(true);
             return trigger;
           }
+        }, {
+          key: 'parseTags',
+          value: function parseTags(tagStr) {
+            var tags = _.map(tagStr.split(','), function (tag) {
+              return tag.trim();
+            });
+            tags = _.map(tags, function (tag) {
+              var tagParts = tag.split(':');
+              return { tag: tagParts[0].trim(), value: tagParts[1].trim() };
+            });
+            return tags;
+          }
+        }, {
+          key: 'tagsToString',
+          value: function tagsToString(tags) {
+            return _.map(tags, function (tag) {
+              return tag.tag + ':' + tag.value;
+            }).join(', ');
+          }
         }, {
           key: 'switchComment',
           value: function switchComment(trigger) {

src/panel-triggers/migrations.js

@@ -1,5 +1,8 @@
+import _ from 'lodash';
+import {DEFAULT_TARGET} from './triggers_panel_ctrl';
+
 // Actual schema version
-const CURRENT_SCHEMA_VERSION = 3;
+export const CURRENT_SCHEMA_VERSION = 4;
 
 export function migratePanelSchema(panel) {
   if (isEmptyPanel(panel)) {
@@ -28,6 +31,14 @@ export function migratePanelSchema(panel) {
     delete panel.hideHostsInMaintenance;
   }
 
+  if (schemaVersion < 4) {
+    if (panel.targets && !_.isEmpty(panel.targets)) {
+      _.each(panel.targets, (target) => {
+        _.defaultsDeep(target, DEFAULT_TARGET);
+      });
+    }
+  }
+
   return panel;
 }
 

src/panel-triggers/partials/triggers_tab.html

@@ -78,6 +78,13 @@
           }"
           empty-to-null>
       </div>
+      <div class="gf-form">
+        <label class="gf-form-label query-keyword width-7">Tags</label>
+        <input type="text" class="gf-form-input"
+          ng-model="editor.panel.targets[ds].tags.filter"
+          ng-blur="editor.parseTarget()"
+          placeholder="tag1:value1, tag2:value2">
+      </div>
     </div>
   </div>
 </div>

src/panel-triggers/specs/migrations.spec.js

@@ -44,7 +44,7 @@ describe('Triggers Panel schema migration', () => {
     let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, timeoutMock, datasourceSrvMock, {}, {}, {});
 
     let expected = {
-      schemaVersion: 3,
+      schemaVersion: 4,
       datasources: ['zabbix'],
       targets: {
         'zabbix': DEFAULT_TARGET
@@ -80,7 +80,7 @@ describe('Triggers Panel schema migration', () => {
     let updatedPanelCtrl = new TriggerPanelCtrl(ctx.scope, {}, {}, datasourceSrvMock, {}, {}, {});
 
     let expected = {
-      schemaVersion: 3,
+      schemaVersion: 4,
       datasources: ['zabbix_default'],
       targets: {
         'zabbix_default': DEFAULT_TARGET

src/panel-triggers/triggers_panel_ctrl.js

@@ -5,7 +5,7 @@ import * as utils from '../datasource-zabbix/utils';
 import {PanelCtrl} from 'app/plugins/sdk';
 import {triggerPanelOptionsTab} from './options_tab';
 import {triggerPanelTriggersTab} from './triggers_tab';
-import {migratePanelSchema} from './migrations';
+import {migratePanelSchema, CURRENT_SCHEMA_VERSION} from './migrations';
 
 const ZABBIX_DS_ID = 'alexanderzobnin-zabbix-datasource';
 
@@ -13,7 +13,8 @@ export const DEFAULT_TARGET = {
   group: {filter: ""},
   host: {filter: ""},
   application: {filter: ""},
-  trigger: {filter: ""}
+  trigger: {filter: ""},
+  tags: {filter: ""},
 };
 
 export const DEFAULT_SEVERITY = [
@@ -28,7 +29,7 @@ export const DEFAULT_SEVERITY = [
 const DEFAULT_TIME_FORMAT = "DD MMM YYYY HH:mm:ss";
 
 export const PANEL_DEFAULTS = {
-  schemaVersion: 3,
+  schemaVersion: CURRENT_SCHEMA_VERSION,
   datasources: [],
   targets: {},
   // Fields
@@ -263,12 +264,26 @@ export class TriggerPanelCtrl extends PanelCtrl {
 
   filterTriggersPre(triggerList, ds) {
     // Filter triggers by description
-    var triggerFilter = this.panel.targets[ds].trigger.filter;
+    let triggerFilter = this.panel.targets[ds].trigger.filter;
     triggerFilter = this.datasources[ds].replaceTemplateVars(triggerFilter);
     if (triggerFilter) {
       triggerList = filterTriggers(triggerList, triggerFilter);
     }
 
+    // Filter by tags
+    const target = this.panel.targets[ds];
+    if (target.tags.filter) {
+      let tagsFilter = this.datasources[ds].replaceTemplateVars(target.tags.filter);
+      // replaceTemplateVars() builds regex-like string, so we should trim it.
+      tagsFilter = tagsFilter.replace('/^', '').replace('$/', '');
+      const tags = this.parseTags(tagsFilter);
+      triggerList = _.filter(triggerList, trigger => {
+        return _.every(tags, (tag) => {
+          return _.find(trigger.tags, {tag: tag.tag, value: tag.value});
+        });
+      });
+    }
+
     return triggerList;
   }
 
@@ -392,6 +407,19 @@ export class TriggerPanelCtrl extends PanelCtrl {
     return trigger;
   }
 
+  parseTags(tagStr) {
+    let tags = _.map(tagStr.split(','), (tag) => tag.trim());
+    tags = _.map(tags, (tag) => {
+      const tagParts = tag.split(':');
+      return {tag: tagParts[0].trim(), value: tagParts[1].trim()};
+    });
+    return tags;
+  }
+
+  tagsToString(tags) {
+    return _.map(tags, (tag) => `${tag.tag}:${tag.value}`).join(', ');
+  }
+
   switchComment(trigger) {
     trigger.showComment = !trigger.showComment;
   }