Merge branch 'main' into plugins/internal_search

.buildkite/scripts/dra-workflow.sh

@@ -6,7 +6,7 @@ WORKFLOW="${DRA_WORKFLOW:-snapshot}"
 BRANCH="${BUILDKITE_BRANCH:-}"
 
 # Don't publish main branch to staging
-if [[ ("$BRANCH" == "main" || "$BRANCH" == *.x) && "$WORKFLOW" == "staging" ]]; then
+if [[ "$BRANCH" == *.x && "$WORKFLOW" == "staging" ]]; then
   exit 0
 fi
 
@@ -22,13 +22,19 @@ if [[ "$BRANCH" == "main" ]]; then
 fi
 
 ES_VERSION=$(grep elasticsearch build-tools-internal/version.properties | sed "s/elasticsearch *= *//g")
+BASE_VERSION="$ES_VERSION"
 echo "ES_VERSION=$ES_VERSION"
 
 VERSION_SUFFIX=""
 if [[ "$WORKFLOW" == "snapshot" ]]; then
   VERSION_SUFFIX="-SNAPSHOT"
 fi
 
+if [[ -n "${VERSION_QUALIFIER:-}" ]]; then
+  ES_VERSION="${ES_VERSION}-${VERSION_QUALIFIER}"
+  echo "Version qualifier specified. ES_VERSION=${ES_VERSION}."
+fi
+
 BEATS_BUILD_ID="$(./.ci/scripts/resolve-dra-manifest.sh beats "$RM_BRANCH" "$ES_VERSION" "$WORKFLOW")"
 echo "BEATS_BUILD_ID=$BEATS_BUILD_ID"
 
@@ -37,6 +43,7 @@ echo "ML_CPP_BUILD_ID=$ML_CPP_BUILD_ID"
 
 LICENSE_KEY_ARG=""
 BUILD_SNAPSHOT_ARG=""
+VERSION_QUALIFIER_ARG=""
 
 if [[ "$WORKFLOW" == "staging" ]]; then
   LICENSE_KEY=$(mktemp -d)/license.key
@@ -47,6 +54,10 @@ if [[ "$WORKFLOW" == "staging" ]]; then
   BUILD_SNAPSHOT_ARG="-Dbuild.snapshot=false"
 fi
 
+if [[ -n "${VERSION_QUALIFIER:-}" ]]; then
+  VERSION_QUALIFIER_ARG="-Dbuild.version_qualifier=$VERSION_QUALIFIER"
+fi
+
 echo --- Building release artifacts
 
 .ci/scripts/run-gradle.sh -Ddra.artifacts=true \
@@ -56,12 +67,17 @@ echo --- Building release artifacts
   -Dcsv="$WORKSPACE/build/distributions/dependencies-${ES_VERSION}${VERSION_SUFFIX}.csv" \
   $LICENSE_KEY_ARG \
   $BUILD_SNAPSHOT_ARG \
+  $VERSION_QUALIFIER_ARG \
   buildReleaseArtifacts \
   exportCompressedDockerImages \
   :distribution:generateDependenciesReport
 
 PATH="$PATH:${JAVA_HOME}/bin" # Required by the following script
+if [[ -z "${VERSION_QUALIFIER:-}" ]]; then
 x-pack/plugin/sql/connectors/tableau/package.sh asm qualifier="$VERSION_SUFFIX"
+else
+x-pack/plugin/sql/connectors/tableau/package.sh asm qualifier="-$VERSION_QUALIFIER"
+fi
 
 # we regenerate this file as part of the release manager invocation
 rm "build/distributions/elasticsearch-jdbc-${ES_VERSION}${VERSION_SUFFIX}.taco.sha512"
@@ -88,7 +104,8 @@ docker run --rm \
   --branch "$RM_BRANCH" \
   --commit "$BUILDKITE_COMMIT" \
   --workflow "$WORKFLOW" \
-  --version "$ES_VERSION" \
+  --qualifier "${VERSION_QUALIFIER:-}" \
+  --version "$BASE_VERSION" \
   --artifact-set main \
   --dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \
   --dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json"

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

@@ -8,7 +8,7 @@ source .buildkite/scripts/branches.sh
 
 for BRANCH in "${BRANCHES[@]}"; do
   if [[ "$BRANCH" == "main" ]]; then
