elastic
diff --git a/‎x-pack/plugins/fleet/common/types/models/epm.ts‎
Lines changed: 1 addition & 0 deletions b/‎x-pack/plugins/fleet/common/types/models/epm.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap‎
Lines changed: 83 additions & 17 deletions b/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap‎
Lines changed: 83 additions & 17 deletions
diff --git a/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts‎
Lines changed: 15 additions & 2 deletions b/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts‎
Lines changed: 15 additions & 2 deletions
diff --git a/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/mappings.ts‎
Lines changed: 48 additions & 0 deletions b/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/mappings.ts‎
Lines changed: 48 additions & 0 deletions
diff --git a/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts‎
Lines changed: 11 additions & 0 deletions b/‎x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts‎
Lines changed: 11 additions & 0 deletions
@@ -483,6 +483,7 @@ export type PackageAssetReference = Pick<SavedObjectReference, 'id'> & {
 
 export interface IndexTemplateMappings {
   properties: any;
+  dynamic_templates?: any;
 }
 
 // This is an index template v2, see https://github.com/elastic/elasticsearch/issues/53101
 
@@ -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,
   };
 
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Field } from '../../fields/field';
+
+const DEFAULT_SCALING_FACTOR = 1000;
+
+interface Properties {
+  [key: string]: any;
+}
+
+export function getDefaultProperties(field: Field): Properties {
+  const properties: Properties = {};
+
+  if (field.index !== undefined) {
+    properties.index = field.index;
+  }
+  if (field.doc_values !== undefined) {
+    properties.doc_values = field.doc_values;
+  }
+  if (field.copy_to) {
+    properties.copy_to = field.copy_to;
+  }
+
+  return properties;
+}
+
+export function scaledFloat(field: Field): Properties {
+  const fieldProps = getDefaultProperties(field);
+  fieldProps.type = 'scaled_float';
+  fieldProps.scaling_factor = field.scaling_factor || DEFAULT_SCALING_FACTOR;
+  if (field.metric_type) {
+    fieldProps.time_series_metric = field.metric_type;
+  }
+
+  return fieldProps;
+}
+
+export function histogram(field: Field): Properties {
+  const fieldProps = getDefaultProperties(field);
+  fieldProps.type = 'histogram';
+
+  return fieldProps;
+}
@@ -137,6 +137,17 @@ describe('EPM template', () => {
     expect(mappings).toMatchSnapshot(path.basename(ymlPath));
   });
 
+  it('tests loading cockroachdb_dynamic_templates.yml', () => {
+    const ymlPath = path.join(__dirname, '../../fields/tests/cockroachdb_dynamic_templates.yml');
+    const fieldsYML = readFileSync(ymlPath, 'utf-8');
+    const fields: Field[] = safeLoad(fieldsYML);
+    const processedFields = processFields(fields);
+
+    const mappings = generateMappings(processedFields);
+
+    expect(mappings).toMatchSnapshot(path.basename(ymlPath));
+  });
+
   it('tests processing long field with index false', () => {
     const longWithIndexFalseYml = `
 - name: longIndexFalse
Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,7 @@ export type PackageAssetReference = Pick<SavedObjectReference, 'id'> & {`
`483`	`483`
`484`	`484`	`export interface IndexTemplateMappings {`
`485`	`485`	`properties: any;`
	`486`	`+ dynamic_templates?: any;`
`486`	`487`	`}`
`487`	`488`
`488`	`489`	`// This is an index template v2, see https://github.com/elastic/elasticsearch/issues/53101`