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

show defaults at options tab

Browse Source
This commit is contained in:
Alexander Zobnin
2017-12-14 13:01:08 +03:00
parent f728d50a9f
commit 34e829bc23
5 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dist/panel-triggers/triggers_panel_ctrl.js vendored
View File

@@ -297,7 +297,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
triggers = this.sortTriggers(triggers);
// Limit triggers number
triggers = triggers.slice(0, this.panel.limit);
triggers = triggers.slice(0, this.panel.limit || PANEL_DEFAULTS.limit);
this.triggerList = triggers;
this.getCurrentTriggersPage();
@@ -545,7 +545,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
}, {
key: 'getCurrentTriggersPage',
value: function getCurrentTriggersPage() {
var pageSize = this.panel.pageSize || 10;
var pageSize = this.panel.pageSize || PANEL_DEFAULTS.pageSize;
var startPos = this.pageIndex * pageSize;
var endPos = Math.min(startPos + pageSize, this.triggerList.length);
this.currentTriggersPage = this.triggerList.slice(startPos, endPos);
@@ -603,8 +603,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
key: 'isNewTrigger',
value: function isNewTrigger(trigger) {
try {
var highlightNewerThanDefault = '1h';
var highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || highlightNewerThanDefault);
var highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || PANEL_DEFAULTS.highlightNewerThan);
var durationSec = Date.now() - trigger.lastchangeUnix * 1000;
return durationSec < highlightIntervalMs;
} catch (e) {