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

Problems: fix problems history

Browse Source
This commit is contained in:
Alexander Zobnin
2020-07-21 12:54:54 +03:00
parent 2bd04e9c22
commit e06298cc02
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ import responseHandler from './responseHandler';
import problemsHandler from './problemsHandler'; import problemsHandler from './problemsHandler';
import { Zabbix } from './zabbix/zabbix'; import { Zabbix } from './zabbix/zabbix';
import { ZabbixAPIError } from './zabbix/connectors/zabbix_api/zabbixAPIConnector'; 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 { getBackendSrv } from '@grafana/runtime';
import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/data'; import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/data';
@@ -457,15 +457,15 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
problemsOptions.severities = severities; problemsOptions.severities = severities;
} }
let getProblemsPromise: Promise<ProblemDTO[]>;
if (showProblems === ShowProblemTypes.History) { if (showProblems === ShowProblemTypes.History) {
problemsOptions.timeFrom = timeFrom; problemsOptions.timeFrom = timeFrom;
problemsOptions.timeTo = timeTo; 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([ const problemsPromises = Promise.all([
getProblemsPromise, getProblemsPromise,
getProxiesPromise getProxiesPromise

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

@@ -491,7 +491,7 @@ export class ZabbixAPIConnector {
object: '0', object: '0',
evaltype: '0', evaltype: '0',
sortfield: ['eventid'], sortfield: ['eventid'],
sortorder: 'ASC', sortorder: 'DESC',
select_acknowledges: 'extend', select_acknowledges: 'extend',
selectTags: 'extend', selectTags: 'extend',
selectSuppressionData: ['maintenanceid', 'suppress_until'], selectSuppressionData: ['maintenanceid', 'suppress_until'],

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

@@ -307,7 +307,7 @@ export class Zabbix implements ZabbixConnector {
.then(itServices => findByFilter(itServices, itServiceFilter)); .then(itServices => findByFilter(itServices, itServiceFilter));
} }
getProblems(groupFilter, hostFilter, appFilter, proxyFilter?, options?) { getProblems(groupFilter, hostFilter, appFilter, proxyFilter?, options?): Promise<ProblemDTO[]> {
const promises = [ const promises = [
this.getGroups(groupFilter), this.getGroups(groupFilter),
this.getHosts(groupFilter, hostFilter), this.getHosts(groupFilter, hostFilter),