[Fleet] Remove ILM policy from fleet files indices and make them hidd…

…en (elastic#94651) (elastic#94668) * Remove ILM policy from files indices and make them hidden * use correct setting for hidden and auto_expand * fix tests * remove unused imports
stefnestor · Mar 23, 2023 · ec80f78 · ec80f78
1 parent 93ba778
commit ec80f78
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/x-pack/plugin/core/src/main/resources/fleet-file-data.json b/x-pack/plugin/core/src/main/resources/fleet-file-data.json
@@ -10,8 +10,8 @@
   },
   "template" : {
     "settings": {
-      "index.lifecycle.name": ".fleet-file-data-ilm-policy",
-      "auto_expand_replicas": "0-1"
+      "index.auto_expand_replicas": "0-1",
+      "index.hidden": true
     },
     "mappings": {
       "_doc": {

diff --git a/x-pack/plugin/core/src/main/resources/fleet-files.json b/x-pack/plugin/core/src/main/resources/fleet-files.json
@@ -10,8 +10,8 @@
   },
   "template": {
     "settings": {
-      "index.lifecycle.name": ".fleet-files-ilm-policy",
-      "index.auto_expand_replicas": "0-1"
+      "index.auto_expand_replicas": "0-1",
+      "index.hidden": true
     },
     "mappings": {
       "_doc": {

diff --git a/...lugin/fleet/src/javaRestTest/java/org/elasticsearch/xpack/fleet/FleetSystemIndicesIT.java b/...lugin/fleet/src/javaRestTest/java/org/elasticsearch/xpack/fleet/FleetSystemIndicesIT.java
@@ -9,7 +9,6 @@
 
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.Request;
-import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -18,7 +17,6 @@
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xcontent.XContentType;
 
-import java.util.List;
 import java.util.Map;
 
 import static org.hamcrest.Matchers.containsString;
@@ -40,22 +38,6 @@ protected Settings restClientSettings() {
             .build();
     }
 
-    private void expectSystemIndexWarning(Request request, String indexName) {
-        String warningMsg = "index name ["
-            + indexName
-            + "] starts with a dot '.', in the next major version, "
-            + "index names starting with a dot are reserved for hidden indices and system indices";
-
-        List<String> expectedWarnings = List.of(warningMsg);
-
-        logger.info("expecting warnings: " + expectedWarnings.toString());
-        RequestOptions consumeSystemIndicesWarningsOptions = RequestOptions.DEFAULT.toBuilder()
-            .setWarningsHandler(warnings -> expectedWarnings.equals(warnings) == false)
-            .build();
-
-        request.setOptions(consumeSystemIndicesWarningsOptions);
-    }
-
     public void testSearchWithoutIndexCreatedIsAllowed() throws Exception {
         Request request = new Request("GET", ".fleet-agents/_search");
         request.setJsonEntity("{ \"query\": { \"match_all\": {} } }");
@@ -98,7 +80,6 @@ public void testCreationOfFleetActions() throws Exception {
 
     public void testCreationOfFleetFiles() throws Exception {
         Request request = new Request("PUT", ".fleet-files-agent-00001");
-        expectSystemIndexWarning(request, ".fleet-files-agent-00001");
         Response response = client().performRequest(request);
         assertEquals(200, response.getStatusLine().getStatusCode());
 
@@ -111,7 +92,6 @@ public void testCreationOfFleetFiles() throws Exception {
 
     public void testCreationOfFleetFileData() throws Exception {
         Request request = new Request("PUT", ".fleet-file-data-agent-00001");
-        expectSystemIndexWarning(request, ".fleet-file-data-agent-00001");
         Response response = client().performRequest(request);
         assertEquals(200, response.getStatusLine().getStatusCode());