Merge branch 'main' into 1572/ilm-create-template

Author: kilfoyle

.github/workflows/doc-preview-comment.yml

@@ -16,4 +16,4 @@ jobs:
       deployments: write
       id-token: write
       contents: read
-      pull-requests: read
+      pull-requests: write

.github/workflows/docs-build.yml

@@ -106,4 +106,12 @@ The only secure and recommended approach is to use one Elastic account for each
 
 For now, you will need to answer an MFA challenge on every login, but we are working on adding a **Trust this device** option, which will "silence" the MFA challenge for one month per user session.
 
+**Can I use multiple email addresses for MFA?**
+
+No, only one email address can be used for MFA verification. In alignment with security best practices, Elastic Cloud is designed to use only one designated email address for MFA purposes. This email is used to send your one-time verification codes during login. If you need to update your MFA email address, review [Update your email address](update-your-email-address.md) for more information.
+
+
+
+
+
 

cloud-account/multifactor-authentication.md

@@ -43,7 +43,7 @@ Currently, autoscaling behavior is as follows:
 * **Data tiers**
 
     * Each {{es}} [data tier](../../manage-data/lifecycle/data-tiers.md) scales upward based on the amount of available storage. When we detect more storage is needed, autoscaling will scale up each data tier independently to ensure you can continue and ingest more data to your hot and content tier, or move data to the warm, cold, or frozen data tiers.
-    * In addition to scaling up existing data tiers, a new data tier will be automatically added when necessary, based on your [index lifecycle management policies](https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-index-management.html).
+    * In addition to scaling up existing data tiers, a new data tier will be automatically added when necessary, based on your [index lifecycle management policies](/manage-data/lifecycle/index-lifecycle-management.md).
     * To control the maximum size of each data tier and ensure it will not scale above a certain size, you can use the maximum size per zone field.
     * Autoscaling based on memory or CPU, as well as autoscaling downward, is not currently supported. In case you want to adjust the size of your data tier to add more memory or CPU, or in case you deleted data and want to scale it down, you can set the current size per zone of each data tier manually.
 

deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md

@@ -99,7 +99,7 @@ $$$faq-included$$$What is included in my paid {{ech}} deployment?
 
     * Free 1GB RAM {{kib}} instance
     * Free 1GB RAM Machine Learning node
-    * Free 1GB RAM APM server
+    * Free 1GB RAM APM / Integrations Server instance
     * A free allowance for [data transfer and snapshot storage costs](#faq-dts)
 
     Note that if you go above the free tier of Kibana/ML/APM (for example, a 2GB {{kib}} instance), you will be charged in full for the size of that instance.

deploy-manage/cloud-organization/billing/billing-faq.md

@@ -100,30 +100,26 @@ Make sure to use a supported combination of Linux distribution and container eng
 
     * For Podman 5
 
-        * Install version `5.2.2-13.*` using dnf.
+        * Install the latest available version of Podman `5.2.2` using dnf.
 
             :::{note}
-            As mentioned in [Migrating to Podman 5](migrate-to-podman-5.md) it is recommended to install Podman `5.2.2-13` since this is the latest supported version.
-
-            If you decide to install a previous Podman 5 version, make sure to replace `5.2.2-13` with the desired version in the commands below.
-
-            The version lock is still required for previous versions, to prevent automatic in-place updates that may be affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473).
+            Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this bug, use a later build of `5.2.2`, such as `5.2.2-16` or newer. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information.
             :::
 
             ```sh
-            sudo dnf install podman-5.2.2-13.* podman-remote-5.2.2-13.*
+            sudo dnf install podman-5.2.2 podman-remote-5.2.2
             ```
-        * To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2-13.*`.
+        * To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2`.
 
             ```sh
             ## Install versionlock
             sudo dnf install 'dnf-command(versionlock)'
 
             ## Lock major version
-            sudo dnf versionlock add --raw 'podman-5.2.2-13.*'
-            sudo dnf versionlock add --raw 'podman-remote-5.2.2-13.*'
+            sudo dnf versionlock add --raw 'podman-5.2.2'
+            sudo dnf versionlock add --raw 'podman-remote-5.2.2'
 
-            ## Verify that podman-5.2.2-13.* and podman-remote-5.2.2-13.* appear in the output
+            ## Verify that podman-5.2.2 and podman-remote-5.2.2 appear in the output
             sudo dnf versionlock list
             ```
 

deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md

@@ -20,8 +20,11 @@ In a template that creates a hot-warm architecture, you can use index curation t
 
 Configuring index management is part of the larger task of [creating deployment templates](ece-configuring-ece-create-templates.md) or editing them. The choices you make here determine which index management methods are available to your users when they create deployments.
 
-You should configure all index management methods that you want your users to be able to choose from when they create their deployments from your template. You can configure index curation, index lifecycle management, or both. If you are not sure which index management methods to configure, take a look at how your users are asked to [configure index management](https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-index-management.html) when they customize their deployments.
+You should configure all index management methods that you want your users to be able to choose from when they create their deployments from your template. You can configure index curation, index lifecycle management, or both.
 
+::::{note}
+Index curation has been deprecated in favor of [index lifecycle management](/manage-data/lifecycle/index-lifecycle-management.md). For {{stack}} version 6.7 and later, any deployments using index curation will be prompted to [migrate to ILM](/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md).
+::::
 
 ## Steps [ece_steps_2]
 

deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.md

@@ -19,7 +19,7 @@ For more information on how to manage Integrations Server from the UI, check [Ma
 
 Integrations Server can be enabled only on new deployments, starting with {{stack}} version 8.0.
 
-It’s possible to enable Integrations Server on an existing deployment with version 8.0 only if [APM & Fleet Server](https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-apm-and-fleet.html) hasn’t been previously enabled on the deployment.
+It’s possible to enable Integrations Server on an existing deployment with version 8.0 only if the legacy [APM & Fleet Server](https://www.elastic.co/guide/en/cloud-enterprise/3.8/ece-manage-apm-and-fleet.html) hasn’t been previously enabled on the deployment.
 
 
 ## API request example [ece_api_request_example_2]

deploy-manage/deploy/cloud-enterprise/ece-integrations-server-api-example.md

@@ -2,6 +2,7 @@
 navigation_title: APM user settings
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-apm-settings.html
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-apm-settings.html
 applies_to:
   deployment:
     ece: all

deploy-manage/deploy/cloud-enterprise/edit-stack-settings-apm.md

@@ -2,6 +2,7 @@
 navigation_title: Elasticsearch user settings
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-user-settings.html
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-change-user-settings-examples.html
 applies_to:
   deployment:
     ece: all
@@ -17,9 +18,11 @@ Change how {{es}} runs by providing your own user settings. User settings are ap
 If a feature requires both standard `elasticsearch.yml` settings and [secure settings](/deploy-manage/security/secure-settings.md), configure the secure settings first. Updating standard user settings can trigger a cluster rolling restart, and if the required secure settings are not yet in place, the nodes might fail to start. Adding secure settings does not trigger a restart.
 :::
 
-{{ece}} automatically rejects `elasticsearch.yml` settings that could break your cluster, including some zen discovery and security settings.
+{{ece}} automatically rejects `elasticsearch.yml` settings that could break your cluster, including some zen discovery and security settings. For a detailed list of settings, refer to the [{{es}} configuration reference](elasticsearch://reference/elasticsearch/configuration-reference/index.md).
 
-For a list of supported settings, check [Supported {{es}} settings](elasticsearch://reference/elasticsearch/configuration-reference/index.md).
+::::{note}
+Most of the user settings that are available for the {{es}} version that your cluster is running are also available on {{ece}}, regardless of being marked as "supported on {{ech}}".
+::::
 
 To add or edit {{es}} user settings:
 
@@ -37,6 +40,7 @@ To add or edit {{es}} user settings:
     If you encounter the **Edit elasticsearch.yml** carets, be sure to make your changes on all {{es}} node types.
     ::::
 
+$$$ece-change-user-settings-examples$$$
 ## Example: enable email notifications [ece_enable_email_notifications_from_gmail]
 
 To enable email notifications in your {{es}} cluster, you need to configure an email account and related settings. For complete instructions, refer to [Configuring email accounts](/explore-analyze/alerts-cases/watcher/actions-email.md#configuring-email).