diff --git a/src/datasource-zabbix/datasource.ts b/src/datasource-zabbix/datasource.ts index 274cda8..01faaf3 100644 --- a/src/datasource-zabbix/datasource.ts +++ b/src/datasource-zabbix/datasource.ts @@ -11,7 +11,7 @@ import responseHandler from './responseHandler'; import problemsHandler from './problemsHandler'; import { Zabbix } from './zabbix/zabbix'; import { ZabbixAPIError } from './zabbix/connectors/zabbix_api/zabbixAPIConnector'; -import { ZabbixMetricsQuery, ZabbixDSOptions, VariableQueryTypes, ShowProblemTypes } from './types'; +import { ZabbixMetricsQuery, ZabbixDSOptions, VariableQueryTypes, ShowProblemTypes, ProblemDTO } from './types'; import { getBackendSrv } from '@grafana/runtime'; import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/data'; @@ -457,15 +457,15 @@ export class ZabbixDatasource extends DataSourceApi; if (showProblems === ShowProblemTypes.History) { problemsOptions.timeFrom = timeFrom; problemsOptions.timeTo = timeTo; + getProblemsPromise = this.zabbix.getProblemsHistory(groupFilter, hostFilter, appFilter, proxyFilter, problemsOptions); + } else { + getProblemsPromise = this.zabbix.getProblems(groupFilter, hostFilter, appFilter, proxyFilter, problemsOptions); } - const getProblemsPromise = showProblems === ShowProblemTypes.History ? - this.zabbix.getProblemsHistory(groupFilter, hostFilter, appFilter, proxyFilter, problemsOptions) : - this.zabbix.getProblems(groupFilter, hostFilter, appFilter, proxyFilter, problemsOptions); - const problemsPromises = Promise.all([ getProblemsPromise, getProxiesPromise diff --git a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts index ae1ec91..3a31eff 100644 --- a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts +++ b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts @@ -491,7 +491,7 @@ export class ZabbixAPIConnector { object: '0', evaltype: '0', sortfield: ['eventid'], - sortorder: 'ASC', + sortorder: 'DESC', select_acknowledges: 'extend', selectTags: 'extend', selectSuppressionData: ['maintenanceid', 'suppress_until'], diff --git a/src/datasource-zabbix/zabbix/zabbix.ts b/src/datasource-zabbix/zabbix/zabbix.ts index 830130a..75e1b53 100644 --- a/src/datasource-zabbix/zabbix/zabbix.ts +++ b/src/datasource-zabbix/zabbix/zabbix.ts @@ -307,7 +307,7 @@ export class Zabbix implements ZabbixConnector { .then(itServices => findByFilter(itServices, itServiceFilter)); } - getProblems(groupFilter, hostFilter, appFilter, proxyFilter?, options?) { + getProblems(groupFilter, hostFilter, appFilter, proxyFilter?, options?): Promise { const promises = [ this.getGroups(groupFilter), this.getHosts(groupFilter, hostFilter),