show defaults at options tab

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

View File

@@ -74,10 +74,9 @@
<div class="gf-form">
<label class="gf-form-label width-8">Limit triggers</label>
<input class="gf-form-input width-5"
type="number"
type="number" placeholder="100"
ng-model="ctrl.panel.limit"
ng-model-onblur
ng-change="ctrl.refresh()">
ng-model-onblur ng-change="ctrl.refresh()">
</div>
</div>
@@ -95,10 +94,9 @@
<div class="gf-form">
<label class="gf-form-label width-10">Page size</label>
<input class="gf-form-input width-8"
type="number"
type="number" placeholder="10"
ng-model="ctrl.panel.pageSize"
ng-model-onblur
ng-change="ctrl.render()">
ng-model-onblur ng-change="ctrl.render()">
</div>
<gf-form-switch class="gf-form"
label-class="width-10"
@@ -108,9 +106,8 @@
</gf-form-switch>
<div class="gf-form">
<label class="gf-form-label width-10">Newer than</label>
<input class="gf-form-input width-8"
<input class="gf-form-input width-8" placeholder="1h"
ng-model="ctrl.panel.highlightNewerThan"
placeholder="1h"
ng-model-onblur ng-change="ctrl.render()">
</div>
<gf-form-switch class="gf-form"

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) {

File diff suppressed because one or more lines are too long