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

Made histogram show entire range during loading. Fixed since/absolute time ranges

Browse Source
This commit is contained in:
Rashid Khan 2013-02-27 15:41:53 -07:00
parent fcffe1023a
commit f1bc8eebf5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panels/histogram/module.js
View File

@ -89,7 +89,7 @@ angular.module('kibana.histogram', [])
_.each(results.facets, function(v, k) {
// Null values at each end of the time range ensure we see entire range
if(_.isUndefined($scope.data[k]) || _segment == 0) {
var data = [[$scope.time.to.getTime(), null]];
var data = [[$scope.time.from.getTime(), null],[$scope.time.to.getTime(), null]];
} else {
var data = $scope.data[k].data
}
@ -99,11 +99,8 @@ angular.module('kibana.histogram', [])
segment_data.push([v['time'],v['count']])
});
data = segment_data.concat(data)
data.splice.apply(data,[1,0].concat(segment_data))
if(_segment == $scope.panel.index.length-1)
data.unshift([$scope.time.from.getTime(), null])
var series = {
data: {
label: $scope.panel.query[k].label || k,

5
panels/timepicker/module.js
View File

@ -136,11 +136,12 @@ angular.module('kibana.timepicker', [])
}
$scope.time_check = function(){
if(!(_.isUndefined($scope.timepicker))) {
var from = $scope.panel.mode === 'relative' ? time_ago($scope.panel.timespan) :
Date.parse($scope.timepicker.from.date + " " + $scope.timepicker.from.time)
new Date(Date.parse($scope.timepicker.from.date + " " + $scope.timepicker.from.time))
var to = $scope.panel.mode !== 'absolute' ? new Date() :
Date.parse($scope.timepicker.to.date + " " + $scope.timepicker.to.time)
new Date(Date.parse($scope.timepicker.to.date + " " + $scope.timepicker.to.time))
} else {
var from = $scope.panel.mode === 'relative' ? time_ago($scope.panel.timespan) :
$scope.time.from;