From 5a2acc66339399c66532b26ded02798f240f4470 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 2 Feb 2016 16:06:43 +0300 Subject: [PATCH 1/8] Trigger panel: fixed Select triggers section. --- plugins/panel-triggers/editor.html | 52 +++++---- plugins/panel-triggers/module.js | 167 ++++++++++++++++------------- 2 files changed, 124 insertions(+), 95 deletions(-) diff --git a/plugins/panel-triggers/editor.html b/plugins/panel-triggers/editor.html index c7695fe..cee0338 100644 --- a/plugins/panel-triggers/editor.html +++ b/plugins/panel-triggers/editor.html @@ -7,21 +7,29 @@ Group
  • - +
  • Host
  • - +
    • @@ -32,22 +40,28 @@ Application
  • - +
  • Trigger
  • + class="input-large tight-form-input last" + ng-style="panel.triggers.trigger.style" + empty-to-null">
    • diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 27dd7c1..d4d6778 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -17,8 +17,7 @@ define([ 'lodash', 'jquery', 'app/core/config', - 'app/features/panel/panel_meta', - '../zabbix/helperFunctions', + 'app/features/panel/panel_meta' ], function (angular, app, _, $, config, PanelMeta) { 'use strict'; @@ -27,7 +26,7 @@ function (angular, app, _, $, config, PanelMeta) { app.useModule(module); /** @ngInject */ - function TriggerPanelCtrl($q, $scope, $element, datasourceSrv, panelSrv, templateSrv, zabbixHelperSrv, popoverSrv) { + function TriggerPanelCtrl($q, $scope, $element, datasourceSrv, panelSrv, templateSrv, popoverSrv) { $scope.panelMeta = new PanelMeta({ panelName: 'Zabbix triggers', @@ -66,9 +65,10 @@ function (angular, app, _, $, config, PanelMeta) { var panelDefaults = { datasource: null, triggers: { - group: {name: 'All', groupid: null}, - host: {name: 'All', hostid: null}, - application: {name: 'All', value: null} + group: {filter: ""}, + host: {filter: ""}, + application: {filter: ""}, + trigger: {filter: ""} }, hostField: true, severityField: false, @@ -91,13 +91,13 @@ function (angular, app, _, $, config, PanelMeta) { $scope.panel.title = "Zabbix Triggers"; } - if (!$scope.metric) { - $scope.metric = { - groupList: [{name: 'All', groupid: null}], - hostList: [{name: 'All', hostid: null}], - applicationList: [{name: 'All', applicationid: null}] - }; - } + // Load scope defaults + var scopeDefaults = { + metric: {}, + inputStyles: {}, + oldTarget: _.cloneDeep($scope.panel.triggers) + }; + _.defaults($scope, scopeDefaults); // Get zabbix data sources var datasources = _.filter(datasourceSrv.getMetricSources(), function(datasource) { @@ -109,11 +109,11 @@ function (angular, app, _, $, config, PanelMeta) { if (!$scope.panel.datasource) { $scope.panel.datasource = $scope.datasources[0]; } - - // Update lists of groups, hosts and applications - $scope.updateGroups() - .then($scope.updateHosts) - .then($scope.updateApplications); + // Load datasource + datasourceSrv.get($scope.panel.datasource).then(function (datasource) { + $scope.datasource = datasource; + $scope.initFilters(); + }); }; $scope.refreshData = function() { @@ -142,7 +142,7 @@ function (angular, app, _, $, config, PanelMeta) { // Consider local time offset var ageUnix = now - lastchange + now.getTimezoneOffset() * 60000; - var age = zabbixHelperSrv.toZabbixAgeFormat(ageUnix); + var age = toZabbixAgeFormat(ageUnix); var triggerObj = trigger; triggerObj.lastchangeUnix = lastchangeUnix; triggerObj.lastchange = lastchange.toLocaleString(); @@ -191,44 +191,65 @@ function (angular, app, _, $, config, PanelMeta) { }); }; - $scope.groupChanged = function() { - return $scope.updateHosts() - .then($scope.updateApplications) - .then($scope.refreshData); + $scope.initFilters = function () { + $scope.filterGroups(); + $scope.filterHosts(); + $scope.filterApplications(); + //$scope.filterItems(); }; - $scope.hostChanged = function() { - return $scope.updateApplications() - .then($scope.refreshData); + // Get list of metric names for bs-typeahead directive + function getMetricNames(scope, metricList) { + return _.uniq(_.map(scope.metric[metricList], 'name')); + } + + // Map functions for bs-typeahead + $scope.getGroupNames = _.partial(getMetricNames, $scope, 'groupList'); + $scope.getHostNames = _.partial(getMetricNames, $scope, 'filteredHosts'); + $scope.getApplicationNames = _.partial(getMetricNames, $scope, 'filteredApplications'); + $scope.getItemNames = _.partial(getMetricNames, $scope, 'filteredItems'); + + $scope.filterGroups = function() { + $scope.datasource.queryProcessor.filterGroups().then(function(groups) { + $scope.metric.groupList = groups; + }); }; - $scope.appChanged = function() { - var app = $scope.panel.triggers.application.name; + $scope.filterHosts = function () { + var groupFilter = templateSrv.replace($scope.panel.triggers.group.filter); + $scope.datasource.queryProcessor.filterHosts(groupFilter).then(function(hosts) { + $scope.metric.filteredHosts = hosts; + }); + }; - return datasourceSrv.get($scope.panel.datasource).then(function (datasource) { - return datasource.zabbixAPI.getAppByName(app).then(function (applications) { - var appids = _.map(applications, 'applicationid'); - $scope.panel.triggers.application.value = appids.length ? appids : null; + $scope.filterApplications = function () { + var groupFilter = templateSrv.replace($scope.panel.triggers.group.filter); + var hostFilter = templateSrv.replace($scope.panel.triggers.host.filter); + $scope.datasource.queryProcessor.filterApplications(groupFilter, hostFilter) + .then(function(apps) { + $scope.metric.filteredApplications = apps; }); - }).then($scope.refreshData); }; - $scope.updateGroups = function() { - return datasourceSrv.get($scope.panel.datasource).then(function (datasource) { - return $scope.updateGroupList(datasource); - }); + $scope.onTargetPartChange = function (targetPart) { + var regexStyle = {'color': '#CCA300'}; + targetPart.isRegex = isRegex(targetPart.filter); + targetPart.style = targetPart.isRegex ? regexStyle : {}; }; - $scope.updateHosts = function() { - return datasourceSrv.get($scope.panel.datasource).then(function (datasource) { - return $scope.updateHostList(datasource); - }); - }; + function isRegex(str) { + // Pattern for testing regex + var regexPattern = /^\/(.*)\/([gmi]*)$/m; + return regexPattern.test(str); + } - $scope.updateApplications = function() { - return datasourceSrv.get($scope.panel.datasource).then(function (datasource) { - return $scope.updateAppList(datasource); - }); + $scope.parseTarget = function() { + $scope.initFilters(); + var newTarget = _.cloneDeep($scope.panel.triggers); + if (!_.isEqual($scope.oldTarget, $scope.panel.triggers)) { + $scope.oldTarget = newTarget; + $scope.get_data(); + } }; $scope.refreshTriggerSeverity = function() { @@ -266,38 +287,32 @@ function (angular, app, _, $, config, PanelMeta) { }); }; - $scope.updateGroupList = function (datasource) { - datasource.zabbixAPI.performHostGroupSuggestQuery().then(function (groups) { - $scope.metric.groupList = $scope.metric.groupList.concat(groups); - }); - }; - - $scope.updateHostList = function (datasource) { - var groups = $scope.panel.triggers.group.groupid ? $scope.panel.triggers.group.name : '*'; - if (groups) { - datasource.zabbixAPI.hostFindQuery(groups).then(function (hosts) { - $scope.metric.hostList = [{name: 'All', hostid: null}]; - $scope.metric.hostList = $scope.metric.hostList.concat(hosts); - }); + /** + * Convert event age from Unix format (milliseconds sins 1970) + * to Zabbix format (like at Last 20 issues panel). + * @param {Date} AgeUnix time in Unix format + * @return {string} Formatted time + */ + function toZabbixAgeFormat(ageUnix) { + var age = new Date(+ageUnix); + var ageZabbix = age.getSeconds() + 's'; + if (age.getMinutes()) { + ageZabbix = age.getMinutes() + 'm ' + ageZabbix; } - }; - - $scope.updateAppList = function (datasource) { - var groups = $scope.panel.triggers.group.groupid ? $scope.panel.triggers.group.name : '*'; - var hosts = $scope.panel.triggers.host.hostid ? $scope.panel.triggers.host.name : '*'; - if (groups && hosts) { - datasource.zabbixAPI.appFindQuery(hosts, groups).then(function (apps) { - apps = _.map(_.uniq(_.map(apps, 'name')), function (appname) { - return { - name: appname, - value: appname - }; - }); - $scope.metric.applicationList = [{name: 'All', value: null}]; - $scope.metric.applicationList = $scope.metric.applicationList.concat(apps); - }); + if (age.getHours()) { + ageZabbix = age.getHours() + 'h ' + ageZabbix; } - }; + if (age.getDate() - 1) { + ageZabbix = age.getDate() - 1 + 'd ' + ageZabbix; + } + if (age.getMonth()) { + ageZabbix = age.getMonth() + 'M ' + ageZabbix; + } + if (age.getYear() - 70) { + ageZabbix = age.getYear() -70 + 'y ' + ageZabbix; + } + return ageZabbix; + } $scope.init(); } From 840f07dc7e9e93229becb746a123a375c9eeef16 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Feb 2016 10:50:09 +0300 Subject: [PATCH 2/8] Trigger panel: improved work with triggers via api. --- plugins/datasource-zabbix/zabbixAPI.js | 34 +++++------- plugins/panel-triggers/module.js | 77 +++++++++++++------------- 2 files changed, 52 insertions(+), 59 deletions(-) diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js index f8e10e4..fe9db06 100644 --- a/plugins/datasource-zabbix/zabbixAPI.js +++ b/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 : { - description: name - }, - searchWildcardsEnabled: false, - groupids: groupids, - hostids: hostids, - applicationids: applicationids, - limit: limit, - sortfield: 'lastchange', - sortorder: 'DESC' + selectGroups: ['name'], + selectHosts: ['name'], + selectItems: ['name', 'key_', 'lastvalue'], + selectLastEvent: 'extend' }; - 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, - acknowledged: true, + eventids: eventids, + preservekeys: true, select_acknowledges: 'extend', sortfield: 'clock', - sortorder: 'DESC', - time_from: from + sortorder: 'DESC' }; return this.request('event.get', params) .then(function (events) { - return _.flatten(_.map(events, 'acknowledges')); + return _.filter(events, function(event) { + return event.acknowledges.length; + }); }); }; diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index d4d6778..74f5685 100644 --- a/plugins/panel-triggers/module.js +++ b/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, - $scope.panel.sortTriggersBy.value, - groupid, - hostid, - applicationids, - $scope.panel.triggers.name, - $scope.panel.showEvents.value) + return zabbix.getTriggers($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 - return zabbix.getAcknowledges(trigger.triggerid, lastchangeUnix) - .then(function (acknowledges) { - if (acknowledges.length) { - triggerObj.acknowledges = _.map(acknowledges, function (ack) { + // Request acknowledges for trigger + var eventids = _.map(triggerList, function(trigger) { + return trigger.lastEvent.eventid; + }); + 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 - if ($scope.panel.showTriggers === 'unacknowledged') { - $scope.triggerList = _.filter(triggerList, function (trigger) { - return !trigger.acknowledges; + // Filter acknowledged triggers + if ($scope.panel.showTriggers === 'unacknowledged') { + $scope.triggerList = _.filter(triggerList, function (trigger) { + 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 - $scope.triggerList = _.filter($scope.triggerList, function (trigger) { - return $scope.panel.triggerSeverity[trigger.priority].show; + // Limit triggers number + $scope.triggerList = _.first($scope.triggerList, $scope.panel.limit); + + $scope.panelRenderingComplete(); }); - - // Limit triggers number - $scope.triggerList = _.first($scope.triggerList, $scope.panel.limit); - - $scope.panelRenderingComplete(); - }); }); }); }; From d4ea5d5b32ae1af8718126ab2db88b16f8b91ca3 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Feb 2016 11:45:42 +0300 Subject: [PATCH 3/8] Trigger panel: fixed trigger filtering by group, host and app. --- plugins/datasource-zabbix/queryProcessor.js | 67 ++++++++++ plugins/datasource-zabbix/zabbixAPI.js | 5 +- plugins/panel-triggers/module.js | 140 +++++++++++--------- 3 files changed, 145 insertions(+), 67 deletions(-) diff --git a/plugins/datasource-zabbix/queryProcessor.js b/plugins/datasource-zabbix/queryProcessor.js index d28e2f4..97f128a 100644 --- a/plugins/datasource-zabbix/queryProcessor.js +++ b/plugins/datasource-zabbix/queryProcessor.js @@ -28,6 +28,19 @@ function (angular, _, utils) { } }; + /** + * Build trigger query in asynchronous manner + */ + this.buildTriggerQuery = function (groupFilter, hostFilter, appFilter) { + if (this.cache._initialized) { + return $q.when(self.buildTriggerQueryFromCache(groupFilter, hostFilter, appFilter)); + } else { + return this.cache.refresh().then(function() { + return self.buildTriggerQueryFromCache(groupFilter, hostFilter, appFilter); + }); + } + }; + this.filterGroups = function(groupFilter) { return self.cache.getGroups().then(function(groupList) { return groupList; @@ -309,6 +322,60 @@ function (angular, _, utils) { }); }; + /** + * Build query - convert target filters to array of Zabbix items + */ + this.buildTriggerQueryFromCache = function (groupFilter, hostFilter, appFilter) { + var promises = [ + this.filterGroups(groupFilter).then(function(groups) { + return _.filter(groups, function(group) { + if (utils.isRegex(groupFilter)) { + return utils.buildRegex(groupFilter).test(group.name); + } else { + return group.name === groupFilter; + } + }); + }), + this.filterHosts(groupFilter).then(function(hosts) { + return _.filter(hosts, function(host) { + if (utils.isRegex(hostFilter)) { + return utils.buildRegex(hostFilter).test(host.name); + } else { + return host.name === hostFilter; + } + }); + }), + this.filterApplications(groupFilter, hostFilter).then(function(apps) { + return _.filter(apps, function(app) { + if (utils.isRegex(appFilter)) { + return utils.buildRegex(appFilter).test(app.name); + } else { + return app.name === appFilter; + } + }); + }) + ]; + + return $q.all(promises).then(function(results) { + var filteredGroups = results[0]; + var filteredHosts = results[1]; + var filteredApps = results[2]; + var query = {}; + + if (appFilter) { + query.applicationids = _.flatten(_.map(filteredApps, 'applicationids')); + } + if (hostFilter) { + query.hostids = _.map(filteredHosts, 'hostid'); + } + if (groupFilter) { + query.groupids = _.map(filteredGroups, 'groupid'); + } + + return query; + }); + }; + /** * Convert Zabbix API history.get response to Grafana format * diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js index fe9db06..1136874 100644 --- a/plugins/datasource-zabbix/zabbixAPI.js +++ b/plugins/datasource-zabbix/zabbixAPI.js @@ -296,9 +296,12 @@ function (angular, _) { return this.request('service.getsla', params); }; - p.getTriggers = function() { + p.getTriggers = function(groupids, hostids, applicationids) { var params = { output: 'extend', + groupids: groupids, + hostids: hostids, + applicationids: applicationids, expandDescription: true, expandData: true, monitored: true, diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 74f5685..17f46ea 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -121,74 +121,82 @@ function (angular, app, _, $, config, PanelMeta) { // Load datasource return datasourceSrv.get($scope.panel.datasource).then(function (datasource) { var zabbix = datasource.zabbixAPI; + var queryProcessor = datasource.queryProcessor; + var triggerFilter = $scope.panel.triggers; + var buildQuery = queryProcessor.buildTriggerQuery(triggerFilter.group.filter, + triggerFilter.host.filter, + triggerFilter.application.filter); + return buildQuery.then(function(query) { + return zabbix.getTriggers(query.groupids, + query.hostids, + query.applicationids, + $scope.panel.showEvents.value) + .then(function(triggers) { + return _.map(triggers, function (trigger) { + var lastchange = new Date(trigger.lastchange * 1000); + var lastchangeUnix = trigger.lastchange; + var now = new Date(); - // Get triggers - return zabbix.getTriggers($scope.panel.showEvents.value) - .then(function(triggers) { - return _.map(triggers, function (trigger) { - var lastchange = new Date(trigger.lastchange * 1000); - var lastchangeUnix = trigger.lastchange; - var now = new Date(); - - // Consider local time offset - var ageUnix = now - lastchange + now.getTimezoneOffset() * 60000; - var age = toZabbixAgeFormat(ageUnix); - var triggerObj = trigger; - triggerObj.lastchangeUnix = lastchangeUnix; - triggerObj.lastchange = lastchange.toLocaleString(); - 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 - var eventids = _.map(triggerList, function(trigger) { - return trigger.lastEvent.eventid; - }); - 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; - }); - } - }); - - // Filter acknowledged triggers - if ($scope.panel.showTriggers === 'unacknowledged') { - $scope.triggerList = _.filter(triggerList, function (trigger) { - 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; - }); - - // Limit triggers number - $scope.triggerList = _.first($scope.triggerList, $scope.panel.limit); - - $scope.panelRenderingComplete(); + // Consider local time offset + var ageUnix = now - lastchange + now.getTimezoneOffset() * 60000; + var age = toZabbixAgeFormat(ageUnix); + var triggerObj = trigger; + triggerObj.lastchangeUnix = lastchangeUnix; + triggerObj.lastchange = lastchange.toLocaleString(); + 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 + var eventids = _.map(triggerList, function(trigger) { + return trigger.lastEvent.eventid; + }); + 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; + }); + } + }); + + // Filter acknowledged triggers + if ($scope.panel.showTriggers === 'unacknowledged') { + $scope.triggerList = _.filter(triggerList, function (trigger) { + 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; + }); + + // Limit triggers number + $scope.triggerList = _.first($scope.triggerList, $scope.panel.limit); + + $scope.panelRenderingComplete(); + }); + }); + }); }); }; From a08529faa12bdc860b7b3ce333bae9cf7477e6e0 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Feb 2016 14:31:39 +0300 Subject: [PATCH 4/8] Filter triggers by description. --- plugins/panel-triggers/module.js | 33 ++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 17f46ea..049759e 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -174,6 +174,12 @@ function (angular, app, _, $, config, PanelMeta) { } }); + // Filter triggers by description + var triggerFilter = $scope.panel.triggers.trigger.filter; + if (triggerFilter) { + triggerList = filterTriggers(triggerList, triggerFilter); + } + // Filter acknowledged triggers if ($scope.panel.showTriggers === 'unacknowledged') { $scope.triggerList = _.filter(triggerList, function (trigger) { @@ -204,7 +210,6 @@ function (angular, app, _, $, config, PanelMeta) { $scope.filterGroups(); $scope.filterHosts(); $scope.filterApplications(); - //$scope.filterItems(); }; // Get list of metric names for bs-typeahead directive @@ -224,14 +229,14 @@ function (angular, app, _, $, config, PanelMeta) { }); }; - $scope.filterHosts = function () { + $scope.filterHosts = function() { var groupFilter = templateSrv.replace($scope.panel.triggers.group.filter); $scope.datasource.queryProcessor.filterHosts(groupFilter).then(function(hosts) { $scope.metric.filteredHosts = hosts; }); }; - $scope.filterApplications = function () { + $scope.filterApplications = function() { var groupFilter = templateSrv.replace($scope.panel.triggers.group.filter); var hostFilter = templateSrv.replace($scope.panel.triggers.host.filter); $scope.datasource.queryProcessor.filterApplications(groupFilter, hostFilter) @@ -240,7 +245,19 @@ function (angular, app, _, $, config, PanelMeta) { }); }; - $scope.onTargetPartChange = function (targetPart) { + function filterTriggers(triggers, triggerFilter) { + if (isRegex(triggerFilter)) { + return _.filter(triggers, function(trigger) { + return buildRegex(triggerFilter).test(trigger.description); + }); + } else { + return _.filter(triggers, function(trigger) { + return trigger.description === triggerFilter; + }); + } + } + + $scope.onTargetPartChange = function(targetPart) { var regexStyle = {'color': '#CCA300'}; targetPart.isRegex = isRegex(targetPart.filter); targetPart.style = targetPart.isRegex ? regexStyle : {}; @@ -252,6 +269,14 @@ function (angular, app, _, $, config, PanelMeta) { return regexPattern.test(str); } + function buildRegex(str) { + var regexPattern = /^\/(.*)\/([gmi]*)$/m; + var matches = str.match(regexPattern); + var pattern = matches[1]; + var flags = matches[2] !== "" ? matches[2] : undefined; + return new RegExp(pattern, flags); + } + $scope.parseTarget = function() { $scope.initFilters(); var newTarget = _.cloneDeep($scope.panel.triggers); From de7c4bf7118d4e7cf0e7dae6588638cb5221d9bf Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Feb 2016 14:44:13 +0300 Subject: [PATCH 5/8] Sort triggers by severity. --- plugins/panel-triggers/module.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 049759e..9c71ead 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -182,22 +182,27 @@ function (angular, app, _, $, config, PanelMeta) { // Filter acknowledged triggers if ($scope.panel.showTriggers === 'unacknowledged') { - $scope.triggerList = _.filter(triggerList, function (trigger) { + triggerList = _.filter(triggerList, function (trigger) { return !trigger.acknowledges; }); } else if ($scope.panel.showTriggers === 'acknowledged') { - $scope.triggerList = _.filter(triggerList, 'acknowledges'); + triggerList = _.filter(triggerList, 'acknowledges'); } else { - $scope.triggerList = triggerList; + triggerList = triggerList; } // Filter triggers by severity - $scope.triggerList = _.filter($scope.triggerList, function (trigger) { + triggerList = _.filter(triggerList, function (trigger) { return $scope.panel.triggerSeverity[trigger.priority].show; }); + // Sort triggers + if ($scope.panel.sortTriggersBy.value === 'priority') { + triggerList = _.sortBy(triggerList, 'priority').reverse(); + } + // Limit triggers number - $scope.triggerList = _.first($scope.triggerList, $scope.panel.limit); + $scope.triggerList = _.first(triggerList, $scope.panel.limit); $scope.panelRenderingComplete(); }); From 99965296027f95a7596d9e07d7b25d27e9e403ae Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Feb 2016 14:50:09 +0300 Subject: [PATCH 6/8] Trigger panel: fixed show triggers option. --- plugins/datasource-zabbix/zabbixAPI.js | 4 ++-- plugins/panel-triggers/module.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js index 1136874..bdda740 100644 --- a/plugins/datasource-zabbix/zabbixAPI.js +++ b/plugins/datasource-zabbix/zabbixAPI.js @@ -296,7 +296,7 @@ function (angular, _) { return this.request('service.getsla', params); }; - p.getTriggers = function(groupids, hostids, applicationids) { + p.getTriggers = function(groupids, hostids, applicationids, showEvents) { var params = { output: 'extend', groupids: groupids, @@ -308,7 +308,7 @@ function (angular, _) { skipDependent: true, //only_true: true, filter: { - value: 1 + value: showEvents }, selectGroups: ['name'], selectHosts: ['name'], diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 9c71ead..43d2eab 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -123,6 +123,7 @@ function (angular, app, _, $, config, PanelMeta) { var zabbix = datasource.zabbixAPI; var queryProcessor = datasource.queryProcessor; var triggerFilter = $scope.panel.triggers; + var showEvents = $scope.panel.showEvents.value; var buildQuery = queryProcessor.buildTriggerQuery(triggerFilter.group.filter, triggerFilter.host.filter, triggerFilter.application.filter); @@ -130,7 +131,7 @@ function (angular, app, _, $, config, PanelMeta) { return zabbix.getTriggers(query.groupids, query.hostids, query.applicationids, - $scope.panel.showEvents.value) + showEvents) .then(function(triggers) { return _.map(triggers, function (trigger) { var lastchange = new Date(trigger.lastchange * 1000); From f1adb7f5154f8bc0701aa589c6e9527fefba5a08 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Feb 2016 15:30:50 +0300 Subject: [PATCH 7/8] Trigger panel: set color for Ok events. --- plugins/panel-triggers/editor.html | 28 +++++++++++++++++++++++++--- plugins/panel-triggers/module.js | 29 +++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/plugins/panel-triggers/editor.html b/plugins/panel-triggers/editor.html index cee0338..bed41eb 100644 --- a/plugins/panel-triggers/editor.html +++ b/plugins/panel-triggers/editor.html @@ -105,7 +105,7 @@ Limit triggers number to
  • - Show events
  • - +
    • + +
    + diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 43d2eab..50be62c 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -79,7 +79,8 @@ function (angular, app, _, $, config, PanelMeta) { showTriggers: 'all triggers', sortTriggersBy: { text: 'last change', value: 'lastchange' }, showEvents: { text: 'Problem events', value: '1' }, - triggerSeverity: grafanaDefaultSeverity + triggerSeverity: grafanaDefaultSeverity, + okEventColor: '#890F02' }; _.defaults($scope.panel, panelDefaults); @@ -145,7 +146,14 @@ function (angular, app, _, $, config, PanelMeta) { triggerObj.lastchangeUnix = lastchangeUnix; triggerObj.lastchange = lastchange.toLocaleString(); triggerObj.age = age.toLocaleString(); - triggerObj.color = $scope.panel.triggerSeverity[trigger.priority].color; + + // Set color + if (trigger.value === '1') { + triggerObj.color = $scope.panel.triggerSeverity[trigger.priority].color; + } else { + triggerObj.color = $scope.panel.okEventColor; + } + triggerObj.severity = $scope.panel.triggerSeverity[trigger.priority].severity; return triggerObj; }); @@ -327,6 +335,23 @@ function (angular, app, _, $, config, PanelMeta) { }); }; + $scope.openOkEventColorSelector = function(event) { + var el = $(event.currentTarget); + var popoverScope = $scope.$new(); + popoverScope.trigger = {color: $scope.panel.okEventColor}; + popoverScope.changeTriggerSeverityColor = function(trigger, color) { + $scope.panel.okEventColor = color; + $scope.refreshTriggerSeverity(); + }; + + popoverSrv.show({ + element: el, + placement: 'top', + templateUrl: 'public/plugins/triggers/trigger.colorpicker.html', + scope: popoverScope + }); + }; + /** * Convert event age from Unix format (milliseconds sins 1970) * to Zabbix format (like at Last 20 issues panel). From 6f9443d5ced63517fbc0f02894c6a7cf544ec7af Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 3 Feb 2016 15:45:13 +0300 Subject: [PATCH 8/8] Trigger panel: fixed triggers sorting. --- plugins/panel-triggers/module.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 50be62c..c52e36d 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -208,6 +208,8 @@ function (angular, app, _, $, config, PanelMeta) { // Sort triggers if ($scope.panel.sortTriggersBy.value === 'priority') { triggerList = _.sortBy(triggerList, 'priority').reverse(); + } else { + triggerList = _.sortBy(triggerList, 'lastchangeUnix').reverse(); } // Limit triggers number