Merge branch 'main' of github.com:elastic/elasticsearch into sa-failure-store-dls-fls-interceptor

Author: slobodanadamovic

.buildkite/scripts/dra-update-staging.sh

@@ -36,9 +36,6 @@ for BRANCH in "${BRANCHES[@]}"; do
   fi
 
   if [[ "$SHOULD_TRIGGER" == "true" ]]; then
-    if [[ "$BRANCH" == "9.0" ]]; then
-      export VERSION_QUALIFIER="rc1"
-    fi
     echo "Triggering DRA staging workflow for $BRANCH"
     cat << EOF | buildkite-agent pipeline upload
 steps:
@@ -49,7 +46,6 @@ steps:
       branch: "$BRANCH"
       env:
         DRA_WORKFLOW: staging
-        VERSION_QUALIFIER: ${VERSION_QUALIFIER:-}
 EOF
   fi
 done

.buildkite/scripts/dra-workflow.trigger.sh

@@ -8,7 +8,7 @@ source .buildkite/scripts/branches.sh
 
 for BRANCH in "${BRANCHES[@]}"; do
   if [[ "$BRANCH" == "9.0" ]]; then
-    export VERSION_QUALIFIER="rc1"
+    continue
   fi
 
   INTAKE_PIPELINE_SLUG="elasticsearch-intake"

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java

@@ -24,6 +24,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +46,8 @@ public abstract class RunTask extends DefaultTestClustersTask {
 
     private Boolean apmServerEnabled = false;
 
+    private List<String> plugins = List.of();
+
     private Boolean preserveData = false;
 
     private Path dataDir = null;
@@ -101,6 +104,22 @@ public void setApmServerEnabled(Boolean apmServerEnabled) {
         this.apmServerEnabled = apmServerEnabled;
     }
 
+    @Option(option = "with-plugins", description = "Run distribution with plugins installed")
+    public void setPlugins(String plugins) {
+        this.plugins = Arrays.asList(plugins.split(","));
+        for (var cluster : getClusters()) {
+            for (String plugin : this.plugins) {
+                cluster.plugin(":plugins:" + plugin);
+            }
+            dependsOn(cluster.getPluginAndModuleConfigurations());
+        }
+    }
+
+    @Input
+    public List<String> getPlugins() {
+        return plugins;
+    }
+
     @Option(option = "data-dir", description = "Override the base data directory used by the testcluster")
     public void setDataDir(String dataDirStr) {
         dataDir = Paths.get(dataDirStr).toAbsolutePath();

docs/changelog/123712.yaml

@@ -0,0 +1,5 @@
+pr: 123712
+summary: Process ILM cluster state updates on another thread
+area: ILM+SLM
+type: enhancement
+issues: []

docs/changelog/124690.yaml

@@ -0,0 +1,5 @@
+pr: 124690
+summary: Avoid creating known_fields for every check in Alias
+area: Indices APIs
+type: enhancement
+issues: []

docs/changelog/125204.yaml

@@ -0,0 +1,6 @@
+pr: 125204
+summary: Return a Conflict status code if the model deployment is stopped by a user
+area: Machine Learning
+type: bug
+issues:
+ - 123745

docs/changelog/125345.yaml

@@ -0,0 +1,6 @@
+pr: 125345
+summary: ESQL - date nanos range bug?
+area: ES|QL
+type: bug
+issues:
+ - 125439

docs/changelog/125446.yaml

@@ -0,0 +1,5 @@
+pr: 125446
+summary: Fix Semantic Text 8.x Upgrade Bug
+area: Mapping
+type: bug
+issues: []

docs/docset.yml

@@ -1,4 +1,5 @@
 project: 'Elasticsearch'
+max_toc_depth: 2
 exclude:
   - README.md
   - internal/*
@@ -22,15 +23,7 @@ cross_links:
   - kibana
   - logstash
 toc:
-  - toc: reference/elasticsearch
-  - toc: reference/community-contributed
-  - toc: reference/enrich-processor
-  - toc: reference/search-connectors
-  - toc: reference/elasticsearch-plugins
-  - toc: reference/query-languages
-  - toc: reference/scripting-languages
-  - toc: reference/text-analysis
-  - toc: reference/aggregations
+  - toc: reference
   - toc: release-notes
   - toc: extend
 subs:

docs/reference/elasticsearch/index.md

@@ -1 +1,18 @@
-# Elasticsearch and index management
+# Elasticsearch and index management
+
+% TO-DO: Add links to "Elasticsearch basics"%
+
+This section contains reference information for Elasticsearch and index management features, including:
+
+* Settings
+* Security roles and privileges
+* Index lifecycle actions
+* Mappings
+* Command line tools
+* Curator
+* Clients
+
+% TO-DO: Add links to "query language and scripting language sections"%
+
+Elasticsearch also provides REST APIs that are used by the UI components and can be called directly to configure and access Elasticsearch features.
+Refer to [Elasticsearch API](https://www.elastic.co/docs/api/doc/elasticsearch) and [Elasticsearch Serverless API](https://www.elastic.co/docs/api/doc/elasticsearch-serverless).