From 683ebec962b8297cf0b45d650ed7020ca0dd955d Mon Sep 17 00:00:00 2001
From: "huang.jusheng" <huang.jusheng@outlook.com>
Date: Tue, 8 Oct 2024 15:21:08 +0800
Subject: [PATCH] [Index Management] Fix filter index list by lifecycle status

---
 .../server/plugin.ts                          |  1 -
 .../index_management/data_enrichers/ilm.ts    | 22 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/index_lifecycle_management/server/plugin.ts b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
index 0d88acbaaa4ff..a5002cd36da44 100644
--- a/x-pack/plugins/index_lifecycle_management/server/plugin.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
@@ -27,7 +27,6 @@ const indexLifecycleDataEnricher = async (
 
   const { indices: ilmIndicesData } = await client.asCurrentUser.ilm.explainLifecycle({
     index: '*,.*',
-    only_managed: true,
   });
   return indicesList.map((index: Index) => {
     return {
diff --git a/x-pack/test/api_integration/apis/management/index_management/data_enrichers/ilm.ts b/x-pack/test/api_integration/apis/management/index_management/data_enrichers/ilm.ts
index 234a1518a9c59..3ae9b554bf3ee 100644
--- a/x-pack/test/api_integration/apis/management/index_management/data_enrichers/ilm.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/data_enrichers/ilm.ts
@@ -55,16 +55,17 @@ export default function ({ getService }: FtrProviderContext) {
   const testAlias = 'test_alias';
   const testIlmPolicy = 'test_policy';
   describe('GET indices with data enrichers', () => {
-    before(async () => {
+    beforeEach(async () => {
       await createIndex(testIndex);
-      await createIlmPolicy('test_policy');
-      await addPolicyToIndex(testIlmPolicy, testIndex, testAlias);
     });
-    after(async () => {
+    afterEach(async () => {
       await esDeleteAllIndices([testIndex]);
     });
 
     it(`ILM data is fetched by the ILM data enricher`, async () => {
+      await createIlmPolicy('test_policy');
+      await addPolicyToIndex(testIlmPolicy, testIndex, testAlias);
+
       const { body: indices } = await supertest
         .get(`${API_BASE_PATH}/indices`)
         .set('kbn-xsrf', 'xxx')
@@ -75,5 +76,18 @@ export default function ({ getService }: FtrProviderContext) {
       const { ilm } = index;
       expect(ilm.policy).to.eql(testIlmPolicy);
     });
+
+    it(`ILM data is not empty even if the index unmanaged`, async () => {
+      const { body: indices } = await supertest
+        .get(`${API_BASE_PATH}/indices`)
+        .set('kbn-xsrf', 'xxx')
+        .expect(200);
+
+      const index = indices.find((item: Index) => item.name === testIndex);
+
+      const { ilm } = index;
+      expect(ilm.index).to.eql(testIndex);
+      expect(ilm.managed).to.eql(false);
+    });
   });
 }