Merge branch 'main' into update-sec-325

Author: jmikell821

deploy-manage/_snippets/autoops-cc-payment-faq.md

@@ -1 +1 @@
-Using [AutoOps for ECE, ECK, and self-managed clusters](/deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md) through Cloud Connect is included with your [self-managed Enterprise license](https://www.elastic.co/subscriptions).
+Using [AutoOps for ECE, ECK, and self-managed clusters](/deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md) through Cloud Connect is included with your [self-managed Enterprise license](https://www.elastic.co/subscriptions) and self-managed free trials. 

deploy-manage/deploy/cloud-enterprise/fresh-installation-of-ece-using-podman-hosts.md

@@ -76,4 +76,6 @@ This section provides guidelines and recommendations to install ECE using a Podm
 
     To add a new allocator, use `--roles "allocator"`. To add a new coordinator, director, proxy, and allocator, use `--roles "allocator,coordinator,director,proxy"`
 
-
+::::{note}
+When using Podman, removing an image with the `--force` (`-f`) option not only deletes the image reference but also removes any containers that depend on that image. This behavior differs from Docker, where forced image removal does not automatically remove running or stopped containers. Therefore, avoid using the `--force` (`-f`) option with the `docker rmi` command.
+::::

deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md

@@ -521,3 +521,7 @@ Using Docker or Podman as container runtime is a configuration local to the host
     5. Remove the Docker allocator by following the [Delete Hosts](../../maintenance/ece/delete-ece-hosts.md) guidelines.
 
     As an alternative, use the [Delete Runner](https://www.elastic.co/docs/api/doc/cloud-enterprise/operation/operation-delete-runner) API.
+
+::::{note}
+When using Podman, removing an image with the `--force` (`-f`) option not only deletes the image reference but also removes any containers that depend on that image. This behavior differs from Docker, where forced image removal does not automatically remove running or stopped containers. Therefore, avoid using the `--force` (`-f`) option with the `docker rmi` command.
+::::

deploy-manage/deploy/elastic-cloud/regions.md

@@ -54,7 +54,9 @@ The following GCP regions are currently available:
 | asia-south1 | Mumbai |
 | europe-west1 | Belgium |
 | us-central1 | Iowa |
-
+| us-east1 | South Carolina |
+| us-east4 | Virginia |
+| us-west1 | Oregon |
 
 ## Marketplaces
 

deploy-manage/monitor/_snippets/autoops-cc-regions.md

@@ -1,5 +1,3 @@
-Choose from the following AWS regions:
-
 | Region | Name |
 | --- | --- | 
 | us-east-2 | Ohio |

deploy-manage/monitor/autoops/cc-cloud-connect-autoops-faq.md

@@ -14,6 +14,7 @@ Find answers to your questions about AutoOps for ECE, ECK, and self-managed clus
 **General questions**
 * [Why should I use AutoOps for my clusters?](#why-autoops)
 * [Does this feature require additional payment?](#additional-payment)
+* [Is there an added cost for shipping metrics data to {{ecloud}}?](#autoops-metrics-cost)
 * [Which versions of {{es}} does AutoOps support?](#es-versions)
 * [Which deployment types can be connected to AutoOps?](#deployment-types)
 
@@ -24,7 +25,7 @@ Find answers to your questions about AutoOps for ECE, ECK, and self-managed clus
 * [Do I have to define an Elastic IP address to enable the agent to send data to {{ecloud}}?](#elastic-ip-address)
 
 **Questions about collected metrics**
-* [Where are AutoOps metrics stored, and does it cost extra to ship metrics data to {{ecloud}}?](#autoops-metrics)
+* [Where are AutoOps metrics stored?](#autoops-metrics-storage)
 * [What information does {{agent}} extract from my cluster?](#extracted-info)
 
 ## General questions
@@ -35,6 +36,11 @@ $$$additional-payment$$$ **Does this feature require additional payment?**
 :   :::{include} /deploy-manage/_snippets/autoops-cc-payment-faq.md
 ::: 
 
+$$$autoops-metrics-cost$$$ **Is there an added cost for shipping metrics data to {{ecloud}}?**
+:   Elastic does not charge extra for this service, but your cloud service provider (CSP) might. When sending metrics data from your cluster in a CSP region to {{ecloud}}, shipping costs will be determined by your agreement with that CSP. 
+
+    You can [choose the CSP region where your data is stored](#autoops-metrics-storage). 
+
 $$$es-versions$$$ **Which versions of {{es}} does AutoOps support?**
 :   AutoOps is compatible with all [supported {{es}} versions](https://www.elastic.co/support/eol).
 
@@ -60,14 +66,12 @@ $$$elastic-ip-address$$$ **Do I have to define an Elastic IP address to enable t
 :   For more information, refer to [](/deploy-manage/security/elastic-cloud-static-ips.md).
 
 ## Questions about collected metrics
-$$$autoops-metrics$$$ **Where are AutoOps metrics stored, and does it cost extra to ship metrics data to {{ecloud}}?**
-:   You can choose the CSP and region in which your cluster metrics will be stored.
+$$$autoops-metrics-storage$$$ **Where are AutoOps metrics stored?**
+:   You can choose where to store your metrics from the following AWS regions:
 
     :::{include} ../_snippets/autoops-cc-regions.md
     :::
 
-    Shipping metrics to {{ecloud}} may come at an additional cost. For example, when sending metrics data from your cluster in a CSP region to {{ecloud}}, shipping costs will be determined by your agreement with that CSP.
-
 $$$extracted-info$$$ **What information does {{agent}} extract from my cluster?**
 :   {{agent}} only extracts and sends cluster metrics to {{ecloud}}, not the underlying data within your cluster. The following metrics are collected:
 

deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md

@@ -92,9 +92,9 @@ Select one of the following methods to install {{agent}}:
 
 * **Kubernetes**
 * **Docker**
+* **Linux**
 <!-- Not applicable for private preview
-* Linux
-* Windows
+* **Windows**
 -->
 
 :::{important} 
@@ -204,7 +204,7 @@ If you manually assign privileges, you won't be able to allow {{agent}} to acces
 
 :::::
 * **System architecture**: Select the system architecture of the machine running the agent.
-* **Metrics storage location**: Select where to store your metrics data from the list of available cloud service providers and regions.
+* **Metrics storage location**: Select where to store your metrics data from the list of available regions.
 
   :::{include} ../_snippets/autoops-cc-regions.md
   :::
@@ -220,8 +220,8 @@ The wizard will generate an installation command based on your configuration. De
 * Docker
     * Docker
     * Docker compose
-<!-- Not applicable for private preview
 * Linux
+<!-- Not applicable for private preview
 * Windows
 -->
 

deploy-manage/remote-clusters/ec-enable-ccs-for-eck.md

@@ -1,5 +1,5 @@
 ---
-navigation_title: With {{eck}}
+navigation_title: To {{eck}}
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-enable-ccs-for-eck.html
 applies_to:
@@ -10,7 +10,7 @@ products:
   - id: cloud-hosted
 ---
 
-# Remote clusters between {{ech}} and ECK [ec-enable-ccs-for-eck]
+# Connect {{ech}} deployments to {{eck}} clusters [ec-enable-ccs-for-eck]
 
 These steps describe how to configure remote clusters between an {{es}} cluster in {{ech}} (ECH) and an {{es}} cluster running within [{{eck}} (ECK)](/deploy-manage/deploy/cloud-on-k8s.md). Once that’s done, you’ll be able to [run CCS queries from {{es}}](/solutions/search/cross-cluster-search.md) or [set up CCR](/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md).
 

deploy-manage/remote-clusters/ec-enable-ccs.md

@@ -1,5 +1,5 @@
 ---
-navigation_title: Elastic Cloud Hosted
+navigation_title: On Elastic Cloud Hosted
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-enable-ccs.html
 applies_to:
@@ -9,9 +9,9 @@ products:
   - id: cloud-hosted
 ---
 
-# Remote clusters with {{ech}} [ec-enable-ccs]
+# Remote clusters on {{ech}} [ec-enable-ccs]
 
-You can configure an {{ech}} deployment to remotely access or (be accessed by) a cluster from:
+You can configure an {{ech}} deployment to either connect to remote clusters or accept connections from:
 
 * Another {{ech}} deployment of your {{ecloud}} organization, across any region or cloud provider (AWS, GCP, Azure…)
 * An {{ech}} deployment of another {{ecloud}} organization

deploy-manage/remote-clusters/ec-remote-cluster-ece.md

@@ -1,5 +1,5 @@
 ---
-navigation_title: With {{ece}}
+navigation_title: To {{ece}}
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-remote-cluster-ece.html
 applies_to:
@@ -10,7 +10,7 @@ products:
   - id: cloud-hosted
 ---
 
-# Access deployments of an {{ece}} environment [ec-remote-cluster-ece]
+# Connect {{ech}} deployments to an {{ece}} environment [ec-remote-cluster-ece]
 
 This section explains how to configure a deployment to connect remotely to clusters belonging to an {{ECE}} (ECE) environment.
 
@@ -61,12 +61,12 @@ The steps to follow depend on whether the Certificate Authority (CA) of the remo
     On the **Hosted deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
 
 3. From the navigation menu, select **Security**.
-4. Locate **Remote connections** and select **Add API key**.
+4. Locate **Remote Connections > Trust management > Connections using API keys** and select **Add API key**.
 
-    1. Add a setting:
+    1. Fill both fields.
 
-        * For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
-        * For the **Secret**, paste the encoded cross-cluster API key.
+        * For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
+        * For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
 
     2. Click **Add** to save the API key to the keystore.
 
@@ -95,8 +95,8 @@ If you need to update the remote connection with different permissions later, re
 
     1. Fill both fields.
 
-        * For the **Setting name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
-        * For the **Secret**, paste the encoded cross-cluster API key.
+        * For the **Remote cluster name**, enter the the alias of your choice. You will use this alias to connect to the remote cluster later. It must be lowercase and only contain letters, numbers, dashes and underscores.
+        * For the **Cross-cluster API key**, paste the encoded cross-cluster API key.
 
     2. Click **Add** to save the API key to the keystore.
     3. Repeat these steps for each API key you want to add. For example, if you want to use several deployments of the remote environment for CCR or CCS.
@@ -201,7 +201,9 @@ On the local cluster, add the remote cluster using {{kib}} or the {{es}} API.
 2. Enable **Manually enter proxy address and server name**.
 3. Fill in the following fields:
 
-    * **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish between local and remote indices.
+    * **Name**: This *cluster alias* is a unique identifier that represents the connection to the remote cluster and is used to distinguish local and remote indices.
+
+      When using API key authentication, this alias must match the **Remote cluster name** you configured when adding the API key in the Cloud UI.
     * **Proxy address**: This value can be found on the **Security** page of the {{ech}} deployment you want to use as a remote.<br>
 
       ::::{tip}
@@ -251,6 +253,9 @@ PUT /_cluster/settings
 }
 ```
 
+::::{note}
+When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI.
+::::
 
 ### Using the {{ecloud}} RESTful API [ec_using_the_elasticsearch_service_restful_api_3]