github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 10:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Avoid indices that do not have the configured time field

Browse source 
The field stats api can, in certain situations, return an index even
when that index does not contain any field that matches the configured
time field name in the index pattern. We filter those out and treat it
as if they were never returned at all.
This commit is contained in:
Court Ewing 2015-11-18 14:45:58 -05:00
parent bf621f5df6
commit ca93dbb086
2 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ui/public/index_patterns/__tests__/calculate_indices.js
View file

@ -12,11 +12,13 @@ describe('ui/index_patterns/_calculate_indices', () => {
let response; let response;
let config; let config;
let constraints; let constraints;
let indices;
beforeEach(ngMock.module('kibana', ($provide) => { beforeEach(ngMock.module('kibana', ($provide) => {
response = { response = {
indices: { indices: {
'mock-*': 'irrelevant, is ignored' 'mock-*': { fields: { '@something': {} } },
'ignore-*': { fields: {} }
} }
}; };
@ -37,7 +39,9 @@ describe('ui/index_patterns/_calculate_indices', () => {
})); }));
function run({ start = undefined, stop = undefined } = {}) { function run({ start = undefined, stop = undefined } = {}) {
calculateIndices('wat-*-no', '@something', start, stop); calculateIndices('wat-*-no', '@something', start, stop).then(value => {
indices = value;
});
$rootScope.$apply(); $rootScope.$apply();
config = _.first(es.fieldStats.lastCall.args); config = _.first(es.fieldStats.lastCall.args);
constraints = config.body.index_constraints; constraints = config.body.index_constraints;
@ -104,6 +108,14 @@ describe('ui/index_patterns/_calculate_indices', () => {
}); });
}); });
describe('response filtering', () => {
it('filters out any indices that have empty fields', () => {
run();
expect(_.includes(indices, 'mock-*')).to.be(true);
expect(_.includes(indices, 'ignore-*')).to.be(false);
});
});
describe('response sorting', function () { describe('response sorting', function () {
require('testUtils/noDigestPromises').activateForSuite(); require('testUtils/noDigestPromises').activateForSuite();

19
src/ui/public/index_patterns/_calculate_indices.js
View file

@ -15,6 +15,15 @@ define(function (require) {
}; };
} }
// returns a new object with any indexes removed that do not include the
// time field
//
// fixme: this really seems like a bug that needs to be fixed in
// elasticsearch itself, but this workaround will do for now
function omitIndicesWithoutTimeField(indices, timeFieldName) {
return _.pick(indices, index => index.fields[timeFieldName]);
}
return function CalculateIndicesFactory(Promise, es) { return function CalculateIndicesFactory(Promise, es) {
// Uses the field stats api to determine the names of indices that need to // Uses the field stats api to determine the names of indices that need to
@ -22,7 +31,9 @@ define(function (require) {
// given time range // given time range
function calculateIndices(pattern, timeFieldName, start, stop, sortDirection) { function calculateIndices(pattern, timeFieldName, start, stop, sortDirection) {
return getFieldStats(pattern, timeFieldName, start, stop) return getFieldStats(pattern, timeFieldName, start, stop)
.then(resp => sortIndexStats(resp, timeFieldName, sortDirection)); .then(resp => resp.indices)
.then(indices => omitIndicesWithoutTimeField(indices, timeFieldName))
.then(indices => sortIndexStats(indices, timeFieldName, sortDirection));
}; };
// creates the configuration hash that must be passed to the elasticsearch // creates the configuration hash that must be passed to the elasticsearch
@ -48,14 +59,14 @@ define(function (require) {
}); });
} }
function sortIndexStats(resp, timeFieldName, sortDirection) { function sortIndexStats(indices, timeFieldName, sortDirection) {
if (!sortDirection) return _.keys(resp.indices); if (!sortDirection) return _.keys(indices);
// FIXME: Once https://github.com/elastic/elasticsearch/issues/14404 is closed // FIXME: Once https://github.com/elastic/elasticsearch/issues/14404 is closed
// this should be sorting based on the sortable value of a field. // this should be sorting based on the sortable value of a field.
const edgeKey = sortDirection === 'desc' ? 'max_value' : 'min_value'; const edgeKey = sortDirection === 'desc' ? 'max_value' : 'min_value';
return _(resp.indices) return _(indices)
.map((stats, index) => ( .map((stats, index) => (
{ index, edge: stats.fields[timeFieldName][edgeKey] } { index, edge: stats.fields[timeFieldName][edgeKey] }
)) ))