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

Problems: fix sorting

Browse Source
This commit is contained in:
Alexander Zobnin
2020-07-21 09:47:06 +03:00
parent 4293e519c3
commit 6a1145c9fc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,7 +364,7 @@ export class ZabbixAPIConnector {
source: '0', source: '0',
object: '0', object: '0',
sortfield: ['eventid'], sortfield: ['eventid'],
sortorder: 'ASC', sortorder: 'DESC',
evaltype: '0', evaltype: '0',
// preservekeys: '1', // preservekeys: '1',
groupids, groupids,

4
src/panel-triggers/triggers_panel_ctrl.ts
View File

@@ -214,9 +214,9 @@ export class TriggerPanelCtrl extends MetricsPanelCtrl {
sortTriggers(triggerList) { sortTriggers(triggerList) {
if (this.panel.sortProblems === 'priority') { if (this.panel.sortProblems === 'priority') {
triggerList = _.orderBy(triggerList, ['priority', 'lastchangeUnix', 'triggerid'], ['desc', 'desc', 'desc']); triggerList = _.orderBy(triggerList, ['priority', 'timestamp', 'eventid'], ['desc', 'desc', 'desc']);
} else if (this.panel.sortProblems === 'lastchange') { } else if (this.panel.sortProblems === 'lastchange') {
triggerList = _.orderBy(triggerList, ['lastchangeUnix', 'priority', 'triggerid'], ['desc', 'desc', 'desc']); triggerList = _.orderBy(triggerList, ['timestamp', 'priority', 'eventid'], ['desc', 'desc', 'desc']);
} }
return triggerList; return triggerList;
} }