From 149da79b7e5d43355c68dc477a2b62bb98fd3b2d Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Thu, 28 Jan 2021 16:20:37 -0700
Subject: [PATCH] [7.11] [Fleet] Do not defined aliases inside datastream
 template (#89512) (#89644)

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
---
 x-pack/plugins/fleet/common/types/models/epm.ts          | 1 -
 .../template/__snapshots__/template.test.ts.snap         | 9 +++------
 .../services/epm/elasticsearch/template/template.ts      | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index a9893b170492f..141cb0227a97c 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -314,7 +314,6 @@ export interface IndexTemplate {
   template: {
     settings: any;
     mappings: any;
-    aliases: object;
   };
   data_stream: { hidden?: boolean };
   composed_of: string[];
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
index 0333fb024a717..2d2478843c454 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
@@ -95,8 +95,7 @@ exports[`tests loading base.yml: base.yml 1`] = `
         "managed_by": "ingest-manager",
         "managed": true
       }
-    },
-    "aliases": {}
+    }
   },
   "data_stream": {},
   "composed_of": [],
@@ -205,8 +204,7 @@ exports[`tests loading coredns.logs.yml: coredns.logs.yml 1`] = `
         "managed_by": "ingest-manager",
         "managed": true
       }
-    },
-    "aliases": {}
+    }
   },
   "data_stream": {},
   "composed_of": [],
@@ -1699,8 +1697,7 @@ exports[`tests loading system.yml: system.yml 1`] = `
         "managed_by": "ingest-manager",
         "managed": true
       }
-    },
-    "aliases": {}
+    }
   },
   "data_stream": {},
   "composed_of": [],
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 fd75139d4cd45..e1fa2a0b18b59 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
@@ -335,8 +335,6 @@ function getBaseTemplate(
         properties: mappings.properties,
         _meta,
       },
-      // To be filled with the aliases that we need
-      aliases: {},
     },
     data_stream: { hidden },
     composed_of: composedOfTemplates,