Add a severity and acknowledgement filter for annotations

Add a severity filter, much like it is present in various
places in Zabbix, as well as a filter for the acknowledgement
status. This brings the interface closer to what is asked for
in https://support.zabbix.com/browse/ZBXNEXT-410
This commit is contained in:
Volker Fröhlich
2015-11-30 14:52:52 +01:00
parent 9dac49a3dc
commit 46d656d49e
2 changed files with 23 additions and 2 deletions

View File

@@ -341,8 +341,15 @@ function (angular, _, dateMath) {
var to = Math.ceil(dateMath.parse(options.rangeRaw.to) / 1000);
var self = this;
// Remove events below the chose severity
var severities = [];
for (var i = 5; i >= options.annotation.minseverity; i--) {
severities.push(i);
}
var params = {
output: ['triggerid', 'description'],
output: ['triggerid', 'description', 'priority'],
preservekeys: 1,
filter: { 'priority': severities },
search: {
'description': options.annotation.trigger
},
@@ -359,7 +366,7 @@ function (angular, _, dateMath) {
return this.zabbixAPI.performZabbixAPIRequest('trigger.get', params)
.then(function (result) {
if(result) {
var objects = _.indexBy(result, 'triggerid');
var objects = result;
var params = {
output: 'extend',
time_from: from,
@@ -385,6 +392,9 @@ function (angular, _, dateMath) {
title += Number(e.value) ? 'Problem' : 'OK';
_.each(result, function(e) {
// Hide acknowledged events
if (e.acknowledges.length > 0 && options.annotation.showAcknowledged) { return; }
var formatted_acknowledges = zabbixHelperSrv.formatAcknowledges(e.acknowledges);
events.push({
annotation: options.annotation,