From f05bc08b8829df91cf729d3454799d4626e2d712 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 7 Nov 2018 11:19:20 +0300 Subject: [PATCH] triggers: don't fetch proxies, if option disabled --- src/panel-triggers/partials/options_tab.html | 2 +- src/panel-triggers/triggers_panel_ctrl.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/panel-triggers/partials/options_tab.html b/src/panel-triggers/partials/options_tab.html index 1ad1d39..c01feef 100644 --- a/src/panel-triggers/partials/options_tab.html +++ b/src/panel-triggers/partials/options_tab.html @@ -23,7 +23,7 @@ label-class="width-9" label="Host proxy" checked="ctrl.panel.hostProxy" - on-change="ctrl.render()"> + on-change="ctrl.refresh()"> { - var zabbix = datasource.zabbix; - var showEvents = this.panel.showEvents.value; - var triggerFilter = this.panel.targets[ds]; + const zabbix = datasource.zabbix; + const showEvents = this.panel.showEvents.value; + const triggerFilter = this.panel.targets[ds]; + const showProxy = this.panel.hostProxy; + const getProxiesPromise = showProxy ? zabbix.getProxies() : () => []; // Replace template variables - var groupFilter = datasource.replaceTemplateVars(triggerFilter.group.filter); - var hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter); - var appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter); + const groupFilter = datasource.replaceTemplateVars(triggerFilter.group.filter); + const hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter); + const appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter); let triggersOptions = { showTriggers: showEvents @@ -222,7 +224,7 @@ export class TriggerPanelCtrl extends PanelCtrl { return Promise.all([ zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions), - zabbix.getProxies() + getProxiesPromise ]); }).then(([triggers, sourceProxies]) => { proxies = _.keyBy(sourceProxies, 'proxyid');