|
|
@@ -4,11 +4,12 @@ angular.module('kibana.table', [])
|
|
|
// Set and populate defaults
|
|
|
var _d = {
|
|
|
query : "*",
|
|
|
- size : 100,
|
|
|
+ size : 100, // Per page
|
|
|
+ pages : 5, // Pages available
|
|
|
offset : 0,
|
|
|
sort : ['@timestamp','desc'],
|
|
|
group : "default",
|
|
|
- style : {},
|
|
|
+ style : {'font-size': '9pt'},
|
|
|
fields : [],
|
|
|
sortable: true,
|
|
|
spyable: true,
|
|
|
@@ -74,14 +75,16 @@ angular.module('kibana.table', [])
|
|
|
eventBus.broadcast($scope.$id,$scope.panel.group,'query',$scope.panel.query);
|
|
|
}
|
|
|
|
|
|
- $scope.get_data = function() {
|
|
|
+ $scope.get_data = function(segment,query_id) {
|
|
|
// Make sure we have everything for the request to complete
|
|
|
if(_.isUndefined($scope.panel.index) || _.isUndefined($scope.time))
|
|
|
return
|
|
|
|
|
|
$scope.panel.loading = true;
|
|
|
|
|
|
- var request = $scope.ejs.Request().indices($scope.panel.index)
|
|
|
+ var _segment = _.isUndefined(segment) ? 0 : segment
|
|
|
+
|
|
|
+ var request = $scope.ejs.Request().indices($scope.panel.index[_segment])
|
|
|
.query(ejs.FilteredQuery(
|
|
|
ejs.QueryStringQuery($scope.panel.query || '*'),
|
|
|
ejs.RangeFilter($scope.time.field)
|
|
|
@@ -89,8 +92,7 @@ angular.module('kibana.table', [])
|
|
|
.to($scope.time.to)
|
|
|
)
|
|
|
)
|
|
|
- .size($scope.panel.size)
|
|
|
- .from($scope.panel.offset)
|
|
|
+ .size($scope.panel.size*$scope.panel.pages)
|
|
|
.sort($scope.panel.sort[0],$scope.panel.sort[1]);
|
|
|
|
|
|
$scope.populate_modal(request)
|
|
|
@@ -101,18 +103,57 @@ angular.module('kibana.table', [])
|
|
|
results.then(function(results) {
|
|
|
$scope.panel.loading = false;
|
|
|
|
|
|
+ if(_segment === 0) {
|
|
|
+ $scope.data = [];
|
|
|
+ query_id = $scope.query_id = new Date().getTime()
|
|
|
+ }
|
|
|
+
|
|
|
if(_.isUndefined(results)) {
|
|
|
$scope.panel.error = 'Your query was unsuccessful';
|
|
|
return;
|
|
|
}
|
|
|
$scope.panel.error = false;
|
|
|
$scope.hits = results.hits.total;
|
|
|
- $scope.data = _.map(results.hits.hits, function(hit) {
|
|
|
- return flatten_json(hit['_source']);
|
|
|
- });
|
|
|
- $scope.all_fields = get_all_fields(results);
|
|
|
|
|
|
+
|
|
|
+ // Check that we're still on the same query, if not stop
|
|
|
+ if($scope.query_id === query_id) {
|
|
|
+ $scope.data= $scope.data.concat(_.map(results.hits.hits, function(hit) {
|
|
|
+ return flatten_json(hit['_source']);
|
|
|
+ }));
|
|
|
+
|
|
|
+ // Sort the data
|
|
|
+ $scope.data = _.sortBy($scope.data, function(v){
|
|
|
+ return v[$scope.panel.sort[0]]
|
|
|
+ });
|
|
|
+
|
|
|
+ // Reverse if needed
|
|
|
+ if($scope.panel.sort[1] == 'desc')
|
|
|
+ $scope.data.reverse();
|
|
|
+
|
|
|
+ // Keep only what we need for the set
|
|
|
+ $scope.data = $scope.data.slice(0,$scope.panel.size * $scope.panel.pages)
|
|
|
+
|
|
|
+ } else {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ // This breaks, use $scope.data for this
|
|
|
+ $scope.all_fields = get_all_fields(results);
|
|
|
+
|
|
|
broadcast_results();
|
|
|
+
|
|
|
+ // If we're not sorting in reverse chrono order, query every index for
|
|
|
+ // size*pages results
|
|
|
+ // Otherwise, only get size*pages results then stop querying
|
|
|
+ if(
|
|
|
+ ($scope.data.length < $scope.panel.size*$scope.panel.pages ||
|
|
|
+ !(($scope.panel.sort[0] === $scope.time.field) && $scope.panel.sort[1] === 'desc')) &&
|
|
|
+ _segment+1 < $scope.panel.index.length
|
|
|
+ ) {
|
|
|
+ $scope.get_data(_segment+1,$scope.query_id)
|
|
|
+ }
|
|
|
+
|
|
|
});
|
|
|
}
|
|
|
|
Rashid Khan