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

Show acknowledge author, fixes #1281

Browse Source 
Also fix displaying time
This commit is contained in:
Alexander Zobnin
2023-03-21 14:00:17 +01:00
parent f1c3c57c9f
commit f7150f9281
5 changed files with 62 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/datasource/datasource.ts
View File

@@ -630,11 +630,10 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
return responseHandler.handleTriggersResponse(alerts, groups, timeRange, target);
}
queryProblems(target: ZabbixMetricsQuery, timeRange, options) {
async queryProblems(target: ZabbixMetricsQuery, timeRange, options) {
const [timeFrom, timeTo] = timeRange;
const userIsEditor = contextSrv.isEditor || contextSrv.isGrafanaAdmin;
let proxies;
let showAckButton = true;
const showProblems = target.showProblems || ShowProblemTypes.Problems;
@@ -703,9 +702,13 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
} else {
getProblemsPromise = this.zabbix.getProblems(groupFilter, hostFilter, appFilter, proxyFilter, problemsOptions);
}
const getUsersPromise = this.zabbix.getUsers();
const problemsPromises = Promise.all([getProblemsPromise, getProxiesPromise])
.then(([problems, sourceProxies]) => {
let proxies;
let zabbixUsers;
const problemsPromises = Promise.all([getProblemsPromise, getProxiesPromise, getUsersPromise])
.then(([problems, sourceProxies, users]) => {
zabbixUsers = _.keyBy(users, 'userid');
proxies = _.keyBy(sourceProxies, 'proxyid');
return problems;
})
@@ -714,6 +717,7 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
.then((problems) => problemsHandler.filterTriggersPre(problems, replacedTarget))
.then((problems) => problemsHandler.sortProblems(problems, target))
.then((problems) => problemsHandler.addTriggerDataSource(problems, target))
.then((problems) => problemsHandler.formatAcknowledges(problems, zabbixUsers))
.then((problems) => problemsHandler.addTriggerHostProxy(problems, proxies));
return problemsPromises.then((problems) => {