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

Triggers Panel: allow to hide hosts in maintenance, closes #186

Browse Source
This commit is contained in:
Alexander Zobnin
2017-02-10 16:57:13 +03:00
parent a68548ddbb
commit 5d33462d8e
14 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/datasource-zabbix/zabbix.js
View File

@@ -120,7 +120,7 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy) {
/**
* Build query - convert target filters to array of Zabbix items
*/
getTriggers(groupFilter, hostFilter, appFilter, showTriggers) {
getTriggers(groupFilter, hostFilter, appFilter, showTriggers, hideHostsInMaintenance) {
let promises = [
this.getGroups(groupFilter),
this.getHosts(groupFilter, hostFilter),
@@ -147,7 +147,7 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy) {
return query;
}).then(query => {
return this.zabbixAPI
.getTriggers(query.groupids, query.hostids, query.applicationids, showTriggers);
.getTriggers(query.groupids, query.hostids, query.applicationids, showTriggers, hideHostsInMaintenance);
});
}
}

6
src/datasource-zabbix/zabbixAPI.service.js
View File

@@ -316,7 +316,7 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
return this.request('service.getsla', params);
}
getTriggers(groupids, hostids, applicationids, showTriggers, timeFrom, timeTo) {
getTriggers(groupids, hostids, applicationids, showTriggers, hideHostsInMaintenance, timeFrom, timeTo) {
var params = {
output: 'extend',
groupids: groupids,
@@ -341,6 +341,10 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
params.filter.value = showTriggers;
}
if (hideHostsInMaintenance) {
params.maintenance = false;
}
if (timeFrom || timeTo) {
params.lastChangeSince = timeFrom;
params.lastChangeTill = timeTo;