Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

histogram: on error search remaining indices #851

Merged
merged 1 commit into from
Feb 24, 2014
Merged

histogram: on error search remaining indices #851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/app/panels/histogram/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,9 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
// Check for error and abort if found
if(!(_.isUndefined(results.error))) {
$scope.panel.error = $scope.parse_error(results.error);
return;
}

// Make sure we're still on the same query/queries
if($scope.query_id === query_id) {
else if($scope.query_id === query_id) {

var i = 0,
time_series,
Expand Down Expand Up @@ -495,14 +493,14 @@ function (angular, app, $, _, kbn, moment, timeSeries, numeral) {
// And slice to the right size
$scope.annotations = $scope.annotations.slice(0,$scope.panel.annotate.size);
}
}

// Tell the histogram directive to render.
$scope.$emit('render', data);
// Tell the histogram directive to render.
$scope.$emit('render', data);

// If we still have segments left, get them
if(segment < dashboard.indices.length-1) {
$scope.get_data(data,segment+1,query_id);
}
// If we still have segments left, get them
if(segment < dashboard.indices.length-1) {
$scope.get_data(data,segment+1,query_id);
}
});
};
Expand Down