IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

align refresh interval

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2016-03-02 13:15:35 +09:00
parent 0da4168836
commit 7da57e0aa5
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/dashboard/timeSrv.js
View File

@@ -65,11 +65,17 @@ define([
} }
}; };
this.setAutoRefresh = function (interval) { this.setAutoRefresh = function (interval, align) {
this.dashboard.refresh = interval; this.dashboard.refresh = interval;
if (interval) { if (interval) {
var _i = kbn.interval_to_ms(interval); var _i = kbn.interval_to_ms(interval);
this.start_scheduled_refresh(_i); var wait_ms = 0;
if (align) {
wait_ms = _i - (Date.now() % _i);
}
$timeout(function () {
self.start_scheduled_refresh(_i);
}, wait_ms);
} else { } else {
this.cancel_scheduled_refresh(); this.cancel_scheduled_refresh();
} }

1
public/app/features/dashboard/timepicker/dropdown.html
View File

@@ -40,6 +40,7 @@
<div class="gf-form max-width-28"> <div class="gf-form max-width-28">
<select ng-model="ctrl.refresh.value" class="gf-form-input input-medium" ng-options="f.value as f.text for f in ctrl.refresh.options"></select> <select ng-model="ctrl.refresh.value" class="gf-form-input input-medium" ng-options="f.value as f.text for f in ctrl.refresh.options"></select>
</div> </div>
<editor-checkbox text="Align" model="ctrl.refresh.align"></editor-checkbox>
<div class="gf-form"> <div class="gf-form">
<button type="submit" class="btn gf-form-btn btn-secondary" ng-click="ctrl.applyCustom();" ng-disabled="!timeForm.$valid">Apply</button> <button type="submit" class="btn gf-form-btn btn-secondary" ng-click="ctrl.applyCustom();" ng-disabled="!timeForm.$valid">Apply</button>
</div> </div>

2
public/app/features/dashboard/timepicker/timepicker.ts
View File

@@ -109,7 +109,7 @@ export class TimePickerCtrl {
applyCustom() { applyCustom() {
if (this.refresh.value !== this.dashboard.refresh) { if (this.refresh.value !== this.dashboard.refresh) {
this.timeSrv.setAutoRefresh(this.refresh.value); this.timeSrv.setAutoRefresh(this.refresh.value, this.refresh.align);
} }
this.timeSrv.setTime(this.timeRaw, true); this.timeSrv.setTime(this.timeRaw, true);