mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 01:38:56 -04:00
[add data] adds rename processor
This commit is contained in:
parent
f62ebc4d62
commit
33dd6d660e
8 changed files with 165 additions and 0 deletions
|
@ -8,4 +8,5 @@ import './processor_ui_gsub';
|
|||
import './processor_ui_join';
|
||||
import './processor_ui_lowercase';
|
||||
import './processor_ui_remove';
|
||||
import './processor_ui_rename';
|
||||
import './processor_ui_set';
|
||||
|
|
|
@ -0,0 +1,40 @@
|
|||
import uiModules from 'ui/modules';
|
||||
import _ from 'lodash';
|
||||
import keysDeep from '../lib/keys_deep';
|
||||
import template from '../views/processor_ui_rename.html';
|
||||
|
||||
const app = uiModules.get('kibana');
|
||||
|
||||
//scope.processor, scope.pipeline are attached by the process_container.
|
||||
app.directive('processorUiRename', 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();
|
||||
});
|
||||
|
||||
$scope.$watch('processor.targetField', processorUiChanged);
|
||||
}
|
||||
};
|
||||
});
|
|
@ -241,6 +241,29 @@ export class Remove extends Processor {
|
|||
}
|
||||
};
|
||||
|
||||
export class Rename extends Processor {
|
||||
constructor(processorId) {
|
||||
super(processorId, 'rename', 'Rename');
|
||||
this.sourceField = '';
|
||||
this.targetField = '';
|
||||
}
|
||||
|
||||
get description() {
|
||||
const source = this.sourceField || '?';
|
||||
const target = this.targetField || '?';
|
||||
return `[${source}] -> [${target}]`;
|
||||
}
|
||||
|
||||
get model() {
|
||||
return {
|
||||
processorId: this.processorId,
|
||||
typeId: this.typeId,
|
||||
sourceField: this.sourceField || '',
|
||||
targetField: this.targetField || ''
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export class Set extends Processor {
|
||||
constructor(processorId) {
|
||||
super(processorId, 'set', 'Set');
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
<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>
|
||||
<div class="form-group">
|
||||
<label>Target Field:</label>
|
||||
<input type="text" class="form-control" ng-model="processor.targetField">
|
||||
</div>
|
|
@ -116,6 +116,16 @@ export function remove(processorApiDocument) {
|
|||
};
|
||||
}
|
||||
|
||||
export function rename(processorApiDocument) {
|
||||
return {
|
||||
rename: {
|
||||
tag: processorApiDocument.processor_id,
|
||||
field: processorApiDocument.source_field,
|
||||
to: processorApiDocument.target_field
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export function set(processorApiDocument) {
|
||||
return {
|
||||
set: {
|
||||
|
|
|
@ -62,6 +62,12 @@ export const remove = base.keys({
|
|||
source_field: Joi.string().allow('')
|
||||
});
|
||||
|
||||
export const rename = base.keys({
|
||||
type_id: Joi.string().only('rename').required(),
|
||||
source_field: Joi.string().allow(''),
|
||||
target_field: Joi.string().allow('')
|
||||
});
|
||||
|
||||
export const set = base.keys({
|
||||
type_id: Joi.string().only('set').required(),
|
||||
target_field: Joi.string().allow(''),
|
||||
|
|
67
test/unit/api/ingest/processors/_rename.js
Normal file
67
test/unit/api/ingest/processors/_rename.js
Normal file
|
@ -0,0 +1,67 @@
|
|||
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: 'rename',
|
||||
source_field: 'foo',
|
||||
target_field: 'bar'
|
||||
}],
|
||||
input: { foo: 'value1' }
|
||||
};
|
||||
|
||||
return function (bdd, scenarioManager, request) {
|
||||
bdd.describe('simulate - rename 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: 'rename',
|
||||
source_field: 1234,
|
||||
target_field: 'bar'
|
||||
}],
|
||||
input: { foo: 'value1' }
|
||||
})
|
||||
.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({ bar: 'value1' });
|
||||
});
|
||||
});
|
||||
|
||||
bdd.it('should enforce snake case', () => {
|
||||
return request.post('/kibana/ingest/simulate')
|
||||
.send({
|
||||
processors: [{
|
||||
processorId: 'processor1',
|
||||
typeId: 'rename',
|
||||
sourceField: 'foo',
|
||||
targetField: 'bar'
|
||||
}],
|
||||
input: { foo: 'value1' }
|
||||
})
|
||||
.expect(400);
|
||||
});
|
||||
|
||||
});
|
||||
};
|
||||
});
|
|
@ -8,6 +8,7 @@ define(function (require) {
|
|||
var join = require('./_join');
|
||||
var lowercase = require('./_lowercase');
|
||||
var remove = require('./_remove');
|
||||
var rename = require('./_rename');
|
||||
var set = require('./_set');
|
||||
|
||||
return function processors(bdd, scenarioManager, request) {
|
||||
|
@ -20,6 +21,7 @@ define(function (require) {
|
|||
join(bdd, scenarioManager, request);
|
||||
lowercase(bdd, scenarioManager, request);
|
||||
remove(bdd, scenarioManager, request);
|
||||
rename(bdd, scenarioManager, request);
|
||||
set(bdd, scenarioManager, request);
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue