Merge branch 'main' into http-aggregator-removal

Author: mhl-b

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy

@@ -9,11 +9,16 @@
 
 package org.elasticsearch.gradle.internal
 
+import spock.lang.IgnoreIf
+
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
 import org.gradle.testkit.runner.TaskOutcome
 import org.xmlunit.builder.DiffBuilder
 import org.xmlunit.builder.Input
 
+// Ignoring this test on windows due to what appears to be a bug in the gradle testkit runner.
+// https://github.com/elastic/elasticsearch/issues/129100
+@IgnoreIf({ os.isWindows() })
 class PublishPluginFuncTest extends AbstractGradleFuncTest {
 
     def setup() {

build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import org.elasticsearch.gradle.Version
+import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
+
+tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
+  // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
+  usesBwcDistribution(Version.fromString("0.0.0"))
+  systemProperty("tests.old_cluster_version", "0.0.0")
+  onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
+}

distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

@@ -172,8 +172,10 @@ RUN cat <<EOF > /usr/share/elasticsearch/config/jvm.options.d/fips.options
 -Dorg.bouncycastle.fips.approved_only=true
 -Djava.security.properties=config/fips_java.security
 -Djava.security.policy=config/fips_java.policy
+-Djavax.net.ssl.trustStoreType=BCFKS
 -Djavax.net.ssl.trustStore=config/cacerts.bcfks
 -Djavax.net.ssl.trustStorePassword=passwordcacert
+
 EOF
 
 EXPOSE 9200 9300

docs/changelog/127621.yaml

@@ -0,0 +1,5 @@
+pr: 127621
+summary: Fix error message when changing the password for a user in the file realm
+area: Security
+type: bug
+issues: []

docs/changelog/129161.yaml

@@ -0,0 +1,5 @@
+pr: 129161
+summary: Add Telemetry for models without adaptive allocations
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/129391.yaml

@@ -0,0 +1,7 @@
+pr: 129391
+summary: Ensure that anomaly detection job state update retries if master node is
+  temoporarily unavailable
+area: Machine Learning
+type: bug
+issues:
+ - 126148

docs/reference/query-languages/query-dsl/query-dsl-combined-fields-query.md

@@ -76,12 +76,10 @@ See [Use synonyms with match query](/reference/query-languages/query-dsl/query-d
 
 `operator`
 :   (Optional, string) Boolean logic used to interpret text in the `query` value. Valid values are:
-
-`or` (Default)
-:   For example, a `query` value of `database systems` is interpreted as `database OR systems`.
-
-`and`
-:   For example, a `query` value of `database systems` is interpreted as `database AND systems`.
+  - `or` (Default)
+  For example, a `query` value of `database systems` is interpreted as `database OR systems`.
+  - `and`
+  For example, a `query` value of `database systems` is interpreted as `database AND systems`.
 
 
 `minimum_should_match`
@@ -90,12 +88,10 @@ See [Use synonyms with match query](/reference/query-languages/query-dsl/query-d
 
 `zero_terms_query`
 :   (Optional, string) Indicates whether no documents are returned if the `analyzer` removes all tokens, such as when using a `stop` filter. Valid values are:
-
-`none` (Default)
-:   No documents are returned if the `analyzer` removes all tokens.
-
-`all`
-:   Returns all documents, similar to a [`match_all`](/reference/query-languages/query-dsl/query-dsl-match-all-query.md) query.
+  - `none` (Default)
+  No documents are returned if the `analyzer` removes all tokens.
+  - `all`
+  Returns all documents, similar to a [`match_all`](/reference/query-languages/query-dsl/query-dsl-match-all-query.md) query.
 
 See [Zero terms query](/reference/query-languages/query-dsl/query-dsl-match-query.md#query-dsl-match-query-zero) for an example.
 

docs/reference/query-languages/query-dsl/query-dsl-match-query.md

@@ -11,7 +11,7 @@ Returns documents that match a provided text, number, date or boolean value. The
 
 The `match` query is the standard query for performing a full-text search, including options for fuzzy matching.
 
-`Match` will also work against [semantic_text](/reference/elasticsearch/mapping-reference/semantic-text.md) fields. 
+`Match` will also work against [semantic_text](/reference/elasticsearch/mapping-reference/semantic-text.md) fields.
 As `semantic_text` does not support lexical text search, `match` queries against `semantic_text` fields will automatically perform the correct semantic search.
 Because of this, options that specifically target lexical search such as `fuzziness` or `analyzer` will be ignored.
 
@@ -83,26 +83,20 @@ If the `fuzziness` parameter is not `0`, the `match` query uses a `fuzzy_rewrite
 
 `operator`
 :   (Optional, string) Boolean logic used to interpret text in the `query` value. Valid values are:
-
-`OR` (Default)
-:   For example, a `query` value of `capital of Hungary` is interpreted as `capital OR of OR Hungary`.
-
-`AND`
-:   For example, a `query` value of `capital of Hungary` is interpreted as `capital AND of AND Hungary`.
-
+  - `OR` (Default)
+  For example, a `query` value of `capital of Hungary` is interpreted as `capital OR of OR Hungary`.
+  - `AND`
+  For example, a `query` value of `capital of Hungary` is interpreted as `capital AND of AND Hungary`.
 
 `minimum_should_match`
 :   (Optional, string) Minimum number of clauses that must match for a document to be returned. See the [`minimum_should_match` parameter](/reference/query-languages/query-dsl/query-dsl-minimum-should-match.md) for valid values and more information.
 
-
 `zero_terms_query`
 :   (Optional, string) Indicates whether no documents are returned if the `analyzer` removes all tokens, such as when using a `stop` filter. Valid values are:
-
-`none` (Default)
-:   No documents are returned if the `analyzer` removes all tokens.
-
-`all`
-:   Returns all documents, similar to a [`match_all`](/reference/query-languages/query-dsl/query-dsl-match-all-query.md) query.
+  - `none` (Default)
+  No documents are returned if the `analyzer` removes all tokens.
+  - `all`
+  Returns all documents, similar to a [`match_all`](/reference/query-languages/query-dsl/query-dsl-match-all-query.md) query.
 
 See [Zero terms query](#query-dsl-match-query-zero) for an example.
 

docs/reference/query-languages/query-dsl/query-dsl-query-string-query.md

@@ -85,16 +85,12 @@ are only [normalized](/reference/text-analysis/normalizers.md).
 
 Boost values are relative to the default value of `1.0`. A boost value between `0` and `1.0` decreases the relevance score. A value greater than `1.0` increases the relevance score.
 
-
 `default_operator`
 :   (Optional, string) Default boolean logic used to interpret text in the query string if no operators are specified. Valid values are:
-
-`OR` (Default)
-:   For example, a query string of `capital of Hungary` is interpreted as `capital OR of OR Hungary`.
-
-`AND`
-:   For example, a query string of `capital of Hungary` is interpreted as `capital AND of AND Hungary`.
-
+  - `OR` (Default)
+  For example, a query string of `capital of Hungary` is interpreted as `capital OR of OR Hungary`.
+  - `AND`
+  For example, a query string of `capital of Hungary` is interpreted as `capital AND of AND Hungary`.
 
 `enable_position_increments`
 :   (Optional, Boolean) If `true`, enable position increments in queries constructed from a `query_string` search. Defaults to `true`.

docs/reference/query-languages/query-dsl/query-dsl-simple-query-string-query.md

@@ -49,12 +49,10 @@ There is a limit on the number of fields that can be queried at once. It is defi
 
 `default_operator`
 :   (Optional, string) Default boolean logic used to interpret text in the query string if no operators are specified. Valid values are:
-
-`OR` (Default)
-:   For example, a query string of `capital of Hungary` is interpreted as `capital OR of OR Hungary`.
-
-`AND`
-:   For example, a query string of `capital of Hungary` is interpreted as `capital AND of AND Hungary`.
+  - `OR` (Default)
+  For example, a query string of `capital of Hungary` is interpreted as `capital OR of OR Hungary`.
+  - `AND`
+  For example, a query string of `capital of Hungary` is interpreted as `capital AND of AND Hungary`.
 
 
 `analyze_wildcard`