diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd273541f7..0fcda5b77ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.7.0 (unreleased) + +**Fixes** +- [Issue #655](https://github.com/grafana/grafana/issues/655). General: Auto refresh not initiated / started after dashboard loading + # 1.7.0-rc1 (2014-08-05) **New features or improvements** diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js index 11bd9c66cf0..d8cf64a0ca2 100644 --- a/src/app/controllers/dash.js +++ b/src/app/controllers/dash.js @@ -41,6 +41,11 @@ function (angular, $, config, _) { window.document.title = 'Grafana - ' + $scope.dashboard.title; + // start auto refresh + if($scope.dashboard.refresh) { + $scope.dashboard.set_interval($scope.dashboard.refresh); + } + dashboardKeybindings.shortcuts($scope); $scope.emitAppEvent("dashboard-loaded", $scope.dashboard); diff --git a/src/app/services/dashboard/dashboardModel.js b/src/app/services/dashboard/dashboardModel.js index ecb5af07494..13642984526 100644 --- a/src/app/services/dashboard/dashboardModel.js +++ b/src/app/services/dashboard/dashboardModel.js @@ -28,6 +28,7 @@ function (angular, $, kbn, _) { this.nav = data.nav || []; this.time = data.time || { from: 'now-6h', to: 'now' }; this.templating = data.templating || { list: [] }; + this.refresh = data.refresh; if (this.nav.length === 0) { this.nav.push({ type: 'timepicker' });