Merge branch 'main' into replace-api-links-raw-migrated-files

Author: colleenmcginnis

cloud-account/update-your-email-address.md

@@ -8,19 +8,26 @@ applies:
 
 # Update your email address [ec-update-email-address]
 
-Each {{ecloud}} account has a primary email associated with it. By default, the primary email address is used to sign up for {{ecloud}} and to log in. If needed, you can change this primary email address:
+Each {{ecloud}} account has a primary email associated with it. By default, the primary email address is used to sign up for {{ecloud}} and to log in. If needed, you can change this primary email address.
+
+## Change your email address (native sign-in)
+
+If you log in using a standard email and password, follow these steps to update your email address:
 
 1. To edit your account settings, select the user icon on the header bar and select **Settings**.
 2. In the **Email address** section, select **edit**.
 3. Enter a new email address and your current password.
 
     An email is sent to the new address with a link to confirm the change. If you don’t get the email after a few minutes, check your spam folder.
 
-If you are using Google or Microsoft Sign-In and would like to change your email address, you need to:
+## Change your email address (Google or Microsoft sign-in)
+
+If you log in using Google or Microsoft Sign-In, follow these steps to update your email address:
 
 1. Go to the [Forgot password](https://cloud.elastic.co/forgot) page and enter your email address.
 2. Follow the instructions in the "Reset your password" email.
 3. In the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body), update your [User settings](https://cloud.elastic.co/user/settings) to the new email address.
 
-If your organization is associated with [Azure Marketplace](../deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md), you can’t change your primary email address using the above methods. Instead, [invite another user](../deploy-manage/users-roles/cloud-organization/manage-users.md) with the desired email address to your organization.
+## Changing your email address with an Azure Marketplace account
 
+If your organization is associated with [Azure Marketplace](../deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md), you can’t change your primary email address using the above methods. Instead, [invite another user](../deploy-manage/users-roles/cloud-organization/manage-users.md) with the desired email address to join your organization.

manage-data/ingest/tools.md

@@ -3,6 +3,7 @@ mapped_urls:
   - https://www.elastic.co/guide/en/cloud/current/ec-cloud-ingest-data.html
   - https://www.elastic.co/guide/en/fleet/current/beats-agent-comparison.html
   - https://www.elastic.co/guide/en/kibana/current/connect-to-elasticsearch.html
+  - https://www.elastic.co/guide/en/serverless/current/project-setting-data.html
   - https://www.elastic.co/customer-success/data-ingestion
   - https://github.com/elastic/ingest-docs/pull/1373
 ---
@@ -28,4 +29,4 @@ mapped_urls:
 
 $$$supported-outputs-beats-and-agent$$$
 
-$$$additional-capabilities-beats-and-agent$$$
+$$$additional-capabilities-beats-and-agent$$$

manage-data/lifecycle.md

@@ -1,16 +1,58 @@
 ---
 mapped_urls:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/data-management.html
-  - https://www.elastic.co/guide/en/serverless/current/project-setting-data.html
 ---
 
 # Data lifecycle
 
-% What needs to be done: Refine
+The data you store in {{es}} generally falls into one of two categories:
 
-% GitHub issue: docs-projects#374
+* **Content**: a collection of items you want to search, such as a catalog of products
+* **Time series data**: a stream of continuously-generated timestamped data, such as log entries
 
-% Use migrated content from existing pages that map to this page:
+**Content** might be frequently updated, but the value of the content remains relatively constant over time. You want to be able to retrieve items quickly regardless of how old they are.
 
-% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/data-management.md
-% - [ ] ./raw-migrated-files/docs-content/serverless/project-setting-data.md
+**Time series data** keeps accumulating over time, so you need strategies for balancing the value of the data against the cost of storing it. As it ages, it tends to become less important and less-frequently accessed, so you can move it to less expensive, less performant hardware. For your oldest data, what matters is that you have access to the data. It’s ok if queries take longer to complete.
+
+To help you manage your data, {{es}} offers you the following options: {{ilm-cap}}, Data stream lifecycle, and Elastic Curator.
+
+::::{note}
+[Data rollup](/manage-data/lifecycle/rollup.md) is a deprecated {{es}} feature that allows you to manage the amount of data that is stored in your cluster, similar to the downsampling functionality of {{ilm-init}} and data stream lifecycle. This feature should not be used for new deployments.
+::::
+
+## {{ilm-init}} [ilm]
+
+::::{tip}
+{{ilm-init}} is not available on {{es-serverless}}.
+
+:::{dropdown} Why?
+In an {{ecloud}} or self-managed environment, ILM lets you automatically transition indices through data tiers according to your performance needs and retention requirements. This allows you to balance hardware costs with performance. {{es-serverless}} eliminates this complexity by optimizing your cluster performance for you.
+
+[Data stream lifecycle](#data-stream-lifecycle) is an optimized lifecycle tool that lets you focus on the most common lifecycle management needs, without unnecessary hardware-centric concepts like data tiers.
+:::
+::::
+
+**{{ilm-init}}** can be used to manage both indices and data streams. It allows you to do the following:
+
+* Define the retention period of your data. The retention period is the minimum time your data will be stored in {{es}}. Data older than this period can be deleted by {{es}}.
+* Define [multiple tiers](/manage-data/lifecycle/data-tiers.md) of data nodes with different performance characteristics.
+* Automatically transition indices through the data tiers according to your performance needs and retention policies.
+* Leverage [searchable snapshots](/deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md) stored in a remote repository to provide resiliency for your older indices while reducing operating costs and maintaining search performance.
+* Perform [asynchronous searches](/solutions/search/async-search-api.md) of data stored on less-performant hardware.
+
+**[Read more in {{ilm-cap}} ->](/manage-data/lifecycle/index-lifecycle-management.md)**
+
+## Data stream lifecycle [data-stream-lifecycle]
+
+**Data stream lifecycle** is less feature rich but is focused on simplicity. It allows you to do the following:
+
+* Define the retention period of your data. The retention period is the minimum time your data will be stored in {{es}}. Data older than this period can be deleted by {{es}} at a later time.
+* Improve the performance of your data stream by performing background operations that will optimize the way your data stream is stored.
+
+**[Read more in Data stream lifecycle ->](/manage-data/lifecycle/data-stream.md)**
+
+## Elastic Curator [elastic-curator]
+
+**Elastic Curator** is a tool that allows you to manage your indices and snapshots using user-defined filters and predefined actions. If ILM provides the functionality to manage your index lifecycle, and you have at least a Basic license, consider using ILM in place of Curator. Many stack components make use of ILM by default.
+
+**[Read more in Elastic Curator ->](/manage-data/lifecycle/curator.md)**