Fix merge existing dynamic_templates

elastic · Aug 2, 2022 · 4589dd9 · 4589dd9
1 parent 54a6c4e
commit 4589dd9
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { merge } from 'lodash';
+import { merge, concat, uniqBy, omit } from 'lodash';
 import Boom from '@hapi/boom';
 import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
@@ -241,6 +241,15 @@ function buildComponentTemplates(params: {
 
   const templateSettings = merge(defaultSettings, indexTemplateSettings);
 
+  const indexTemplateMappings = registryElasticsearch?.['index_template.mappings'] ?? {};
+
+  const mappingsProperties = merge(mappings.properties, indexTemplateMappings.properties ?? {});
+
+  const mappingsDynamicTemplates = uniqBy(
+    concat(mappings.dynamic_templates ?? [], indexTemplateMappings.dynamic_templates ?? []),
+    (dynampingTemplate) => Object.keys(dynampingTemplate)[0]
+  );
+
   templatesMap[packageTemplateName] = {
     template: {
       settings: {
@@ -256,7 +265,11 @@ function buildComponentTemplates(params: {
           },
         },
       },
-      mappings: merge(mappings, registryElasticsearch?.['index_template.mappings'] ?? {}),
+      mappings: {
+        properties: mappingsProperties,
+        dynamic_templates: mappingsDynamicTemplates.length ? mappingsDynamicTemplates : undefined,
+        ...omit(indexTemplateMappings, 'properties', 'dynamic_templates'),
+      },
     },
     _meta,
   };