From 011b2c6d4ffee26cb42780a2d5d92ba4f5fec4eb Mon Sep 17 00:00:00 2001 From: Sonja Krause-Harder Date: Wed, 18 Mar 2020 12:00:45 +0100 Subject: [PATCH] Don't fail on invalid input for now. --- .../ingest_manager/server/services/epm/fields/field.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts b/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts index f3a81c2521ce7..aebea4a19ba9a 100644 --- a/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts +++ b/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts @@ -113,9 +113,11 @@ function dedupFields(fields: Fields): Fields { found.fields = dedupFields(found.fields.concat(field.fields)); } else { // only 'group' fields can be merged in this way - throw new Error( - "Can't merge fields " + JSON.stringify(found) + ' and ' + JSON.stringify(field) - ); + // XXX: don't abort on error for now + // see discussion in https://github.com/elastic/kibana/pull/59894 + // throw new Error( + // "Can't merge fields " + JSON.stringify(found) + ' and ' + JSON.stringify(field) + // ); } } else { if (field.fields) {