-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8462 from elastic/jasper/backport/8421/5.0
[backport] PR #8421 to 5.0
- Loading branch information
Showing
11 changed files
with
205 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
src/core_plugins/kibana/server/routes/api/ingest/register_field_capabilities.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import _ from 'lodash'; | ||
| import handleESError from '../../../lib/handle_es_error'; | ||
|
|
||
| export function registerFieldCapabilities(server) { | ||
| server.route({ | ||
| path: '/api/kibana/{indices}/field_capabilities', | ||
| method: ['GET'], | ||
| handler: function (req, reply) { | ||
| const callWithRequest = server.plugins.elasticsearch.callWithRequest; | ||
| const indices = req.params.indices || ''; | ||
|
|
||
| return callWithRequest(req, 'fieldStats', { | ||
| fields: '*', | ||
| level: 'cluster', | ||
| index: indices, | ||
| allowNoIndices: false | ||
| }) | ||
| .catch((error) => { | ||
| reply(handleESError(error)); | ||
| }) | ||
| .then((res) => { | ||
| const fields = _.get(res, 'indices._all.fields', {}); | ||
| const fieldsFilteredValues = _.mapValues(fields, (value) => { | ||
| return _.pick(value, ['searchable', 'aggregatable']); | ||
| }); | ||
|
|
||
| reply({fields: fieldsFilteredValues}); | ||
| }); | ||
| } | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
src/ui/public/index_patterns/_enhance_fields_with_capabilities.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import chrome from 'ui/chrome'; | ||
| import _ from 'lodash'; | ||
|
|
||
| export default function ($http) { | ||
|
|
||
| return function (fields, indices) { | ||
| return $http.get(chrome.addBasePath(`/api/kibana/${indices}/field_capabilities`)) | ||
| .then((res) => { | ||
| const stats = _.get(res, 'data.fields', {}); | ||
|
|
||
| return _.map(fields, (field) => { | ||
| return _.assign(field, stats[field.name]); | ||
| }); | ||
| }); | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| define(function (require) { | ||
| var Promise = require('bluebird'); | ||
| var _ = require('intern/dojo/node!lodash'); | ||
| var expect = require('intern/dojo/node!expect.js'); | ||
|
|
||
| return function (bdd, scenarioManager, request) { | ||
| bdd.describe('field_capabilities API', function postIngest() { | ||
|
|
||
| bdd.before(function () { | ||
| return scenarioManager.client.create({ | ||
| index: 'foo-1', | ||
| type: 'bar', | ||
| id: '1', | ||
| body: { | ||
| foo: 'bar' | ||
| } | ||
| }) | ||
| .then(function () { | ||
| return scenarioManager.client.create({ | ||
| index: 'foo-2', | ||
| type: 'bar', | ||
| id: '2', | ||
| body: { | ||
| baz: 'bar' | ||
| } | ||
| }); | ||
| }) | ||
| .then(function () { | ||
| return scenarioManager.client.indices.refresh({ | ||
| index: ['foo-1', 'foo-2'] | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| bdd.after(function () { | ||
| return scenarioManager.reload('emptyKibana') | ||
| .then(function () { | ||
| scenarioManager.client.indices.delete({ | ||
| index: 'foo*' | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| bdd.it('should return searchable/aggregatable flags for fields in the indices specified', function () { | ||
| return request.get('/kibana/foo-1/field_capabilities') | ||
| .expect(200) | ||
| .then(function (response) { | ||
| var fields = response.body.fields; | ||
| expect(fields.foo).to.eql({searchable: true, aggregatable: false}); | ||
| expect(fields['foo.keyword']).to.eql({searchable: true, aggregatable: true}); | ||
| expect(fields).to.not.have.property('baz'); | ||
| }); | ||
| }); | ||
|
|
||
| bdd.it('should accept wildcards in the index name', function () { | ||
| return request.get('/kibana/foo-*/field_capabilities') | ||
| .expect(200) | ||
| .then(function (response) { | ||
| var fields = response.body.fields; | ||
| expect(fields.foo).to.eql({searchable: true, aggregatable: false}); | ||
| expect(fields.baz).to.eql({searchable: true, aggregatable: false}); | ||
| }); | ||
| }); | ||
|
|
||
| bdd.it('should accept comma delimited lists of indices', function () { | ||
| return request.get('/kibana/foo-1,foo-2/field_capabilities') | ||
| .expect(200) | ||
| .then(function (response) { | ||
| var fields = response.body.fields; | ||
| expect(fields.foo).to.eql({searchable: true, aggregatable: false}); | ||
| expect(fields.baz).to.eql({searchable: true, aggregatable: false}); | ||
| }); | ||
| }); | ||
|
|
||
| bdd.it('should return 404 if a pattern matches no indices', function () { | ||
| return request.post('/kibana/doesnotexist-*/field_capabilities') | ||
| .expect(404); | ||
| }); | ||
|
|
||
| bdd.it('should return 404 if a concrete index does not exist', function () { | ||
| return request.post('/kibana/concrete/field_capabilities') | ||
| .expect(404); | ||
| }); | ||
|
|
||
| }); | ||
| }; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters