mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 01:38:56 -04:00
[add data] adds the trim processor
This commit is contained in:
parent
07664a85a8
commit
6904664236
8 changed files with 152 additions and 0 deletions
|
@ -11,3 +11,4 @@ import './processor_ui_remove';
|
|||
import './processor_ui_rename';
|
||||
import './processor_ui_set';
|
||||
import './processor_ui_split';
|
||||
import './processor_ui_trim';
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
import uiModules from 'ui/modules';
|
||||
import _ from 'lodash';
|
||||
import keysDeep from '../lib/keys_deep';
|
||||
import template from '../views/processor_ui_trim.html';
|
||||
|
||||
const app = uiModules.get('kibana');
|
||||
|
||||
//scope.processor, scope.pipeline are attached by the process_container.
|
||||
app.directive('processorUiTrim', function () {
|
||||
return {
|
||||
restrict: 'E',
|
||||
template: template,
|
||||
controller : function ($scope) {
|
||||
const processor = $scope.processor;
|
||||
const pipeline = $scope.pipeline;
|
||||
|
||||
function consumeNewInputObject() {
|
||||
$scope.fields = keysDeep(processor.inputObject);
|
||||
refreshFieldData();
|
||||
}
|
||||
|
||||
function refreshFieldData() {
|
||||
$scope.fieldData = _.get(processor.inputObject, processor.sourceField);
|
||||
}
|
||||
|
||||
function processorUiChanged() {
|
||||
pipeline.setDirty();
|
||||
}
|
||||
|
||||
$scope.$watch('processor.inputObject', consumeNewInputObject);
|
||||
|
||||
$scope.$watch('processor.sourceField', () => {
|
||||
refreshFieldData();
|
||||
processorUiChanged();
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
|
@ -308,3 +308,23 @@ export class Split extends Processor {
|
|||
};
|
||||
}
|
||||
};
|
||||
|
||||
export class Trim extends Processor {
|
||||
constructor(processorId) {
|
||||
super(processorId, 'trim', 'Trim');
|
||||
this.sourceField = '';
|
||||
}
|
||||
|
||||
get description() {
|
||||
const source = this.sourceField || '?';
|
||||
return `[${source}]`;
|
||||
}
|
||||
|
||||
get model() {
|
||||
return {
|
||||
processorId: this.processorId,
|
||||
typeId: this.typeId,
|
||||
sourceField: this.sourceField || ''
|
||||
};
|
||||
}
|
||||
};
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
<div class="form-group">
|
||||
<label>Field:</label>
|
||||
<select
|
||||
class="form-control"
|
||||
ng-options="field as field for field in fields"
|
||||
ng-model="processor.sourceField">
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Field Data:</label>
|
||||
<pre>{{ fieldData }}</pre>
|
||||
</div>
|
|
@ -145,3 +145,12 @@ export function split(processorApiDocument) {
|
|||
}
|
||||
};
|
||||
}
|
||||
|
||||
export function trim(processorApiDocument) {
|
||||
return {
|
||||
trim: {
|
||||
tag: processorApiDocument.processor_id,
|
||||
field: processorApiDocument.source_field
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
@ -79,3 +79,9 @@ export const split = base.keys({
|
|||
source_field: Joi.string().allow(''),
|
||||
separator: Joi.string().allow('')
|
||||
});
|
||||
|
||||
export const trim = base.keys({
|
||||
type_id: Joi.string().only('trim').required(),
|
||||
source_field: Joi.string().allow('')
|
||||
});
|
||||
|
||||
|
|
64
test/unit/api/ingest/processors/_trim.js
Normal file
64
test/unit/api/ingest/processors/_trim.js
Normal file
|
@ -0,0 +1,64 @@
|
|||
define(function (require) {
|
||||
var Promise = require('bluebird');
|
||||
var _ = require('intern/dojo/node!lodash');
|
||||
var expect = require('intern/dojo/node!expect.js');
|
||||
|
||||
const testPipeline = {
|
||||
processors: [{
|
||||
processor_id: 'processor1',
|
||||
type_id: 'trim',
|
||||
source_field: 'foo'
|
||||
}],
|
||||
input: { foo: ' bar baz ' }
|
||||
};
|
||||
|
||||
return function (bdd, scenarioManager, request) {
|
||||
bdd.describe('simulate - trim processor', () => {
|
||||
|
||||
bdd.it('should return 400 for an invalid payload', () => {
|
||||
return Promise.all([
|
||||
// processor requires source_field property
|
||||
request.post('/kibana/ingest/simulate')
|
||||
.send({
|
||||
processors: [{
|
||||
processor_id: 'processor1',
|
||||
type_id: 'trim',
|
||||
source_field: 1234
|
||||
}],
|
||||
input: { foo: ' bar baz ' }
|
||||
})
|
||||
.expect(400)
|
||||
]);
|
||||
});
|
||||
|
||||
bdd.it('should return 200 for a valid simulate request', () => {
|
||||
return request.post('/kibana/ingest/simulate')
|
||||
.send(testPipeline)
|
||||
.expect(200);
|
||||
});
|
||||
|
||||
bdd.it('should return a simulated output with the correct result for the given processor', () => {
|
||||
return request.post('/kibana/ingest/simulate')
|
||||
.send(testPipeline)
|
||||
.expect(200)
|
||||
.then(function (response) {
|
||||
expect(response.body[0].output).to.eql({ foo: 'bar baz' });
|
||||
});
|
||||
});
|
||||
|
||||
bdd.it('should enforce snake case', () => {
|
||||
return request.post('/kibana/ingest/simulate')
|
||||
.send({
|
||||
processors: [{
|
||||
processorId: 'processor1',
|
||||
typeId: 'trim',
|
||||
sourceField: 'foo'
|
||||
}],
|
||||
input: { foo: ' bar baz ' }
|
||||
})
|
||||
.expect(400);
|
||||
});
|
||||
|
||||
});
|
||||
};
|
||||
});
|
|
@ -11,6 +11,7 @@ define(function (require) {
|
|||
var rename = require('./_rename');
|
||||
var set = require('./_set');
|
||||
var split = require('./_split');
|
||||
var trim = require('./_trim');
|
||||
|
||||
return function processors(bdd, scenarioManager, request) {
|
||||
append(bdd, scenarioManager, request);
|
||||
|
@ -25,6 +26,7 @@ define(function (require) {
|
|||
rename(bdd, scenarioManager, request);
|
||||
set(bdd, scenarioManager, request);
|
||||
split(bdd, scenarioManager, request);
|
||||
trim(bdd, scenarioManager, request);
|
||||
};
|
||||
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue