Add tag filter by click at trigger tag icon, #487

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

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/dist/panel-triggers/partials/module.html b/dist/panel-triggers/partials/module.html
@@ -18,7 +18,8 @@
                   </span>
 
                   <span class="zbx-trigger-tags" ng-if="ctrl.panel.showTags && trigger.tags">
-                    <span ng-repeat="tag in trigger.tags" tag-color-from-name="tag.tag+tag.value" class="label label-tag zbx-tag">
+                    <span ng-repeat="tag in trigger.tags" ng-click="ctrl.addTagFilter(tag, trigger.datasource)"
+                      tag-color-from-name="tag.tag+tag.value" class="label label-tag zbx-tag">
                       {{tag.tag}}: {{tag.value}}
                     </span>
                   </span>

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/partials/module.html b/src/panel-triggers/partials/module.html
@@ -18,7 +18,8 @@
                   </span>
 
                   <span class="zbx-trigger-tags" ng-if="ctrl.panel.showTags && trigger.tags">
-                    <span ng-repeat="tag in trigger.tags" tag-color-from-name="tag.tag+tag.value" class="label label-tag zbx-tag">
+                    <span ng-repeat="tag in trigger.tags" ng-click="ctrl.addTagFilter(tag, trigger.datasource)"
+                      tag-color-from-name="tag.tag+tag.value" class="label label-tag zbx-tag">
                       {{tag.tag}}: {{tag.value}}
                     </span>
                   </span>

diff --git a/src/panel-triggers/triggers_panel_ctrl.js b/src/panel-triggers/triggers_panel_ctrl.js
@@ -408,6 +408,10 @@ export class TriggerPanelCtrl extends PanelCtrl {
   }
 
   parseTags(tagStr) {
+    if (!tagStr) {
+      return [];
+    }
+
     let tags = _.map(tagStr.split(','), (tag) => tag.trim());
     tags = _.map(tags, (tag) => {
       const tagParts = tag.split(':');
@@ -420,6 +424,17 @@ export class TriggerPanelCtrl extends PanelCtrl {
     return _.map(tags, (tag) => `${tag.tag}:${tag.value}`).join(', ');
   }
 
+  addTagFilter(tag, ds) {
+    let tagFilter = this.panel.targets[ds].tags.filter;
+    let targetTags = this.parseTags(tagFilter);
+    let newTag = {tag: tag.tag, value: tag.value};
+    targetTags.push(newTag);
+    targetTags = _.uniqWith(targetTags, _.isEqual);
+    let newFilter = this.tagsToString(targetTags);
+    this.panel.targets[ds].tags.filter = newFilter;
+    this.refresh();
+  }
+
   switchComment(trigger) {
     trigger.showComment = !trigger.showComment;
   }