remove logsdb legacy feature

martijnvg · Oct 30, 2024 · 95aa2fd · 95aa2fd
1 parent d536513
commit 95aa2fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...rade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java b/...rade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java
@@ -17,7 +17,6 @@
 import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.test.rest.ObjectPath;
-import org.elasticsearch.test.rest.RestTestLegacyFeatures;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
@@ -74,8 +73,8 @@ public LogsdbIndexingRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes)
 
     public void testIndexing() throws Exception {
         assumeTrue(
-            "test relies on logsdb being available",
-            oldClusterHasFeature(RestTestLegacyFeatures.LOGSDB_TECH_PREVIEW)
+            "Logsdb is tech preview since 8.15.0",
+            getOldClusterTestVersion().onOrAfter("8.15.0")
         );
         String dataStreamName = "logs-bwc-test";
         if (isOldCluster()) {

diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java b/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java
@@ -128,8 +128,6 @@ public class RestTestLegacyFeatures implements FeatureSpecification {
 
     public static final NodeFeature ES_QL_GA = new NodeFeature("esql.ga");
 
-    public static final NodeFeature LOGSDB_TECH_PREVIEW = new NodeFeature("logsdb.tech_preview");
-
     /*
      * Starting with 8.11, cluster state has minimum system index mappings versions (#99307) and the system index mappings upgrade service
      * started using them to determine when to update mappings for system indices. See https://github.com/elastic/elasticsearch/pull/99668
@@ -189,8 +187,7 @@ public Map<NodeFeature, Version> getHistoricalFeatures() {
             entry(DISABLE_FIELD_NAMES_FIELD_REMOVED, Version.V_8_0_0),
             entry(ML_NLP_SUPPORTED, Version.V_8_0_0),
             entry(MAPPINGS_UPGRADE_SERVICE_USES_MAPPINGS_VERSION, Version.V_8_11_0),
-            entry(ES_QL_GA, Version.V_8_14_0),
-            entry(LOGSDB_TECH_PREVIEW, Version.V_8_15_0)
+            entry(ES_QL_GA, Version.V_8_14_0)
         );
     }
 }