|
|
|
@ -111,7 +111,7 @@ angular.module('kibana.table', []) |
|
|
|
|
$scope.panel.error = false; |
|
|
|
|
|
|
|
|
|
// Make sure we have everything for the request to complete
|
|
|
|
|
if(_.isUndefined($scope.panel.index) || _.isUndefined($scope.time)) |
|
|
|
|
if(_.isUndefined($scope.index) || _.isUndefined($scope.time)) |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
$scope.panel.loading = true; |
|
|
|
@ -119,7 +119,7 @@ angular.module('kibana.table', []) |
|
|
|
|
var _segment = _.isUndefined(segment) ? 0 : segment |
|
|
|
|
$scope.segment = _segment; |
|
|
|
|
|
|
|
|
|
var request = $scope.ejs.Request().indices($scope.panel.index[_segment]) |
|
|
|
|
var request = $scope.ejs.Request().indices($scope.index[_segment]) |
|
|
|
|
.query(ejs.FilteredQuery( |
|
|
|
|
ejs.QueryStringQuery($scope.panel.query || '*'), |
|
|
|
|
ejs.RangeFilter($scope.time.field) |
|
|
|
@ -184,7 +184,7 @@ angular.module('kibana.table', []) |
|
|
|
|
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 |
|
|
|
|
_segment+1 < $scope.index.length |
|
|
|
|
) { |
|
|
|
|
$scope.get_data(_segment+1,$scope.query_id) |
|
|
|
|
} |
|
|
|
@ -196,7 +196,7 @@ angular.module('kibana.table', []) |
|
|
|
|
$scope.modal = { |
|
|
|
|
title: "Table Inspector", |
|
|
|
|
body : "<h5>Last Elasticsearch Query</h5><pre>"+ |
|
|
|
|
'curl -XGET '+config.elasticsearch+'/'+$scope.panel.index+"/_search?pretty -d'\n"+ |
|
|
|
|
'curl -XGET '+config.elasticsearch+'/'+$scope.index+"/_search?pretty -d'\n"+ |
|
|
|
|
angular.toJson(JSON.parse(request.toString()),true)+ |
|
|
|
|
"'</pre>",
|
|
|
|
|
}
|
|
|
|
@ -223,7 +223,7 @@ angular.module('kibana.table', []) |
|
|
|
|
|
|
|
|
|
function set_time(time) { |
|
|
|
|
$scope.time = time; |
|
|
|
|
$scope.panel.index = _.isUndefined(time.index) ? $scope.panel.index : time.index |
|
|
|
|
$scope.index = _.isUndefined(time.index) ? $scope.index : time.index |
|
|
|
|
$scope.get_data(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|