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

Change _bulk to _data

Browse source
This commit is contained in:
Matthew Bargar 2016-05-10 17:02:31 -04:00
parent ee16d41cad
commit bc65d9509d
4 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/kibana/server/routes/api/ingest/index.js
View file

@ -2,12 +2,12 @@ import { registerPost } from './register_post';
import { registerDelete } from './register_delete';
import { registerProcessors } from './register_processors';
import { registerSimulate } from './register_simulate';
import { registerBulk } from './register_bulk';
import { registerData } from './register_data';
export default function (server) {
registerPost(server);
registerDelete(server);
registerProcessors(server);
registerSimulate(server);
registerBulk(server);
registerData(server);
}

4
src/plugins/kibana/server/routes/api/ingest/register_bulk.js → src/plugins/kibana/server/routes/api/ingest/register_data.js
View file

@ -8,9 +8,9 @@ import JSONStream from 'JSONStream';
const ONE_GIGABYTE = 1024 * 1024 * 1024;
export function registerBulk(server) {
export function registerData(server) {
server.route({
path: '/api/kibana/{id}/_bulk',
path: '/api/kibana/{id}/_data',
method: 'POST',
config: {
payload: {

68
test/unit/api/ingest/_bulk.js → test/unit/api/ingest/_data.js
View file

@ -7,7 +7,7 @@ define(function (require) {
return function (bdd, scenarioManager, request) {
const es = scenarioManager.client;
bdd.describe('_bulk', function () {
bdd.describe('_data', function () {
bdd.beforeEach(function () {
return es.indices.putTemplate({
@ -27,7 +27,7 @@ define(function (require) {
});
bdd.it('should accept a multipart/form-data request with a csv file attached', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names.csv')
.expect(200);
});
@ -35,23 +35,23 @@ define(function (require) {
bdd.it('should also accept the raw csv data in the payload body', function () {
var csvData = fs.readFileSync('test/unit/data/fake_names_big.csv', {encoding: 'utf8'});
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.send(csvData)
.expect(200);
});
bdd.it('should return JSON results', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names.csv')
.expect('Content-Type', /json/)
.expect(200);
});
bdd.it('should index one document per row in the csv', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names.csv')
.expect(200)
.then((bulkResponse) => {
.then(() => {
return es.indices.refresh()
.then(() => {
return es.count({ index: 'names' })
@ -63,58 +63,58 @@ define(function (require) {
});
bdd.it('should stream a chunked response', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names.csv')
.expect('Transfer-Encoding', 'chunked')
.expect(200);
});
bdd.it('should respond with an array of one or more "result objects"', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names_big.csv')
.expect(200)
.then((bulkResponse) => {
expect(bulkResponse.body.length).to.be(14);
.then((dataResponse) => {
expect(dataResponse.body.length).to.be(14);
});
});
bdd.describe('result objects', function () {
bdd.it('should include a count of created documents', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names.csv')
.expect(200)
.then((bulkResponse) => {
expect(bulkResponse.body[0]).to.have.property('created');
expect(bulkResponse.body[0].created).to.be(100);
.then((dataResponse) => {
expect(dataResponse.body[0]).to.have.property('created');
expect(dataResponse.body[0].created).to.be(100);
});
});
bdd.it('should report any indexing errors per document under an "errors.index" key', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names_with_mapping_errors.csv')
.expect(200)
.then((bulkResponse) => {
expect(bulkResponse.body[0]).to.have.property('created');
expect(bulkResponse.body[0].created).to.be(98);
expect(bulkResponse.body[0]).to.have.property('errors');
expect(bulkResponse.body[0].errors).to.have.property('index');
expect(bulkResponse.body[0].errors.index.length).to.be(2);
.then((dataResponse) => {
expect(dataResponse.body[0]).to.have.property('created');
expect(dataResponse.body[0].created).to.be(98);
expect(dataResponse.body[0]).to.have.property('errors');
expect(dataResponse.body[0].errors).to.have.property('index');
expect(dataResponse.body[0].errors.index.length).to.be(2);
});
});
bdd.it('should report any csv parsing errors under an "errors.other" key', function () {
return request.post('/kibana/names/_bulk')
return request.post('/kibana/names/_data')
.attach('csv', 'test/unit/data/fake_names_with_parse_errors.csv')
.expect(200)
.then((bulkResponse) => {
.then((dataResponse) => {
// parse errors immediately abort indexing
expect(bulkResponse.body[0]).to.have.property('created');
expect(bulkResponse.body[0].created).to.be(0);
expect(dataResponse.body[0]).to.have.property('created');
expect(dataResponse.body[0].created).to.be(0);
expect(bulkResponse.body[0]).to.have.property('errors');
expect(bulkResponse.body[0].errors).to.have.property('other');
expect(bulkResponse.body[0].errors.other.length).to.be(1);
expect(dataResponse.body[0]).to.have.property('errors');
expect(dataResponse.body[0].errors).to.have.property('other');
expect(dataResponse.body[0].errors.other.length).to.be(1);
});
});
@ -122,13 +122,13 @@ define(function (require) {
bdd.describe('optional parameters', function () {
bdd.it('should accept a custom delimiter query string param for parsing the CSV', function () {
return request.post('/kibana/names/_bulk?delimiter=|')
return request.post('/kibana/names/_data?delimiter=|')
.attach('csv', 'test/unit/data/fake_names_pipe_delimited.csv')
.expect(200)
.then((bulkResponse) => {
expect(bulkResponse.body[0]).to.have.property('created');
expect(bulkResponse.body[0].created).to.be(2);
expect(bulkResponse.body[0]).to.not.have.property('errors');
.then((dataResponse) => {
expect(dataResponse.body[0]).to.have.property('created');
expect(dataResponse.body[0].created).to.be(2);
expect(dataResponse.body[0]).to.not.have.property('errors');
return es.indices.refresh();
})
@ -160,7 +160,7 @@ define(function (require) {
}
})
.then((res) => {
return request.post('/kibana/names/_bulk?pipeline=true')
return request.post('/kibana/names/_data?pipeline=true')
.attach('csv', 'test/unit/data/fake_names.csv')
.expect(200);
})

4
test/unit/api/ingest/index.js
View file

@ -8,7 +8,7 @@ define(function (require) {
var expect = require('intern/dojo/node!expect.js');
var post = require('./_post');
var del = require('./_del');
var bulk = require('./_bulk');
var data = require('./_data');
var simulate = require('./_simulate');
var processors = require('./_processors');
var processorTypes = require('./processors/index');
@ -27,7 +27,7 @@ define(function (require) {
post(bdd, scenarioManager, request);
del(bdd, scenarioManager, request);
bulk(bdd, scenarioManager, request);
data(bdd, scenarioManager, request);
simulate(bdd, scenarioManager, request);
processors(bdd, scenarioManager, request);
processorTypes(bdd, scenarioManager, request);