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

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

View File

@@ -138,15 +138,21 @@
</div>
</div>
<div class="gf-form-inline">
<div class="gf-form max-width-17">
<div class="gf-form max-width-12">
<label class="gf-form-label width-6">Font size</label>
<div class="gf-form-select-wrapper max-width-15">
<div class="gf-form-select-wrapper max-width-8">
<select class="gf-form-input"
ng-model="editor.panel.fontSize"
ng-options="f for f in editor.fontSizes"
ng-change="editor.panelCtrl.render()"></select>
</div>
</div>
<gf-form-switch class="gf-form"
label-class="width-14"
label="Hide hosts in maintenance"
checked="editor.panel.hideHostsInMaintenance"
on-change="ctrl.refresh()">
</gf-form-switch>
</div>
</div>

View File

@@ -97,6 +97,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
infoField: true,
limit: 10,
showTriggers: 'all triggers',
hideHostsInMaintenance: false,
sortTriggersBy: { text: 'last change', value: 'lastchange' },
showEvents: { text: 'Problems', value: '1' },
triggerSeverity: defaultSeverity,
@@ -181,13 +182,14 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
_this3.zabbix = zabbix;
var showEvents = _this3.panel.showEvents.value;
var triggerFilter = _this3.panel.triggers;
var hideHostsInMaintenance = _this3.panel.hideHostsInMaintenance;
// Replace template variables
var groupFilter = datasource.replaceTemplateVars(triggerFilter.group.filter);
var hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter);
var appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter);
var getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, showEvents);
var getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, showEvents, hideHostsInMaintenance);
return getTriggers.then(function (triggers) {
return _.map(triggers, _this3.formatTrigger.bind(_this3));
});

File diff suppressed because one or more lines are too long