From b7c61a0a509377e8ac403d5f844fb718d7b6c5f9 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 21 Jul 2020 09:58:46 +0300 Subject: [PATCH] Problems: temporary disable macro expanding --- src/datasource-zabbix/zabbix/zabbix.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/datasource-zabbix/zabbix/zabbix.ts b/src/datasource-zabbix/zabbix/zabbix.ts index fee7c7d..830130a 100644 --- a/src/datasource-zabbix/zabbix/zabbix.ts +++ b/src/datasource-zabbix/zabbix/zabbix.ts @@ -340,8 +340,8 @@ export class Zabbix implements ZabbixConnector { ]); }) .then(([problems, triggers]) => joinTriggersWithProblems(problems, triggers)) - .then(triggers => this.filterTriggersByProxy(triggers, proxyFilter)) - .then(triggers => this.expandUserMacro.bind(this)(triggers, true)); + .then(triggers => this.filterTriggersByProxy(triggers, proxyFilter)); + // .then(triggers => this.expandUserMacro.bind(this)(triggers, true)); } getProblemsHistory(groupFilter, hostFilter, appFilter, proxyFilter?, options?): Promise { @@ -376,8 +376,8 @@ export class Zabbix implements ZabbixConnector { return Promise.all([Promise.resolve(problems), this.zabbixAPI.getTriggersByIds(triggerids)]); }) .then(([problems, triggers]) => joinTriggersWithEvents(problems, triggers, { valueFromEvent })) - .then(triggers => this.filterTriggersByProxy(triggers, proxyFilter)) - .then(triggers => this.expandUserMacro.bind(this)(triggers, true)); + .then(triggers => this.filterTriggersByProxy(triggers, proxyFilter)); + // .then(triggers => this.expandUserMacro.bind(this)(triggers, true)); } filterTriggersByProxy(triggers, proxyFilter) {