Trigger panel: improved work with triggers via api.

plugins/datasource-zabbix/zabbixAPI.js

@@ -296,49 +296,41 @@ function (angular, _) {
       return this.request('service.getsla', params);
     };
 
-    p.getTriggers = function(limit, sortfield, groupids, hostids, applicationids, name) {
+    p.getTriggers = function() {
       var params = {
         output: 'extend',
         expandDescription: true,
         expandData: true,
         monitored: true,
+        skipDependent: true,
         //only_true: true,
         filter: {
           value: 1
         },
-        search : {
+        selectGroups: ['name'],
-          description: name
+        selectHosts: ['name'],
-        },
+        selectItems: ['name', 'key_', 'lastvalue'],
-        searchWildcardsEnabled: false,
+        selectLastEvent: 'extend'
-        groupids: groupids,
-        hostids: hostids,
-        applicationids: applicationids,
-        limit: limit,
-        sortfield: 'lastchange',
-        sortorder: 'DESC'
       };
 
-      if (sortfield) {
-        params.sortfield = sortfield;
-      }
-
       return this.request('trigger.get', params);
     };
 
-    p.getAcknowledges = function(triggerids, from) {
+    p.getAcknowledges = function(eventids) {
       var params = {
         output: 'extend',
-        objectids: triggerids,
+        eventids: eventids,
-        acknowledged: true,
+        preservekeys: true,
         select_acknowledges: 'extend',
         sortfield: 'clock',
-        sortorder: 'DESC',
+        sortorder: 'DESC'
-        time_from: from
       };
 
       return this.request('event.get', params)
         .then(function (events) {
-          return _.flatten(_.map(events, 'acknowledges'));
+          return _.filter(events, function(event) {
+            return event.acknowledges.length;
+          });
         });
     };
 

plugins/panel-triggers/module.js

@@ -122,20 +122,10 @@ function (angular, app, _, $, config, PanelMeta) {
       return datasourceSrv.get($scope.panel.datasource).then(function (datasource) {
         var zabbix = datasource.zabbixAPI;
 
-        var groupid = $scope.panel.triggers.group.groupid;
-        var hostid = $scope.panel.triggers.host.hostid;
-        var applicationids = $scope.panel.triggers.application.value;
-
         // Get triggers
-        return zabbix.getTriggers(null,
+        return zabbix.getTriggers($scope.panel.showEvents.value)
-                                  $scope.panel.sortTriggersBy.value,
-                                  groupid,
-                                  hostid,
-                                  applicationids,
-                                  $scope.panel.triggers.name,
-                                  $scope.panel.showEvents.value)
           .then(function(triggers) {
-            var promises = _.map(triggers, function (trigger) {
+            return _.map(triggers, function (trigger) {
               var lastchange = new Date(trigger.lastchange * 1000);
               var lastchangeUnix = trigger.lastchange;
               var now = new Date();
@@ -149,44 +139,55 @@ function (angular, app, _, $, config, PanelMeta) {
               triggerObj.age = age.toLocaleString();
               triggerObj.color = $scope.panel.triggerSeverity[trigger.priority].color;
               triggerObj.severity = $scope.panel.triggerSeverity[trigger.priority].severity;
+              return triggerObj;
+            });
+          })
+          .then(function (triggerList) {
 
-              // Request acknowledges for trigger
+            // Request acknowledges for trigger
-              return zabbix.getAcknowledges(trigger.triggerid, lastchangeUnix)
+            var eventids = _.map(triggerList, function(trigger) {
-                .then(function (acknowledges) {
+              return trigger.lastEvent.eventid;
-                  if (acknowledges.length) {
+            });
-                    triggerObj.acknowledges = _.map(acknowledges, function (ack) {
+            return zabbix.getAcknowledges(eventids)
+              .then(function (events) {
+
+                // Map events to triggers
+                _.each(triggerList, function(trigger) {
+                  var event = _.find(events, function(event) {
+                    return event.eventid === trigger.lastEvent.eventid;
+                  });
+
+                  if (event) {
+                    trigger.acknowledges = _.map(event.acknowledges, function (ack) {
                       var time = new Date(+ack.clock * 1000);
                       ack.time = time.toLocaleString();
                       ack.user = ack.alias + ' (' + ack.name + ' ' + ack.surname + ')';
                       return ack;
                     });
                   }
-                  return triggerObj;
                 });
-            });
-            return $q.all(promises).then(function (triggerList) {
 
-              // Filter acknowledged triggers
+                // Filter acknowledged triggers
-              if ($scope.panel.showTriggers === 'unacknowledged') {
+                if ($scope.panel.showTriggers === 'unacknowledged') {
-                $scope.triggerList = _.filter(triggerList, function (trigger) {
+                  $scope.triggerList = _.filter(triggerList, function (trigger) {
-                  return !trigger.acknowledges;
+                    return !trigger.acknowledges;
+                  });
+                } else if ($scope.panel.showTriggers === 'acknowledged') {
+                  $scope.triggerList = _.filter(triggerList, 'acknowledges');
+                } else {
+                  $scope.triggerList = triggerList;
+                }
+
+                // Filter triggers by severity
+                $scope.triggerList = _.filter($scope.triggerList, function (trigger) {
+                  return $scope.panel.triggerSeverity[trigger.priority].show;
                 });
-              } else if ($scope.panel.showTriggers === 'acknowledged') {
-                $scope.triggerList = _.filter(triggerList, 'acknowledges');
-              } else {
-                $scope.triggerList = triggerList;
-              }
 
-              // Filter triggers by severity
+                // Limit triggers number
-              $scope.triggerList = _.filter($scope.triggerList, function (trigger) {
+                $scope.triggerList  = _.first($scope.triggerList, $scope.panel.limit);
-                return $scope.panel.triggerSeverity[trigger.priority].show;
+
+                $scope.panelRenderingComplete();
               });
-
-              // Limit triggers number
-              $scope.triggerList  = _.first($scope.triggerList, $scope.panel.limit);
-
-              $scope.panelRenderingComplete();
-            });
           });
       });
     };