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

show maintenance icon for triggers, closes #299

Browse Source
This commit is contained in:
Alexander Zobnin
2017-12-14 12:44:49 +03:00
parent 3685be7f40
commit 11ad51d5dc
20 changed files with 118 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,7 +342,7 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
}
getTriggers(groupids, hostids, applicationids, options) {
let {showTriggers, hideHostsInMaintenance, timeFrom, timeTo} = options;
let {showTriggers, maintenance, timeFrom, timeTo} = options;
let params = {
output: 'extend',
@@ -359,7 +359,7 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
value: 1
},
selectGroups: ['name'],
selectHosts: ['name', 'host'],
selectHosts: ['name', 'host', 'maintenance_status'],
selectItems: ['name', 'key_', 'lastvalue'],
selectLastEvent: 'extend'
};
@@ -368,8 +368,8 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
params.filter.value = showTriggers;
}
if (hideHostsInMaintenance) {
params.maintenance = false;
if (maintenance) {
params.maintenance = true;
}
if (timeFrom || timeTo) {