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

Problems: temporary disable macro expanding

Browse Source
This commit is contained in:
Alexander Zobnin
2020-07-21 09:58:46 +03:00
parent fdd3b2f2e3
commit b7c61a0a50
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/datasource-zabbix/zabbix/zabbix.ts
View File

@@ -340,8 +340,8 @@ export class Zabbix implements ZabbixConnector {
]); ]);
}) })
.then(([problems, triggers]) => joinTriggersWithProblems(problems, triggers)) .then(([problems, triggers]) => joinTriggersWithProblems(problems, triggers))
.then(triggers => this.filterTriggersByProxy(triggers, proxyFilter)) .then(triggers => this.filterTriggersByProxy(triggers, proxyFilter));
.then(triggers => this.expandUserMacro.bind(this)(triggers, true)); // .then(triggers => this.expandUserMacro.bind(this)(triggers, true));
} }
getProblemsHistory(groupFilter, hostFilter, appFilter, proxyFilter?, options?): Promise<ProblemDTO[]> { getProblemsHistory(groupFilter, hostFilter, appFilter, proxyFilter?, options?): Promise<ProblemDTO[]> {
@@ -376,8 +376,8 @@ export class Zabbix implements ZabbixConnector {
return Promise.all([Promise.resolve(problems), this.zabbixAPI.getTriggersByIds(triggerids)]); return Promise.all([Promise.resolve(problems), this.zabbixAPI.getTriggersByIds(triggerids)]);
}) })
.then(([problems, triggers]) => joinTriggersWithEvents(problems, triggers, { valueFromEvent })) .then(([problems, triggers]) => joinTriggersWithEvents(problems, triggers, { valueFromEvent }))
.then(triggers => this.filterTriggersByProxy(triggers, proxyFilter)) .then(triggers => this.filterTriggersByProxy(triggers, proxyFilter));
.then(triggers => this.expandUserMacro.bind(this)(triggers, true)); // .then(triggers => this.expandUserMacro.bind(this)(triggers, true));
} }
filterTriggersByProxy(triggers, proxyFilter) { filterTriggersByProxy(triggers, proxyFilter) {