diff --git a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts index e8622cf..ae1ec91 100644 --- a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts +++ b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts @@ -364,7 +364,7 @@ export class ZabbixAPIConnector { source: '0', object: '0', sortfield: ['eventid'], - sortorder: 'ASC', + sortorder: 'DESC', evaltype: '0', // preservekeys: '1', groupids, diff --git a/src/panel-triggers/triggers_panel_ctrl.ts b/src/panel-triggers/triggers_panel_ctrl.ts index fbe76d0..52769ef 100644 --- a/src/panel-triggers/triggers_panel_ctrl.ts +++ b/src/panel-triggers/triggers_panel_ctrl.ts @@ -214,9 +214,9 @@ export class TriggerPanelCtrl extends MetricsPanelCtrl { sortTriggers(triggerList) { 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') { - triggerList = _.orderBy(triggerList, ['lastchangeUnix', 'priority', 'triggerid'], ['desc', 'desc', 'desc']); + triggerList = _.orderBy(triggerList, ['timestamp', 'priority', 'eventid'], ['desc', 'desc', 'desc']); } return triggerList; }