-    continue
+    export VERSION_QUALIFIER="alpha1"
   fi
 
   INTAKE_PIPELINE_SLUG="elasticsearch-intake"
@@ -24,5 +24,6 @@ for BRANCH in "${BRANCHES[@]}"; do
       commit: "$LAST_GOOD_COMMIT"
       env:
         DRA_WORKFLOW: staging
+        VERSION_QUALIFIER: ${VERSION_QUALIFIER:-}
 EOF
 done

benchmarks/src/main/java/org/elasticsearch/benchmark/bytes/BytesArrayReadLongBenchmark.java

@@ -47,7 +47,7 @@ public class BytesArrayReadLongBenchmark {
     @Setup
     public void initResults() throws IOException {
         final BytesStreamOutput tmp = new BytesStreamOutput();
-        final long bytes = new ByteSizeValue(dataMb, ByteSizeUnit.MB).getBytes();
+        final long bytes = ByteSizeValue.of(dataMb, ByteSizeUnit.MB).getBytes();
         for (int i = 0; i < bytes / 8; i++) {
             tmp.writeLong(i);
         }

benchmarks/src/main/java/org/elasticsearch/benchmark/bytes/PagedBytesReferenceReadLongBenchmark.java

@@ -47,7 +47,7 @@ public class PagedBytesReferenceReadLongBenchmark {
     @Setup
     public void initResults() throws IOException {
         final BytesStreamOutput tmp = new BytesStreamOutput();
-        final long bytes = new ByteSizeValue(dataMb, ByteSizeUnit.MB).getBytes();
+        final long bytes = ByteSizeValue.of(dataMb, ByteSizeUnit.MB).getBytes();
         for (int i = 0; i < bytes / 8; i++) {
             tmp.writeLong(i);
         }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaModulePathPlugin.java

@@ -53,7 +53,7 @@ public void apply(Project project) {
     }
 
     // List of root tasks, by name, whose compileJava task should not use the module path. These are test related sources.
-    static final Set<String> EXCLUDES = Set.of(":test:framework", ":x-pack:plugin:eql:qa:common");
+    static final Set<String> EXCLUDES = Set.of(":test:framework", ":x-pack:plugin:eql:qa:common", ":x-pack:plugin:esql:compute:test");
 
     void configureCompileModulePath(Project project) {
         // first disable Gradle's builtin module path inference

docs/changelog/118619.yaml

@@ -0,0 +1,5 @@
+pr: 118619
+summary: Optional named arguments for function in map
+area: EQL
+type: enhancement
+issues: []

docs/changelog/119889.yaml

@@ -0,0 +1,5 @@
+pr: 119889
+summary: Optimize ST_EXTENT_AGG for `geo_shape` and `cartesian_shape`
+area: "ES|QL"
+type: enhancement
+issues: []

docs/changelog/120142.yaml

@@ -0,0 +1,13 @@
+pr: 120142
+summary: Limit `ByteSizeUnit` to 2 decimals
+area: Infra/Core
+type: breaking
+issues: []
+breaking:
+  title: Limit `ByteSizeUnit` to 2 decimals
+  area: Cluster and node setting
+  details: In the past, byte values like `1.25 mb` were allowed but deprecated. Now, values with up to two decimal places are allowed,
+    unless the unit is bytes, in which case no decimals are allowed. Values with too many decimal places result in an error.
+  impact: Values with more than two decimal places, like `0.123 mb` will be rejected as an error,
+    where in the past, they'd be accepted with a deprecation warning.
+  notable: false

docs/changelog/120163.yaml

@@ -0,0 +1,5 @@
+pr: 120163
+summary: Filter deprecated settings when making dest index
+area: Data streams
+type: enhancement
+issues: []

docs/reference/docs/reindex.asciidoc

@@ -1132,91 +1132,4 @@ Reindex from remote supports configurable SSL settings. These must be
 specified in the `elasticsearch.yml` file, with the exception of the
 secure settings, which you add in the Elasticsearch keystore.
 It is not possible to configure SSL in the body of the `_reindex` request.
-
-The following settings are supported:
-
-`reindex.ssl.certificate_authorities`::
-List of paths to PEM encoded certificate files that should be trusted.
-You cannot specify both `reindex.ssl.certificate_authorities` and
-`reindex.ssl.truststore.path`.
-
-`reindex.ssl.truststore.path`::
-The path to the Java Keystore file that contains the certificates to trust.
-This keystore can be in "JKS" or "PKCS#12" format.
-You cannot specify both `reindex.ssl.certificate_authorities` and
-`reindex.ssl.truststore.path`.
-
-`reindex.ssl.truststore.password`::
-The password to the truststore (`reindex.ssl.truststore.path`).
-deprecated:[7.17.0] Prefer `reindex.ssl.truststore.secure_password` instead.
-This setting cannot be used with `reindex.ssl.truststore.secure_password`.
-
-`reindex.ssl.truststore.secure_password` (<<secure-settings,Secure>>)::
-The password to the truststore (`reindex.ssl.truststore.path`).
-This setting cannot be used with `reindex.ssl.truststore.password`.
-
-`reindex.ssl.truststore.type`::
-The type of the truststore (`reindex.ssl.truststore.path`).
-Must be either `jks` or `PKCS12`. If the truststore path ends in ".p12", ".pfx"
-or "pkcs12", this setting defaults to `PKCS12`. Otherwise, it defaults to `jks`.
-
-`reindex.ssl.verification_mode`::
-Indicates the type of verification to protect against man in the middle attacks
-and certificate forgery.
-One of `full` (verify the hostname and the certificate path), `certificate`
-(verify the certificate path, but not the hostname) or `none` (perform no
-verification - this is strongly discouraged in production environments).
-Defaults to `full`.
-
-`reindex.ssl.certificate`::
-Specifies the path to the PEM encoded certificate (or certificate chain) to be
-used for HTTP client authentication (if required by the remote cluster)
-This setting requires that `reindex.ssl.key` also be set.
-You cannot specify both `reindex.ssl.certificate` and `reindex.ssl.keystore.path`.
-
-`reindex.ssl.key`::
-Specifies the path to the PEM encoded private key associated with the
-certificate used for client authentication (`reindex.ssl.certificate`).
-You cannot specify both `reindex.ssl.key` and `reindex.ssl.keystore.path`.
-
-`reindex.ssl.key_passphrase`::
-Specifies the passphrase to decrypt the PEM encoded private key
-(`reindex.ssl.key`) if it is encrypted.
-deprecated:[7.17.0] Prefer `reindex.ssl.secure_key_passphrase` instead.
-Cannot be used with `reindex.ssl.secure_key_passphrase`.
-
-`reindex.ssl.secure_key_passphrase` (<<secure-settings,Secure>>)::
-Specifies the passphrase to decrypt the PEM encoded private key
-(`reindex.ssl.key`) if it is encrypted.
-Cannot be used with `reindex.ssl.key_passphrase`.
-
-`reindex.ssl.keystore.path`::
-Specifies the path to the keystore that contains a private key and certificate
-to be used for HTTP client authentication (if required by the remote cluster).
-This keystore can be in "JKS" or "PKCS#12" format.
-You cannot specify both `reindex.ssl.key` and `reindex.ssl.keystore.path`.
-
-`reindex.ssl.keystore.type`::
-The type of the keystore (`reindex.ssl.keystore.path`). Must be either `jks` or `PKCS12`.
-If the keystore path ends in ".p12", ".pfx" or "pkcs12", this setting defaults
-to `PKCS12`. Otherwise, it defaults to `jks`.
-
-`reindex.ssl.keystore.password`::
-The password to the keystore (`reindex.ssl.keystore.path`).
-deprecated:[7.17.0] Prefer `reindex.ssl.keystore.secure_password` instead.
-This setting cannot be used with `reindex.ssl.keystore.secure_password`.
-
-`reindex.ssl.keystore.secure_password` (<<secure-settings,Secure>>)::
-The password to the keystore (`reindex.ssl.keystore.path`).
-This setting cannot be used with `reindex.ssl.keystore.password`.
-
-`reindex.ssl.keystore.key_password`::
-The password for the key in the keystore (`reindex.ssl.keystore.path`).
-Defaults to the keystore password.
-deprecated:[7.17.0] Prefer `reindex.ssl.keystore.secure_key_password` instead.
-This setting cannot be used with `reindex.ssl.keystore.secure_key_password`.
-
-`reindex.ssl.keystore.secure_key_password` (<<secure-settings,Secure>>)::
-The password for the key in the keystore (`reindex.ssl.keystore.path`).
-Defaults to the keystore password. This setting cannot be used with
-`reindex.ssl.keystore.key_password`.
+Refer to <<reindex-settings>>.