Merge branch 'main' into issue-1939-persist-discoveries

Author: natasha-moore-elastic

deploy-manage/autoscaling/autoscaling-in-ece-and-ech.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/cloud-organization/billing/billing-faq.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/deploy/cloud-enterprise/add-custom-bundles-plugins.md

@@ -184,7 +184,7 @@ In this example, we assume the Identity Provider does not publish its SAML metad
 
 ## Example: Custom JVM trust store bundle [ece-add-custom-bundle-example-cacerts]
 
-If you are using SSL certificates signed by non-public certificate authorities, {{es}} is not able to communicate with the services using those certificates unless you import a custom JVM trust store containing the certificates of your signing authority into your {{ece}} installation. You’ll need the trust store to access snapshot repositories like Minio, for your {{ece}} proxy, or to reindex from remote.
+If you are using SSL certificates signed by non-public certificate authorities, {{es}} is not able to communicate with the services using those certificates unless you import a custom JVM trust store containing the certificates of your signing authority into your {{ece}} installation. You’ll need the trust store to access snapshot repositories like MinIO, for your {{ece}} proxy, or to reindex from remote.
 
 To import a JVM trust store:
 

deploy-manage/deploy/cloud-enterprise/ece-configure-templates-index-management.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-integrations-server-api-example.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/edit-stack-settings-apm.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-elasticsearch.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).

deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md

@@ -20,7 +20,7 @@ products:
 New or updated versions of the {{stack}} must be prepared to work with {{ece}} and are provided as packs that you can download.
 
 ::::{important}
-{{es}} 7.8 and later comes with Index Lifecycle Management (ILM) always enabled. Before upgrading to 7.8 or later, to avoid any unpredictable behavior it is important to configure hot-warm clusters on {{ece}} with ILM rather than index curation. Check [migrate to index lifecycle management](../../../manage-data/lifecycle/index-lifecycle-management.md) for existing clusters, and [configure index management](https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-index-management.html) for new clusters.
+{{es}} 7.8 and later comes with Index Lifecycle Management (ILM) always enabled. Before upgrading to 7.8 or later, to avoid any unpredictable behavior it is important to configure hot-warm clusters on {{ece}} with ILM rather than index curation. Check [migrate to index lifecycle management](/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md) for existing clusters, and [configure index management](/manage-data/lifecycle/index-lifecycle-management.md) for new clusters.
 ::::
 
 

deploy-manage/deploy/cloud-enterprise/migrate-to-podman-5.md

@@ -1,4 +1,6 @@
 ---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-podman-5-migration.html
 applies_to:
   deployment:
     ece: all

deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md

@@ -10,7 +10,7 @@ products:
 
 # Switch from APM to Integrations Server payload [ece-integrations-server-apm-switch]
 
-This example shows how to use the {{ece}} RESTful API to switch from using [APM & Fleet Server](https://www.elastic.co/guide/en/cloud-enterprise/current/ece-manage-apm-and-fleet.html) to [Integrations Server](manage-integrations-server.md).
+This example shows how to use the {{ece}} RESTful API to switch from using the legacy [APM & Fleet Server](https://www.elastic.co/guide/en/cloud-enterprise/3.8/ece-manage-apm-and-fleet.html) to [Integrations Server](manage-integrations-server.md).
 
 
 ## Requirements [ece_requirements_5]