diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
index 6de8287171bfff..91b4a8ec755017 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
@@ -4,6 +4,7 @@ import IngestProvider from 'ui/ingest';
import 'plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step';
import 'plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_step';
import 'plugins/kibana/settings/sections/indices/add_data_steps/pipeline_setup';
+import 'plugins/kibana/settings/sections/indices/add_data_steps/select_pipeline';
import 'plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step';
import '../../styles/_add_data_wizard.less';
@@ -24,7 +25,7 @@ modules.get('apps/settings')
location: 'Add Data'
});
- var totalSteps = 4;
+ var totalSteps = 5;
this.stepResults = {};
this.setCurrentStep = (step) => {
@@ -77,10 +78,10 @@ modules.get('apps/settings')
return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?')
.then(
() => {
- if ($state.currentStep < 1) {
+ if ($state.currentStep < 2) {
delete this.stepResults.pipeline;
}
- if ($state.currentStep < 2) {
+ if ($state.currentStep < 3) {
delete this.stepResults.indexPattern;
}
this.currentStep = newValue;
diff --git a/src/plugins/kibana/server/lib/converters/ingest_pipeline_api_es_to_kibana_converter.js b/src/plugins/kibana/server/lib/converters/ingest_pipeline_api_es_to_kibana_converter.js
new file mode 100644
index 00000000000000..bd33b51257b9d1
--- /dev/null
+++ b/src/plugins/kibana/server/lib/converters/ingest_pipeline_api_es_to_kibana_converter.js
@@ -0,0 +1,14 @@
+import _ from 'lodash';
+import * as esToKibanaProcessorConverters from '../processors/es_to_kibana_converters';
+
+export default function ingestPipelineApiEsToKibanaConverter(pipelineEsDocument) {
+ const esProcessors = _.get(pipelineEsDocument, 'config.processors');
+ const result = {
+ processors: _.map(esProcessors, (processor) => {
+ const typeId = _.keys(processor)[0];
+ return esToKibanaProcessorConverters[typeId](processor[typeId]);
+ })
+ };
+
+ return result;
+}
diff --git a/src/plugins/kibana/server/lib/converters/ingest_pipeline_api_kibana_to_es_converter.js b/src/plugins/kibana/server/lib/converters/ingest_pipeline_api_kibana_to_es_converter.js
index b26f14de1224a0..647ed49e9f6cdb 100644
--- a/src/plugins/kibana/server/lib/converters/ingest_pipeline_api_kibana_to_es_converter.js
+++ b/src/plugins/kibana/server/lib/converters/ingest_pipeline_api_kibana_to_es_converter.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import * as ingestProcessorApiKibanaToEsConverters from '../processors/converters';
+import * as ingestProcessorApiKibanaToEsConverters from '../processors/kibana_to_es_converters';
export default function ingestPipelineApiKibanaToEsConverter(pipelineApiDocument) {
return {
diff --git a/src/plugins/kibana/server/lib/processors/append/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/append/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..71f14d31a7eec0
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/append/es_to_kibana_converter.js
@@ -0,0 +1,8 @@
+export default function append(processorEsDocument) {
+ return {
+ typeId: 'append',
+ processor_id: processorEsDocument.tag,
+ target_field: processorEsDocument.field,
+ values: processorEsDocument.value
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/convert/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/convert/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..db42dc49a4571d
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/convert/es_to_kibana_converter.js
@@ -0,0 +1,17 @@
+export default function convert(processorEsDocument) {
+ const types = {
+ //:
+ auto: 'auto',
+ float: 'number',
+ string: 'string',
+ boolean: 'boolean'
+ };
+
+ return {
+ typeId: 'convert',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ target_field: processorEsDocument.target_field,
+ type: types[processorEsDocument.type]
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/date/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/date/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..5176162c7a503c
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/date/es_to_kibana_converter.js
@@ -0,0 +1,27 @@
+const _ = require('lodash');
+
+export default function date(processorEsDocument) {
+ const standardFormats = ['ISO8601', 'UNIX', 'UNIX_MS', 'TAI64N'];
+
+ const formats = [];
+ let customFormat = '';
+ _.forEach(processorEsDocument.formats, (format) => {
+ if (_.contains(standardFormats, format.toUpperCase())) {
+ formats.push(format.toUpperCase());
+ } else {
+ formats.push('CUSTOM');
+ customFormat = format;
+ }
+ });
+
+ return {
+ typeId: 'date',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ target_field: processorEsDocument.target_field,
+ formats: formats,
+ custom_format: customFormat,
+ timezone: processorEsDocument.timezone,
+ locale: processorEsDocument.locale
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/es_to_kibana_converters.js b/src/plugins/kibana/server/lib/processors/es_to_kibana_converters.js
new file mode 100644
index 00000000000000..64c76f80d48495
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/es_to_kibana_converters.js
@@ -0,0 +1,14 @@
+export append from '../processors/append/es_to_kibana_converter';
+export convert from '../processors/convert/es_to_kibana_converter';
+export date from '../processors/date/es_to_kibana_converter';
+export geoip from '../processors/geoip/es_to_kibana_converter';
+export grok from '../processors/grok/es_to_kibana_converter';
+export gsub from '../processors/gsub/es_to_kibana_converter';
+export join from '../processors/join/es_to_kibana_converter';
+export lowercase from '../processors/lowercase/es_to_kibana_converter';
+export remove from '../processors/remove/es_to_kibana_converter';
+export rename from '../processors/rename/es_to_kibana_converter';
+export set from '../processors/set/es_to_kibana_converter';
+export split from '../processors/split/es_to_kibana_converter';
+export trim from '../processors/trim/es_to_kibana_converter';
+export uppercase from '../processors/uppercase/es_to_kibana_converter';
diff --git a/src/plugins/kibana/server/lib/processors/geoip/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/geoip/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..af7a5116dd523b
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/geoip/es_to_kibana_converter.js
@@ -0,0 +1,10 @@
+export default function geoip(processorEsDocument) {
+ return {
+ typeId: 'geoip',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ target_field: processorEsDocument.target_field,
+ database_file: processorEsDocument.database_file,
+ database_fields: processorEsDocument.properties
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/grok/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/grok/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..1fd6816015f070
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/grok/es_to_kibana_converter.js
@@ -0,0 +1,8 @@
+export default function grok(processorEsDocument) {
+ return {
+ typeId: 'grok',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ pattern: processorEsDocument.pattern
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/gsub/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/gsub/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..322b897bd8dc64
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/gsub/es_to_kibana_converter.js
@@ -0,0 +1,9 @@
+export default function gsub(processorEsDocument) {
+ return {
+ typeId: 'gsub',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ pattern: processorEsDocument.pattern,
+ replacement: processorEsDocument.replacement
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/join/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/join/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..47dfb1b0c1e848
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/join/es_to_kibana_converter.js
@@ -0,0 +1,8 @@
+export default function join(processorEsDocument) {
+ return {
+ typeId: 'join',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ separator: processorEsDocument.separator
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/converters.js b/src/plugins/kibana/server/lib/processors/kibana_to_es_converters.js
similarity index 100%
rename from src/plugins/kibana/server/lib/processors/converters.js
rename to src/plugins/kibana/server/lib/processors/kibana_to_es_converters.js
diff --git a/src/plugins/kibana/server/lib/processors/lowercase/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/lowercase/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..12619fec26f256
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/lowercase/es_to_kibana_converter.js
@@ -0,0 +1,7 @@
+export default function lowercase(processorEsDocument) {
+ return {
+ typeId: 'lowercase',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/remove/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/remove/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..4ee979a28ffd1f
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/remove/es_to_kibana_converter.js
@@ -0,0 +1,7 @@
+export default function remove(processorEsDocument) {
+ return {
+ typeId: 'remove',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/rename/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/rename/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..edbffff934ad56
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/rename/es_to_kibana_converter.js
@@ -0,0 +1,8 @@
+export default function rename(processorEsDocument) {
+ return {
+ typeId: 'rename',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ target_field: processorEsDocument.target_field
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/set/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/set/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..8a1a35538aa3e7
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/set/es_to_kibana_converter.js
@@ -0,0 +1,8 @@
+export default function set(processorEsDocument) {
+ return {
+ typeId: 'set',
+ processor_id: processorEsDocument.tag,
+ target_field: processorEsDocument.field,
+ value: processorEsDocument.value
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/split/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/split/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..881b7a7316cbee
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/split/es_to_kibana_converter.js
@@ -0,0 +1,8 @@
+export default function split(processorEsDocument) {
+ return {
+ typeId: 'split',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field,
+ separator: processorEsDocument.separator
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/trim/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/trim/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..9a513601229e7a
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/trim/es_to_kibana_converter.js
@@ -0,0 +1,7 @@
+export default function trim(processorEsDocument) {
+ return {
+ typeId: 'trim',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field
+ };
+}
diff --git a/src/plugins/kibana/server/lib/processors/uppercase/es_to_kibana_converter.js b/src/plugins/kibana/server/lib/processors/uppercase/es_to_kibana_converter.js
new file mode 100644
index 00000000000000..b6ec60cd8059f3
--- /dev/null
+++ b/src/plugins/kibana/server/lib/processors/uppercase/es_to_kibana_converter.js
@@ -0,0 +1,7 @@
+export default function uppercase(processorEsDocument) {
+ return {
+ typeId: 'uppercase',
+ processor_id: processorEsDocument.tag,
+ source_field: processorEsDocument.field
+ };
+}
diff --git a/src/plugins/kibana/server/routes/api/ingest/index.js b/src/plugins/kibana/server/routes/api/ingest/index.js
index 8b723c800946a0..8c95aa11c2cb1c 100644
--- a/src/plugins/kibana/server/routes/api/ingest/index.js
+++ b/src/plugins/kibana/server/routes/api/ingest/index.js
@@ -2,6 +2,7 @@ import { registerPost } from './register_post';
import { registerDelete } from './register_delete';
import { registerProcessors } from './register_processors';
import { registerSimulate } from './register_simulate';
+import { registerPipelines } from './register_pipelines';
import { registerData } from './register_data';
export default function (server) {
@@ -9,5 +10,6 @@ export default function (server) {
registerDelete(server);
registerProcessors(server);
registerSimulate(server);
+ registerPipelines(server);
registerData(server);
}
diff --git a/src/plugins/kibana/server/routes/api/ingest/register_pipelines.js b/src/plugins/kibana/server/routes/api/ingest/register_pipelines.js
new file mode 100644
index 00000000000000..16247270b644e6
--- /dev/null
+++ b/src/plugins/kibana/server/routes/api/ingest/register_pipelines.js
@@ -0,0 +1,54 @@
+import _ from 'lodash';
+import esToKibanaPipelineConverter from '../../../lib/converters/ingest_pipeline_api_es_to_kibana_converter';
+import handleESError from '../../../lib/handle_es_error';
+
+function handlePipelinesResponse(response) {
+ const pipelines = _.get(response, 'pipelines');
+ const results = _.map(pipelines, 'id');
+
+ return results;
+}
+
+function handlePipelineResponse(response) {
+ const esPipeline = _.get(response, 'pipelines[0]');
+ const kibanaPipeline = esToKibanaPipelineConverter(esPipeline);
+ return kibanaPipeline;
+}
+
+export function registerPipelines(server) {
+ server.route({
+ path: '/api/kibana/ingest/pipelines',
+ method: 'GET',
+ handler: function (request, reply) {
+ const boundCallWithRequest = _.partial(server.plugins.elasticsearch.callWithRequest, request);
+
+ return boundCallWithRequest('transport.request', {
+ path: '/_ingest/pipeline/*',
+ method: 'GET'
+ })
+ .then(handlePipelinesResponse)
+ .then(reply)
+ .catch((error) => {
+ reply(handleESError(error));
+ });
+ }
+ });
+
+ server.route({
+ path: '/api/kibana/ingest/pipeline/{id}',
+ method: 'GET',
+ handler: function (request, reply) {
+ const boundCallWithRequest = _.partial(server.plugins.elasticsearch.callWithRequest, request);
+
+ return boundCallWithRequest('transport.request', {
+ path: `/_ingest/pipeline/${request.params.id}`,
+ method: 'GET'
+ })
+ .then(handlePipelineResponse)
+ .then(reply)
+ .catch((error) => {
+ reply(handleESError(error));
+ });
+ }
+ });
+};
diff --git a/src/ui/public/ingest/ingest.js b/src/ui/public/ingest/ingest.js
index bee1cb564d3af3..9ec5f45ebbd440 100644
--- a/src/ui/public/ingest/ingest.js
+++ b/src/ui/public/ingest/ingest.js
@@ -71,4 +71,31 @@ export default function IngestProvider($rootScope, $http, config, $q) {
});
};
+ this.getPipelines = function () {
+ function unpack(response) {
+ return response.data;
+ }
+
+ return $http.get(`${ingestAPIPrefix}/pipelines`)
+ .then(unpack)
+ .catch(err => {
+ return $q.reject(new Error('Error fetching pipelines'));
+ });
+ };
+
+ this.getPipeline = function (id) {
+ function unpack(response) {
+ const pipeline = response.data;
+ pipeline.processors = _.map(pipeline.processors, processor => keysToCamelCaseShallow(processor));
+
+ return pipeline;
+ }
+
+ return $http.get(`${ingestAPIPrefix}/pipeline/${id}`)
+ .then(unpack)
+ .catch(err => {
+ return $q.reject(new Error('Error fetching pipeline'));
+ });
+ };
+
}