Filter triggers by tags, #487

grafana · Dec 16, 2017 · 401ad69 · 401ad69
1 parent ea0c5a2
commit 401ad69
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 20 deletions.
diff --git a/dist/panel-triggers/migrations.js b/dist/panel-triggers/migrations.js
diff --git a/dist/panel-triggers/migrations.js.map b/dist/panel-triggers/migrations.js.map
diff --git a/dist/panel-triggers/partials/triggers_tab.html b/dist/panel-triggers/partials/triggers_tab.html
@@ -78,6 +78,13 @@ <h5 class="section-heading">{{ ds }}</h5>
           }"
           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>
diff --git a/dist/panel-triggers/specs/migrations.spec.js b/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

diff --git a/dist/panel-triggers/triggers_panel_ctrl.js b/dist/panel-triggers/triggers_panel_ctrl.js
diff --git a/dist/panel-triggers/triggers_panel_ctrl.js.map b/dist/panel-triggers/triggers_panel_ctrl.js.map
diff --git a/src/panel-triggers/migrations.js b/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;
 }
 

diff --git a/src/panel-triggers/partials/triggers_tab.html b/src/panel-triggers/partials/triggers_tab.html
@@ -78,6 +78,13 @@ <h5 class="section-heading">{{ ds }}</h5>
           }"
           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>
diff --git a/src/panel-triggers/specs/migrations.spec.js b/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

diff --git a/src/panel-triggers/triggers_panel_ctrl.js b/src/panel-triggers/triggers_panel_ctrl.js
@@ -5,15 +5,16 @@ 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';
 
 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;
   }