diff --git a/config.js b/config.js index f78faac98b6d8c..d9e8804ff2e71c 100644 --- a/config.js +++ b/config.js @@ -13,7 +13,7 @@ If you need to configure the default dashboard, please see dashboards/default var config = new Settings( { // By default this will attempt to reach ES at the same host you have - // elasticsearch installed on. You probable want to set it to the FQDN of your + // elasticsearch installed on. You probably want to set it to the FQDN of your // elasticsearch host elasticsearch: "http://"+window.location.hostname+":9200", // elasticsearch: 'http://localhost:9200', diff --git a/dashboards/default b/dashboards/default index cb0a3a2cdff527..68eea9348cad97 100644 --- a/dashboards/default +++ b/dashboards/default @@ -127,9 +127,6 @@ "timezone": "browser", "spyable": true, "zoomlinks": true, - "index": [ - "logstash-2013.04.11" - ], "fill": 0, "linewidth": 2, "bars": true, @@ -161,10 +158,7 @@ "arrangement": "horizontal", "chart": true, "counters": true, - "count_pos": "above", - "index": [ - "logstash-2013.04.11" - ] + "count_pos": "above" } ] }, @@ -228,10 +222,7 @@ "@timestamp", "@message" ], - "sortable": true, - "index": [ - "logstash-2013.04.11" - ] + "sortable": true } ] } diff --git a/panels/histogram/module.js b/panels/histogram/module.js index ee5f0eea053759..81ed0e62791b66 100644 --- a/panels/histogram/module.js +++ b/panels/histogram/module.js @@ -101,7 +101,7 @@ angular.module('kibana.histogram', []) $scope.get_data = function(segment,query_id) { delete $scope.panel.error // 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 if ($scope.panel.auto_int) @@ -109,7 +109,7 @@ angular.module('kibana.histogram', []) $scope.panel.loading = true; 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 = []; @@ -200,7 +200,7 @@ angular.module('kibana.histogram', []) $scope.$emit('render') // If we still have segments left, get them - if(_segment < $scope.panel.index.length-1) { + if(_segment < $scope.index.length-1) { $scope.get_data(_segment+1,query_id) } @@ -219,7 +219,7 @@ angular.module('kibana.histogram', []) $scope.modal = { title: "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)+
         "'
", } @@ -240,7 +240,7 @@ angular.module('kibana.histogram', []) $scope.time = time; // Should I be storing the index on the panel? It causes errors if the index // goes away. Hmmm. - $scope.panel.index = time.index || $scope.panel.index + $scope.index = time.index || $scope.index // Only calculate interval if auto_int is set, otherwise don't touch it $scope.get_data(); diff --git a/panels/map/module.js b/panels/map/module.js index cf8a824a15848e..44a2d9593e937b 100644 --- a/panels/map/module.js +++ b/panels/map/module.js @@ -55,11 +55,11 @@ angular.module('kibana.map', []) $scope.get_data = function() { // 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; - var request = $scope.ejs.Request().indices($scope.panel.index); + var request = $scope.ejs.Request().indices($scope.index); // Then the insert into facet and make the request var request = request @@ -96,7 +96,7 @@ angular.module('kibana.map', []) $scope.modal = { title: "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)+
         "'
", } @@ -104,7 +104,7 @@ angular.module('kibana.map', []) 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/map2/module.js b/panels/map2/module.js index 031288c3aa768f..e151bf87d4507b 100644 --- a/panels/map2/module.js +++ b/panels/map2/module.js @@ -77,11 +77,11 @@ angular.module('kibana.map2', []) $scope.get_data = function () { // 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; - var request = $scope.ejs.Request().indices($scope.panel.index); + var request = $scope.ejs.Request().indices($scope.index); var metric = 'count'; @@ -149,13 +149,13 @@ angular.module('kibana.map2', []) $scope.populate_modal = function (request) { $scope.modal = { title: "Inspector", - body: "
Last Elasticsearch Query
" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.panel.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'
" + body: "
Last Elasticsearch Query
" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'
" } }; 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/parallelcoordinates/module.js b/panels/parallelcoordinates/module.js index ee4fc8bc2f0226..8acac98383896b 100644 --- a/panels/parallelcoordinates/module.js +++ b/panels/parallelcoordinates/module.js @@ -54,14 +54,14 @@ angular.module('kibana.parallelcoordinates', []) $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)) + if (_.isUndefined($scope.index) || _.isUndefined($scope.time)) return; var _segment = _.isUndefined(segment) ? 0 : segment $scope.segment = _segment; $scope.panel.loading = true; - 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) @@ -126,13 +126,13 @@ angular.module('kibana.parallelcoordinates', []) $scope.populate_modal = function (request) { $scope.modal = { title: "Inspector", - body: "
Last Elasticsearch Query
" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.panel.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'
" + body: "
Last Elasticsearch Query
" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'
" } }; 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/pie/module.js b/panels/pie/module.js index 2dc0ddcbb538d3..30ebefba02b3fb 100644 --- a/panels/pie/module.js +++ b/panels/pie/module.js @@ -93,11 +93,11 @@ angular.module('kibana.pie', []) $scope.get_data = function() { // 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; - var request = $scope.ejs.Request().indices($scope.panel.index); + var request = $scope.ejs.Request().indices($scope.index); // Terms mode if ($scope.panel.mode == "terms") { @@ -168,7 +168,7 @@ angular.module('kibana.pie', []) $scope.modal = { title: "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)+
         "'
", } @@ -182,7 +182,7 @@ angular.module('kibana.pie', []) 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/timepicker/module.js b/panels/timepicker/module.js index 2f45de560f3266..19292c201e03ac 100644 --- a/panels/timepicker/module.js +++ b/panels/timepicker/module.js @@ -38,7 +38,7 @@ angular.module('kibana.timepicker', []) timefield : '@timestamp', index : '_all', defaultindex : "_all", - index_interval: "day", + index_interval: "none", group : "default", refresh : { enable : false,