From 14d8caf61ef6edb06c05fd5fcc610167adcda674 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 30 Mar 2016 20:33:50 +0300
Subject: [PATCH] Fixed triggers filtering by value (All, OK, Problems).

---
 src/datasource-zabbix/datasource.js        |  5 ++++-
 src/datasource-zabbix/zabbixAPI.service.js | 10 +++++-----
 src/panel-triggers/editor.js               |  6 +++---
 src/panel-triggers/module.js               |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index a259c73..bb5cb0e 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -343,6 +343,9 @@ export class ZabbixAPIDatasource {
     var self = this;
     var showOkEvents = annotation.showOkEvents ? [0, 1] : 1;
 
+    // Show all triggers
+    var showTriggers = [0, 1];
+
     var buildQuery = self.queryProcessor.buildTriggerQuery(this.templateSrv.replace(annotation.group),
                                                            this.templateSrv.replace(annotation.host),
                                                            this.templateSrv.replace(annotation.application));
@@ -350,7 +353,7 @@ export class ZabbixAPIDatasource {
       return self.zabbixAPI.getTriggers(query.groupids,
                                         query.hostids,
                                         query.applicationids,
-                                        true)
+                                        showTriggers)
         .then(function(triggers) {
 
           // Filter triggers by description
diff --git a/src/datasource-zabbix/zabbixAPI.service.js b/src/datasource-zabbix/zabbixAPI.service.js
index 5c3181c..ab35f0a 100644
--- a/src/datasource-zabbix/zabbixAPI.service.js
+++ b/src/datasource-zabbix/zabbixAPI.service.js
@@ -298,7 +298,7 @@ function ZabbixAPIService($q, alertSrv, zabbixAPICoreService) {
       return this.request('service.getsla', params);
     }
 
-    getTriggers(groupids, hostids, applicationids, showAll) {
+    getTriggers(groupids, hostids, applicationids, showTriggers) {
       var params = {
         output: 'extend',
         groupids: groupids,
@@ -318,14 +318,14 @@ function ZabbixAPIService($q, alertSrv, zabbixAPICoreService) {
         selectLastEvent: 'extend'
       };
 
-      if (showAll) {
-        params.filter = {};
+      if (showTriggers) {
+        params.filter.value = showTriggers;
       }
 
       return this.request('trigger.get', params);
     }
 
-    getEvents(objectids, from, to, showOkEvents) {
+    getEvents(objectids, from, to, showEvents) {
       var params = {
         output: 'extend',
         time_from: from,
@@ -333,7 +333,7 @@ function ZabbixAPIService($q, alertSrv, zabbixAPICoreService) {
         objectids: objectids,
         select_acknowledges: 'extend',
         selectHosts: 'extend',
-        value: showOkEvents
+        value: showEvents
       };
 
       return this.request('event.get', params);
diff --git a/src/panel-triggers/editor.js b/src/panel-triggers/editor.js
index 91ddbe9..8c2f611 100644
--- a/src/panel-triggers/editor.js
+++ b/src/panel-triggers/editor.js
@@ -44,9 +44,9 @@ class TriggerPanelEditorCtrl{
     ];
 
     this.showEventsFields = [
-      { text: 'all events',     value: [0,1] },
-      { text: 'Ok events',      value: 0 },
-      { text: 'Problem events', value: 1 }
+      { text: 'All',     value: [0,1] },
+      { text: 'OK',      value: [0] },
+      { text: 'Problems', value: 1 }
     ];
 
     // Load scope defaults
diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js
index b40a33b..7467ae3 100644
--- a/src/panel-triggers/module.js
+++ b/src/panel-triggers/module.js
@@ -43,7 +43,7 @@ var panelDefaults = {
   limit: 10,
   showTriggers: 'all triggers',
   sortTriggersBy: { text: 'last change', value: 'lastchange' },
-  showEvents: { text: 'Problem events', value: '1' },
+  showEvents: { text: 'Problems', value: '1' },
   triggerSeverity: defaultSeverity,
   okEventColor: 'rgba(0, 245, 153, 0.45)',
 };