mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fixed missing index bug on rotated indices
This commit is contained in:
parent
6b6355e619
commit
7be784bc91
@ -13,7 +13,7 @@ If you need to configure the default dashboard, please see dashboards/default
|
|||||||
var config = new Settings(
|
var config = new Settings(
|
||||||
{
|
{
|
||||||
// By default this will attempt to reach ES at the same host you have
|
// 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 host
|
||||||
elasticsearch: "http://"+window.location.hostname+":9200",
|
elasticsearch: "http://"+window.location.hostname+":9200",
|
||||||
// elasticsearch: 'http://localhost:9200',
|
// elasticsearch: 'http://localhost:9200',
|
||||||
|
@ -127,9 +127,6 @@
|
|||||||
"timezone": "browser",
|
"timezone": "browser",
|
||||||
"spyable": true,
|
"spyable": true,
|
||||||
"zoomlinks": true,
|
"zoomlinks": true,
|
||||||
"index": [
|
|
||||||
"logstash-2013.04.11"
|
|
||||||
],
|
|
||||||
"fill": 0,
|
"fill": 0,
|
||||||
"linewidth": 2,
|
"linewidth": 2,
|
||||||
"bars": true,
|
"bars": true,
|
||||||
@ -161,10 +158,7 @@
|
|||||||
"arrangement": "horizontal",
|
"arrangement": "horizontal",
|
||||||
"chart": true,
|
"chart": true,
|
||||||
"counters": true,
|
"counters": true,
|
||||||
"count_pos": "above",
|
"count_pos": "above"
|
||||||
"index": [
|
|
||||||
"logstash-2013.04.11"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -228,10 +222,7 @@
|
|||||||
"@timestamp",
|
"@timestamp",
|
||||||
"@message"
|
"@message"
|
||||||
],
|
],
|
||||||
"sortable": true,
|
"sortable": true
|
||||||
"index": [
|
|
||||||
"logstash-2013.04.11"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ angular.module('kibana.histogram', [])
|
|||||||
$scope.get_data = function(segment,query_id) {
|
$scope.get_data = function(segment,query_id) {
|
||||||
delete $scope.panel.error
|
delete $scope.panel.error
|
||||||
// Make sure we have everything for the request to complete
|
// 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
|
return
|
||||||
|
|
||||||
if ($scope.panel.auto_int)
|
if ($scope.panel.auto_int)
|
||||||
@ -109,7 +109,7 @@ angular.module('kibana.histogram', [])
|
|||||||
|
|
||||||
$scope.panel.loading = true;
|
$scope.panel.loading = true;
|
||||||
var _segment = _.isUndefined(segment) ? 0 : segment
|
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
|
// Build the question part of the query
|
||||||
var queries = [];
|
var queries = [];
|
||||||
@ -200,7 +200,7 @@ angular.module('kibana.histogram', [])
|
|||||||
$scope.$emit('render')
|
$scope.$emit('render')
|
||||||
|
|
||||||
// If we still have segments left, get them
|
// 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)
|
$scope.get_data(_segment+1,query_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -219,7 +219,7 @@ angular.module('kibana.histogram', [])
|
|||||||
$scope.modal = {
|
$scope.modal = {
|
||||||
title: "Inspector",
|
title: "Inspector",
|
||||||
body : "<h5>Last Elasticsearch Query</h5><pre>"+
|
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)+
|
angular.toJson(JSON.parse(request.toString()),true)+
|
||||||
"'</pre>",
|
"'</pre>",
|
||||||
}
|
}
|
||||||
@ -240,7 +240,7 @@ angular.module('kibana.histogram', [])
|
|||||||
$scope.time = time;
|
$scope.time = time;
|
||||||
// Should I be storing the index on the panel? It causes errors if the index
|
// Should I be storing the index on the panel? It causes errors if the index
|
||||||
// goes away. Hmmm.
|
// 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
|
// Only calculate interval if auto_int is set, otherwise don't touch it
|
||||||
|
|
||||||
$scope.get_data();
|
$scope.get_data();
|
||||||
|
@ -55,11 +55,11 @@ angular.module('kibana.map', [])
|
|||||||
|
|
||||||
$scope.get_data = function() {
|
$scope.get_data = function() {
|
||||||
// Make sure we have everything for the request to complete
|
// 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
|
return
|
||||||
|
|
||||||
$scope.panel.loading = true;
|
$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
|
// Then the insert into facet and make the request
|
||||||
var request = request
|
var request = request
|
||||||
@ -96,7 +96,7 @@ angular.module('kibana.map', [])
|
|||||||
$scope.modal = {
|
$scope.modal = {
|
||||||
title: "Inspector",
|
title: "Inspector",
|
||||||
body : "<h5>Last Elasticsearch Query</h5><pre>"+
|
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)+
|
angular.toJson(JSON.parse(request.toString()),true)+
|
||||||
"'</pre>",
|
"'</pre>",
|
||||||
}
|
}
|
||||||
@ -104,7 +104,7 @@ angular.module('kibana.map', [])
|
|||||||
|
|
||||||
function set_time(time) {
|
function set_time(time) {
|
||||||
$scope.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();
|
$scope.get_data();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,11 +77,11 @@ angular.module('kibana.map2', [])
|
|||||||
$scope.get_data = function () {
|
$scope.get_data = function () {
|
||||||
|
|
||||||
// Make sure we have everything for the request to complete
|
// 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
|
return
|
||||||
|
|
||||||
$scope.panel.loading = true;
|
$scope.panel.loading = true;
|
||||||
var request = $scope.ejs.Request().indices($scope.panel.index);
|
var request = $scope.ejs.Request().indices($scope.index);
|
||||||
|
|
||||||
|
|
||||||
var metric = 'count';
|
var metric = 'count';
|
||||||
@ -149,13 +149,13 @@ angular.module('kibana.map2', [])
|
|||||||
$scope.populate_modal = function (request) {
|
$scope.populate_modal = function (request) {
|
||||||
$scope.modal = {
|
$scope.modal = {
|
||||||
title: "Inspector",
|
title: "Inspector",
|
||||||
body: "<h5>Last Elasticsearch Query</h5><pre>" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.panel.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'</pre>"
|
body: "<h5>Last Elasticsearch Query</h5><pre>" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'</pre>"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
function set_time(time) {
|
function set_time(time) {
|
||||||
$scope.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();
|
$scope.get_data();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,14 +54,14 @@ angular.module('kibana.parallelcoordinates', [])
|
|||||||
$scope.get_data = function (segment,query_id) {
|
$scope.get_data = function (segment,query_id) {
|
||||||
|
|
||||||
// Make sure we have everything for the request to complete
|
// 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;
|
return;
|
||||||
|
|
||||||
var _segment = _.isUndefined(segment) ? 0 : segment
|
var _segment = _.isUndefined(segment) ? 0 : segment
|
||||||
$scope.segment = _segment;
|
$scope.segment = _segment;
|
||||||
|
|
||||||
$scope.panel.loading = true;
|
$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(
|
.query(ejs.FilteredQuery(
|
||||||
ejs.QueryStringQuery($scope.panel.query || '*'),
|
ejs.QueryStringQuery($scope.panel.query || '*'),
|
||||||
ejs.RangeFilter($scope.time.field)
|
ejs.RangeFilter($scope.time.field)
|
||||||
@ -126,13 +126,13 @@ angular.module('kibana.parallelcoordinates', [])
|
|||||||
$scope.populate_modal = function (request) {
|
$scope.populate_modal = function (request) {
|
||||||
$scope.modal = {
|
$scope.modal = {
|
||||||
title: "Inspector",
|
title: "Inspector",
|
||||||
body: "<h5>Last Elasticsearch Query</h5><pre>" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.panel.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'</pre>"
|
body: "<h5>Last Elasticsearch Query</h5><pre>" + 'curl -XGET ' + config.elasticsearch + '/' + $scope.index + "/_search?pretty -d'\n" + angular.toJson(JSON.parse(request.toString()), true) + "'</pre>"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
function set_time(time) {
|
function set_time(time) {
|
||||||
$scope.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();
|
$scope.get_data();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,11 +93,11 @@ angular.module('kibana.pie', [])
|
|||||||
|
|
||||||
$scope.get_data = function() {
|
$scope.get_data = function() {
|
||||||
// Make sure we have everything for the request to complete
|
// 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
|
return
|
||||||
|
|
||||||
$scope.panel.loading = true;
|
$scope.panel.loading = true;
|
||||||
var request = $scope.ejs.Request().indices($scope.panel.index);
|
var request = $scope.ejs.Request().indices($scope.index);
|
||||||
|
|
||||||
// Terms mode
|
// Terms mode
|
||||||
if ($scope.panel.mode == "terms") {
|
if ($scope.panel.mode == "terms") {
|
||||||
@ -168,7 +168,7 @@ angular.module('kibana.pie', [])
|
|||||||
$scope.modal = {
|
$scope.modal = {
|
||||||
title: "Inspector",
|
title: "Inspector",
|
||||||
body : "<h5>Last Elasticsearch Query</h5><pre>"+
|
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)+
|
angular.toJson(JSON.parse(request.toString()),true)+
|
||||||
"'</pre>",
|
"'</pre>",
|
||||||
}
|
}
|
||||||
@ -182,7 +182,7 @@ angular.module('kibana.pie', [])
|
|||||||
|
|
||||||
function set_time(time) {
|
function set_time(time) {
|
||||||
$scope.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();
|
$scope.get_data();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ angular.module('kibana.timepicker', [])
|
|||||||
timefield : '@timestamp',
|
timefield : '@timestamp',
|
||||||
index : '_all',
|
index : '_all',
|
||||||
defaultindex : "_all",
|
defaultindex : "_all",
|
||||||
index_interval: "day",
|
index_interval: "none",
|
||||||
group : "default",
|
group : "default",
|
||||||
refresh : {
|
refresh : {
|
||||||
enable : false,
|
enable : false,
|
||||||
|
Loading…
Reference in New Issue
Block a user