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

set default for "Newer than" option

Browse Source
This commit is contained in:
Alexander Zobnin
2017-12-14 12:54:30 +03:00
parent 11ad51d5dc
commit f728d50a9f
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/panel-triggers/partials/options_tab.html vendored
View File

@@ -110,8 +110,8 @@
<label class="gf-form-label width-10">Newer than</label>
<input class="gf-form-input width-8"
ng-model="ctrl.panel.highlightNewerThan"
ng-model-onblur
ng-change="ctrl.render()">
placeholder="1h"
ng-model-onblur ng-change="ctrl.render()">
</div>
<gf-form-switch class="gf-form"
label-class="width-16"

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

@@ -602,9 +602,14 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
}, {
key: 'isNewTrigger',
value: function isNewTrigger(trigger) {
var highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan);
var durationSec = Date.now() - trigger.lastchangeUnix * 1000;
return durationSec < highlightIntervalMs;
try {
var highlightNewerThanDefault = '1h';
var highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || highlightNewerThanDefault);
var durationSec = Date.now() - trigger.lastchangeUnix * 1000;
return durationSec < highlightIntervalMs;
} catch (e) {
return false;
}
}
}, {
key: 'link',

2
dist/panel-triggers/triggers_panel_ctrl.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/panel-triggers/partials/options_tab.html
View File

@@ -110,8 +110,8 @@
<label class="gf-form-label width-10">Newer than</label>
<input class="gf-form-input width-8"
ng-model="ctrl.panel.highlightNewerThan"
ng-model-onblur
ng-change="ctrl.render()">
placeholder="1h"
ng-model-onblur ng-change="ctrl.render()">
</div>
<gf-form-switch class="gf-form"
label-class="width-16"

11
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -458,9 +458,14 @@ export class TriggerPanelCtrl extends PanelCtrl {
}
isNewTrigger(trigger) {
const highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan);
const durationSec = (Date.now() - trigger.lastchangeUnix * 1000);
return durationSec < highlightIntervalMs;
try {
const highlightNewerThanDefault = '1h';
const highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || highlightNewerThanDefault);
const durationSec = (Date.now() - trigger.lastchangeUnix * 1000);
return durationSec < highlightIntervalMs;
} catch (e) {
return false;
}
}
link(scope, elem, attrs, ctrl) {