problems: fix "acknowledged" filter, closes #678, #691

grafana · Mar 4, 2019 · c415e82 · c415e82
1 parent 6449b8b
commit c415e82
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/panel-triggers/triggers_panel_ctrl.js b/src/panel-triggers/triggers_panel_ctrl.js
@@ -380,12 +380,12 @@ export class TriggerPanelCtrl extends PanelCtrl {
     // Filter acknowledged triggers
     if (this.panel.showTriggers === 'unacknowledged') {
       triggerList = _.filter(triggerList, trigger => {
-        return !trigger.acknowledges;
+        return !(trigger.acknowledges && trigger.acknowledges.length);
       });
     } else if (this.panel.showTriggers === 'acknowledged') {
-      triggerList = _.filter(triggerList, 'acknowledges');
-    } else {
-      triggerList = triggerList;
+      triggerList = _.filter(triggerList, trigger => {
+        return trigger.acknowledges && trigger.acknowledges.length;
+      });
     }
 
     // Filter by maintenance status