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

always return array from problems requests

Browse Source
This commit is contained in:
Alexander Zobnin
2020-05-27 09:55:57 +03:00
parent 938b3cdc05
commit d2a1a7797b
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts
View File

@@ -425,7 +425,7 @@ export class ZabbixAPIConnector {
params.time_till = timeTo;
}
return this.request('problem.get', params);
return this.request('problem.get', params).then(utils.mustArray);
}
getTriggersByIds(triggerids: string[]) {
@@ -445,7 +445,7 @@ export class ZabbixAPIConnector {
preservekeys: '1',
};
return this.request('trigger.get', params);
return this.request('trigger.get', params).then(utils.mustArray);
}
getTriggers(groupids, hostids, applicationids, options) {
@@ -507,7 +507,7 @@ export class ZabbixAPIConnector {
params.sortorder = 'DESC';
}
return this.request('event.get', params);
return this.request('event.get', params).then(utils.mustArray);
}
getEventsHistory(groupids, hostids, applicationids, options) {
@@ -543,7 +543,7 @@ export class ZabbixAPIConnector {
params.value = value;
}
return this.request('event.get', params);
return this.request('event.get', params).then(utils.mustArray);
}
getExtendedEventData(eventids) {

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

@@ -340,7 +340,10 @@ export class Zabbix implements ZabbixConnector {
.then(query => this.zabbixAPI.getProblems(query.groupids, query.hostids, query.applicationids, options))
.then(problems => {
const triggerids = problems?.map(problem => problem.objectid);
return Promise.all([Promise.resolve(problems), this.zabbixAPI.getTriggersByIds(triggerids)]);
return Promise.all([
Promise.resolve(problems),
this.zabbixAPI.getTriggersByIds(triggerids)
]);
})
.then(([problems, triggers]) => joinTriggersWithProblems(problems, triggers))
.then(triggers => this.filterTriggersByProxy(triggers, proxyFilter))