From f5af0691e14461000cb578944e85afb45ab9cf99 Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@elastic.co>
Date: Tue, 29 Oct 2024 11:44:21 +0400
Subject: [PATCH 1/2] Ignore more serverless index templates

---
 test_elasticsearch_serverless/utils.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test_elasticsearch_serverless/utils.py b/test_elasticsearch_serverless/utils.py
index 49f7ba9..7155711 100644
--- a/test_elasticsearch_serverless/utils.py
+++ b/test_elasticsearch_serverless/utils.py
@@ -95,8 +95,6 @@ def wipe_indices(client):
 
 
 def wipe_xpack_templates(client):
-    # Delete component templates, need to retry because sometimes
-    # indices aren't cleaned up in time before we issue the delete.
     templates = client.cluster.get_component_template()["component_templates"]
     templates_to_delete = [
         template["name"]
@@ -135,7 +133,7 @@ def is_xpack_template(name):
         return True
     elif name.startswith("entities_v1_"):
         return True
-    if name in {
+    return name in {
         "apm-10d@lifecycle",
         "apm-180d@lifecycle",
         "apm-390d@lifecycle",
@@ -153,6 +151,7 @@ def is_xpack_template(name):
         "logs@mappings",
         "logs-settings",
         "logs@settings",
+        "logs-fleet_server.output_health",
         "metrics-apm@mappings",
         "metrics-apm.service_destination@mappings",
         "metrics-apm.service_summary@mappings",
@@ -165,6 +164,8 @@ def is_xpack_template(name):
         "metrics@settings",
         "metrics-tsdb-settings",
         "metrics@tsdb-settings",
+        "metrics-fleet_server.agent_status",
+        "metrics-fleet_server.agent_versions",
         "synthetics-mappings",
         "synthetics@mappings",
         "synthetics-settings",
@@ -180,9 +181,7 @@ def is_xpack_template(name):
         "ecs-tsdb@mappings",
         "logs-otel@mappings",
         "otel@mappings",
-    }:
-        return True
-    return False
+    }
 
 
 def es_api_key() -> str:

From 8c6a2b1b9b4e9eeed19ad804883f3d218e05f872 Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@elastic.co>
Date: Tue, 29 Oct 2024 11:54:14 +0400
Subject: [PATCH 2/2] Ignore more component templates

---
 test_elasticsearch_serverless/utils.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/test_elasticsearch_serverless/utils.py b/test_elasticsearch_serverless/utils.py
index 7155711..4449d50 100644
--- a/test_elasticsearch_serverless/utils.py
+++ b/test_elasticsearch_serverless/utils.py
@@ -121,11 +121,7 @@ def wipe_transforms(client: Elasticsearch, timeout=30):
 
 
 def is_xpack_template(name):
-    if name.startswith(".alerts-"):
-        return True
-    elif name.startswith(".kibana-data-quality-dashboard-"):
-        return True
-    elif name.startswith(".kibana-elastic-ai-assistant-component-template-"):
+    if name.startswith("."):
         return True
     elif name.startswith("behavioral_analytics-events"):
         return True
@@ -133,6 +129,8 @@ def is_xpack_template(name):
         return True
     elif name.startswith("entities_v1_"):
         return True
+    elif "fleet_server" in name:
+        return True
     return name in {
         "apm-10d@lifecycle",
         "apm-180d@lifecycle",
@@ -151,7 +149,6 @@ def is_xpack_template(name):
         "logs@mappings",
         "logs-settings",
         "logs@settings",
-        "logs-fleet_server.output_health",
         "metrics-apm@mappings",
         "metrics-apm.service_destination@mappings",
         "metrics-apm.service_summary@mappings",
@@ -164,8 +161,6 @@ def is_xpack_template(name):
         "metrics@settings",
         "metrics-tsdb-settings",
         "metrics@tsdb-settings",
-        "metrics-fleet_server.agent_status",
-        "metrics-fleet_server.agent_versions",
         "synthetics-mappings",
         "synthetics@mappings",
         "synthetics-settings",