From 16af2eaf9a893b5da0c90e1126ef1130e9d246df Mon Sep 17 00:00:00 2001
From: cauemarcondes <caue.marcondes@elastic.co>
Date: Mon, 28 Feb 2022 14:23:51 -0500
Subject: [PATCH] addressing PR changes

---
 .../apm/server/saved_objects/apm_indices.ts   | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
index 725fdfeb63a050..fe6650fb356ff9 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
@@ -8,7 +8,6 @@
 import { SavedObjectsType } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
 import { updateApmOssIndexPaths } from './migrations/update_apm_oss_index_paths';
-import { ApmIndicesConfigName } from '..';
 
 export interface APMIndices {
   apmIndices?: {
@@ -22,32 +21,14 @@ export interface APMIndices {
   isSpaceAware?: boolean;
 }
 
-const properties: {
-  apmIndices: {
-    properties: {
-      [Property in ApmIndicesConfigName]: { type: 'keyword' };
-    };
-  };
-  isSpaceAware: { type: 'boolean' };
-} = {
-  apmIndices: {
-    properties: {
-      sourcemap: { type: 'keyword' },
-      error: { type: 'keyword' },
-      onboarding: { type: 'keyword' },
-      span: { type: 'keyword' },
-      transaction: { type: 'keyword' },
-      metric: { type: 'keyword' },
-    },
-  },
-  isSpaceAware: { type: 'boolean' },
-};
-
 export const apmIndices: SavedObjectsType = {
   name: 'apm-indices',
   hidden: false,
   namespaceType: 'single',
-  mappings: { properties },
+  mappings: {
+    dynamic: false,
+    properties: {}, // several fields exist, but we don't need to search or aggregate on them, so we exclude them from the mappings
+  },
   management: {
     importableAndExportable: true,
     icon: 'apmApp',