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

fixed bug with time range in graphite panel

Browse Source
This commit is contained in:
Torkel Odegaard 2014-01-06 15:11:27 +01:00
parent 1540e95b97
commit bb1e73dc61
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/panels/graphite/module.js
View File

@ -260,18 +260,19 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
}; };
$scope.updateTimeRange = function () { $scope.updateTimeRange = function () {
$scope.range = filterSrv.timeRange(); var range = filterSrv.timeRange();
$scope.interval = $scope.panel.interval; var interval = filterSrv.timeRange();
if ($scope.panel.auto_int) { if ($scope.panel.auto_int) {
if ($scope.range) { if (range) {
$scope.interval = kbn.secondsToHms( interval = kbn.secondsToHms(
kbn.calculate_interval($scope.range, $scope.range, $scope.panel.resolution, 0) / 1000 kbn.calculate_interval(range.from, range.to, $scope.panel.resolution, 0) / 1000
); );
} }
} }
$scope.panel.interval = $scope.interval || '10m';
$scope.interval = $scope.panel.interval; $scope.interval = $scope.panel.interval = interval || '10m';
$scope.range = range;
}; };
$scope.colors = [ $scope.colors = [