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

triggers: don't fetch proxies, if option disabled

Browse Source
This commit is contained in:
Alexander Zobnin
2018-11-07 11:19:20 +03:00
parent adc00541e1
commit f05bc08b88
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/panel-triggers/partials/options_tab.html
View File

@@ -23,7 +23,7 @@
label-class="width-9" label-class="width-9"
label="Host proxy" label="Host proxy"
checked="ctrl.panel.hostProxy" checked="ctrl.panel.hostProxy"
on-change="ctrl.render()"> on-change="ctrl.refresh()">
</gf-form-switch> </gf-form-switch>
<gf-form-switch class="gf-form" <gf-form-switch class="gf-form"
label-class="width-9" label-class="width-9"

16
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -207,14 +207,16 @@ export class TriggerPanelCtrl extends PanelCtrl {
let proxies = []; let proxies = [];
return this.datasourceSrv.get(ds) return this.datasourceSrv.get(ds)
.then(datasource => { .then(datasource => {
var zabbix = datasource.zabbix; const zabbix = datasource.zabbix;
var showEvents = this.panel.showEvents.value; const showEvents = this.panel.showEvents.value;
var triggerFilter = this.panel.targets[ds]; const triggerFilter = this.panel.targets[ds];
const showProxy = this.panel.hostProxy;
const getProxiesPromise = showProxy ? zabbix.getProxies() : () => [];
// Replace template variables // Replace template variables
var groupFilter = datasource.replaceTemplateVars(triggerFilter.group.filter); const groupFilter = datasource.replaceTemplateVars(triggerFilter.group.filter);
var hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter); const hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter);
var appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter); const appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter);
let triggersOptions = { let triggersOptions = {
showTriggers: showEvents showTriggers: showEvents
@@ -222,7 +224,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
return Promise.all([ return Promise.all([
zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions), zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions),
zabbix.getProxies() getProxiesPromise
]); ]);
}).then(([triggers, sourceProxies]) => { }).then(([triggers, sourceProxies]) => {
proxies = _.keyBy(sourceProxies, 'proxyid'); proxies = _.keyBy(sourceProxies, 'proxyid');