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 caps in line histogram when using segmented loading. Removed the remaining $watch calls

Browse Source
This commit is contained in:
Rashid Khan 2013-02-27 14:47:43 -07:00
parent ced5f47960
commit fcffe1023a
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panels/histogram/module.js
View File

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

2
panels/timepicker/module.html
View File

@ -53,7 +53,7 @@
<a ng-click="set_mode('absolute')" ng-class="{'strong': (panel.mode == 'absolute')}">Absolute</a> | <a ng-click="set_mode('absolute')" ng-class="{'strong': (panel.mode == 'absolute')}">Absolute</a> |
<a ng-click="set_mode('since')" ng-class="{'strong': (panel.mode == 'since')}">Since</a> <a ng-click="set_mode('since')" ng-class="{'strong': (panel.mode == 'since')}">Since</a>
<span ng-hide="panel.mode == 'absolute'"> | <span ng-hide="panel.mode == 'absolute'"> |
<input type="checkbox" ng-model="panel.refresh.enable"> Auto-refresh <input type="checkbox" ng-model="panel.refresh.enable" ng-change='refresh();'> Auto-refresh
<span ng-class="{'ng-cloak': !panel.refresh.enable}"> <span ng-class="{'ng-cloak': !panel.refresh.enable}">
every <a data-title="<small>Auto-refresh Settings</small>" data-placement="bottom" bs-popover="'panels/timepicker/refreshctrl.html'">{{panel.refresh.interval}}s</a>. every <a data-title="<small>Auto-refresh Settings</small>" data-placement="bottom" bs-popover="'panels/timepicker/refreshctrl.html'">{{panel.refresh.interval}}s</a>.
</span> </span>

30
panels/timepicker/module.js
View File

@ -83,23 +83,21 @@ angular.module('kibana.timepicker', [])
eventBus.register($scope,"get_time", function(event,id) { eventBus.register($scope,"get_time", function(event,id) {
eventBus.broadcast($scope.$id,id,'time',$scope.time) eventBus.broadcast($scope.$id,id,'time',$scope.time)
}); });
}
$scope.$watch('panel.refresh.enable', function() {$scope.refresh()}); $scope.set_interval = function (refresh_interval) {
$scope.$watch('panel.refresh.interval', function() { $scope.panel.refresh.interval = refresh_interval
$timeout(function(){ if(_.isNumber($scope.panel.refresh.interval)) {
if(_.isNumber($scope.panel.refresh.interval)) { if($scope.panel.refresh.interval < $scope.panel.refresh.min) {
if($scope.panel.refresh.interval < $scope.panel.refresh.min) { $scope.panel.refresh.interval = $scope.panel.refresh.min
$scope.panel.refresh.interval = $scope.panel.refresh.min timer.cancel($scope.refresh_timer)
timer.cancel($scope.refresh_timer) return;
return; }
} timer.cancel($scope.refresh_timer)
timer.cancel($scope.refresh_timer) $scope.refresh()
$scope.refresh() } else {
} else { timer.cancel($scope.refresh_timer)
timer.cancel($scope.refresh_timer) }
}
});
});
} }
$scope.refresh = function() { $scope.refresh = function() {

2
panels/timepicker/refreshctrl.html
View File

@ -1,5 +1,5 @@
<form name="refreshPopover" class='form-inline input-append' style="margin:0px"> <form name="refreshPopover" class='form-inline input-append' style="margin:0px">
<label><small>Interval (seconds)</small></label><br> <label><small>Interval (seconds)</small></label><br>
<input type="number" class="input-mini" ng-model="refresh_interval"> <input type="number" class="input-mini" ng-model="refresh_interval">
<button type="button" class="btn" ng-click="panel.refresh.interval=refresh_interval;dismiss()"><i class="icon-ok"></i></button> <button type="button" class="btn" ng-click="set_interval(refresh_interval);dismiss()"><i class="icon-ok"></i></button>
</form> </form>