From f24b8186c4dd015faedf7314dd7b45d6190631c8 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Mon, 6 May 2013 11:23:07 -0700 Subject: [PATCH] Missed a couple panel.index mentions --- panels/hits/module.js | 8 ++++---- panels/table/module.js | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/panels/hits/module.js b/panels/hits/module.js index eb40eeb852e..53f7f838e30 100644 --- a/panels/hits/module.js +++ b/panels/hits/module.js @@ -58,11 +58,11 @@ angular.module('kibana.hits', []) $scope.panel.loading = true; // 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 var _segment = _.isUndefined(segment) ? 0 : segment - var request = $scope.ejs.Request().indices($scope.panel.index[_segment]); + var request = $scope.ejs.Request().indices($scope.index[_segment]); // Build the question part of the query var queries = []; @@ -121,7 +121,7 @@ angular.module('kibana.hits', []) i++; }); $scope.$emit('render'); - if(_segment < $scope.panel.index.length-1) + if(_segment < $scope.index.length-1) $scope.get_data(_segment+1,query_id) } @@ -143,7 +143,7 @@ angular.module('kibana.hits', []) 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(); } diff --git a/panels/table/module.js b/panels/table/module.js index 6dd0caa553a..672361f9956 100644 --- a/panels/table/module.js +++ b/panels/table/module.js @@ -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 : "
Last Elasticsearch Query
"+
-          '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)+
         "'
", } @@ -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(); }