Merge branch '9.0' into backport/9.0/pr-131767

Author: albertzaharovits

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

@@ -59,9 +59,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:early-deprecation-rest");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:rest");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:downsample:qa:with-security");
-        map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest");
-        map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest-with-advanced-security");
-        map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:enrich:qa:rest-with-security");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search:qa:rest");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:ccs-rolling-upgrade");
         map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:correctness");

build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java

@@ -11,15 +11,17 @@
 
 public enum Architecture {
 
-    X64("x86_64", "linux/amd64"),
-    AARCH64("aarch64", "linux/arm64");
+    X64("x86_64", "linux/amd64", "amd64"),
+    AARCH64("aarch64", "linux/arm64", "arm64");
 
     public final String classifier;
     public final String dockerPlatform;
+    public final String dockerClassifier;
 
-    Architecture(String classifier, String dockerPlatform) {
+    Architecture(String classifier, String dockerPlatform, String dockerClassifier) {
         this.classifier = classifier;
         this.dockerPlatform = dockerPlatform;
+        this.dockerClassifier = dockerClassifier;
     }
 
     public static Architecture current() {

distribution/docker/build.gradle

@@ -643,7 +643,7 @@ subprojects { Project subProject ->
       it.setCompression(Compression.GZIP)
       it.getArchiveBaseName().set("elasticsearch${base.suffix}-${VersionProperties.elasticsearch}-docker-image")
       it.getArchiveVersion().set("")
-      it.getArchiveClassifier().set(architecture == Architecture.AARCH64 ? 'aarch64' : '')
+      it.getArchiveClassifier().set(architecture.dockerClassifier)
       it.getDestinationDirectory().set(new File(project.parent.buildDir, 'distributions'))
       it.dependsOn(exportTask)
     }

docs/changelog/130279.yaml

@@ -0,0 +1,5 @@
+pr: 130279
+summary: Fix missing removal of query cancellation callback in QueryPhase
+area: Search
+type: bug
+issues: [130071]

docs/changelog/131680.yaml

@@ -0,0 +1,5 @@
+pr: 131680
+summary: Grant server module read/write entitlements for deprecated path setting "path.shared_data"
+area: Infra/Core
+type: bug
+issues: []

docs/changelog/131990.yaml

@@ -0,0 +1,6 @@
+pr: 131990
+summary: Prevent the trained model deployment memory estimation from double-counting
+  allocations
+area: Machine Learning
+type: bug
+issues: []

docs/reference/elasticsearch-plugins/cloud/ec-plugins-guide.md

@@ -49,7 +49,7 @@ curl -X POST \
   -H "Authorization: ApiKey $CLOUD_API_KEY" \
   -H 'Content-Type: application/json' \
   -d '{
-   "download_url" : "https://my_site/custom-plugin-8.4.3.zip",
+   "download_url" : "<MY_SITE_URL>/custom-plugin-8.4.3.zip",
    "extension_type" : "plugin",
    "name" : "custom-plugin",
    "version" : "8.4.3"
@@ -323,7 +323,7 @@ curl -X POST \
   -H "Authorization: ApiKey $CLOUD_API_KEY" \
   -H 'Content-Type: application/json' \
   -d '{
-   "download_url" : "https://my_site/custom-plugin-8.4.3-10212022.zip",
+   "download_url" : "<MY_SITE_URL>/custom-plugin-8.4.3-10212022.zip",
    "extension_type" : "plugin",
     "name": "custom-plugin-10212022",
    "version" : "8.4.3"

docs/reference/elasticsearch-plugins/manage-plugins-using-configuration-file.md

@@ -25,7 +25,7 @@ plugins:
   - id: analysis-icu
   - id: repository-azure
   - id: custom-mapper
-    location: https://example.com/archive/custom-mapper-1.0.0.zip
+    location: <EXAMPLE_URL>/archive/custom-mapper-1.0.0.zip
 ```
 
 This example installs the official `analysis-icu` and `repository-azure` plugins, and one unofficial plugin. Every plugin must provide an `id`. Unofficial plugins must also provide a `location`. This is typically a URL, but Maven coordinates are also supported. The downloaded plugin’s name must match the ID in the configuration file.
@@ -35,7 +35,7 @@ While {{es}} will respect the [standard Java proxy system properties](https://do
 ```yaml
 plugins:
   - id: custom-mapper
-    location: https://example.com/archive/custom-mapper-1.0.0.zip
+    location: <EXAMPLE_URL>/archive/custom-mapper-1.0.0.zip
 proxy: proxy.example.com:8443
 ```
 

docs/reference/elasticsearch-plugins/plugin-management-custom-url.md

@@ -46,13 +46,13 @@ HTTP
 :   To install a plugin from an HTTP URL:
 
     ```shell
-    sudo bin/elasticsearch-plugin install https://some.domain/path/to/plugin.zip
+    sudo bin/elasticsearch-plugin install <EXAMPLE_PLUGIN_HOST_URL>/plugin.zip
     ```
 
     The plugin script will refuse to talk to an HTTPS URL with an untrusted certificate. To use a self-signed HTTPS cert, you will need to add the CA cert to a local Java truststore and pass the location to the script as follows:
 
     ```shell
-    sudo CLI_JAVA_OPTS="-Djavax.net.ssl.trustStore=/path/to/trustStore.jks" bin/elasticsearch-plugin install https://host/plugin.zip
+    sudo CLI_JAVA_OPTS="-Djavax.net.ssl.trustStore=/path/to/trustStore.jks" bin/elasticsearch-plugin install <MY_HOST_URL>/plugin.zip
     ```
 
 

docs/reference/elasticsearch/command-line-tools/saml-metadata.md

@@ -112,6 +112,6 @@ bin/elasticsearch-saml-metadata --realm saml2 \
     --locale en-GB \
     --contacts \
     --organisation-name "Mega Corp. Finance Team" \
-    --organisation-url "http://mega.example.com/finance/"
+    --organisation-url "<EXAMPLE_URL>/finance/"
 ```