From 971b61213ef658b989d27fe5e10e00c81a0bf894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Tue, 13 Apr 2021 17:41:07 +0200
Subject: [PATCH] [Fleet] Add support for long and double field type in
 multi_fields (#96834) (#96969)

---
 .../elasticsearch/template/template.test.ts   | 58 +++++++++++++++++++
 .../epm/elasticsearch/template/template.ts    |  6 ++
 2 files changed, 64 insertions(+)

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
index df82aa90b5a13..dcc685bb270b4 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
@@ -301,6 +301,64 @@ describe('EPM template', () => {
     expect(mappings).toEqual(keywordWithNormalizedMultiFieldsMapping);
   });
 
+  it('tests processing keyword field with multi fields with long field', () => {
+    const keywordWithMultiFieldsLiteralYml = `
+      - name: keywordWithMultiFields
+        type: keyword
+        multi_fields:
+          - name: number_memory_devices
+            type: long
+            normalizer: lowercase
+      `;
+
+    const keywordWithMultiFieldsMapping = {
+      properties: {
+        keywordWithMultiFields: {
+          ignore_above: 1024,
+          type: 'keyword',
+          fields: {
+            number_memory_devices: {
+              type: 'long',
+            },
+          },
+        },
+      },
+    };
+    const fields: Field[] = safeLoad(keywordWithMultiFieldsLiteralYml);
+    const processedFields = processFields(fields);
+    const mappings = generateMappings(processedFields);
+    expect(mappings).toEqual(keywordWithMultiFieldsMapping);
+  });
+
+  it('tests processing keyword field with multi fields with double field', () => {
+    const keywordWithMultiFieldsLiteralYml = `
+      - name: keywordWithMultiFields
+        type: keyword
+        multi_fields:
+          - name: number
+            type: double
+            normalizer: lowercase
+      `;
+
+    const keywordWithMultiFieldsMapping = {
+      properties: {
+        keywordWithMultiFields: {
+          ignore_above: 1024,
+          type: 'keyword',
+          fields: {
+            number: {
+              type: 'double',
+            },
+          },
+        },
+      },
+    };
+    const fields: Field[] = safeLoad(keywordWithMultiFieldsLiteralYml);
+    const processedFields = processFields(fields);
+    const mappings = generateMappings(processedFields);
+    expect(mappings).toEqual(keywordWithMultiFieldsMapping);
+  });
+
   it('tests processing object field with no other attributes', () => {
     const objectFieldLiteralYml = `
 - name: objectField
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
index 0b95f8d76627a..f6ca1dfc99f4e 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -204,6 +204,12 @@ function generateMultiFields(fields: Fields): MultiFields {
         case 'keyword':
           multiFields[f.name] = { ...generateKeywordMapping(f), type: f.type };
           break;
+        case 'long':
+          multiFields[f.name] = { type: f.type };
+          break;
+        case 'double':
+          multiFields[f.name] = { type: f.type };
+          break;
       }
     });
   }