Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Trigger panel: fixed show triggers option.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-02-03 14:50:09 +03:00
parent de7c4bf711
commit 9996529602
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/datasource-zabbix/zabbixAPI.js
View File

@@ -296,7 +296,7 @@ function (angular, _) {
return this.request('service.getsla', params); return this.request('service.getsla', params);
}; };
p.getTriggers = function(groupids, hostids, applicationids) { p.getTriggers = function(groupids, hostids, applicationids, showEvents) {
var params = { var params = {
output: 'extend', output: 'extend',
groupids: groupids, groupids: groupids,
@@ -308,7 +308,7 @@ function (angular, _) {
skipDependent: true, skipDependent: true,
//only_true: true, //only_true: true,
filter: { filter: {
value: 1 value: showEvents
}, },
selectGroups: ['name'], selectGroups: ['name'],
selectHosts: ['name'], selectHosts: ['name'],

3
plugins/panel-triggers/module.js
View File

@@ -123,6 +123,7 @@ function (angular, app, _, $, config, PanelMeta) {
var zabbix = datasource.zabbixAPI; var zabbix = datasource.zabbixAPI;
var queryProcessor = datasource.queryProcessor; var queryProcessor = datasource.queryProcessor;
var triggerFilter = $scope.panel.triggers; var triggerFilter = $scope.panel.triggers;
var showEvents = $scope.panel.showEvents.value;
var buildQuery = queryProcessor.buildTriggerQuery(triggerFilter.group.filter, var buildQuery = queryProcessor.buildTriggerQuery(triggerFilter.group.filter,
triggerFilter.host.filter, triggerFilter.host.filter,
triggerFilter.application.filter); triggerFilter.application.filter);
@@ -130,7 +131,7 @@ function (angular, app, _, $, config, PanelMeta) {
return zabbix.getTriggers(query.groupids, return zabbix.getTriggers(query.groupids,
query.hostids, query.hostids,
query.applicationids, query.applicationids,
$scope.panel.showEvents.value) showEvents)
.then(function(triggers) { .then(function(triggers) {
return _.map(triggers, function (trigger) { return _.map(triggers, function (trigger) {
var lastchange = new Date(trigger.lastchange * 1000); var lastchange = new Date(trigger.lastchange * 1000);