Merge branch 'main' of github.com:elastic/docs-content into metrics-charts-page

Author: florent-leborgne

deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md

@@ -148,5 +148,5 @@ In order to make requests to the [{{es}} API](elasticsearch://reference/elastics
 This completes the quickstart of deploying an {{es}} cluster. We recommend continuing to:
 
 * [Deploy a {{kib}} instance](kibana-instance-quickstart.md)
-* For information about how to apply changes to your deployments, refer to [aplying updates](./update-deployments.md).
+* For information about how to apply changes to your deployments, refer to [applying updates](./update-deployments.md).
 * To explore other configuration options for your {{es}} cluster, see [](./elasticsearch-configuration.md) and [](./configure-deployments.md).

deploy-manage/tools/cross-cluster-replication.md

@@ -2,11 +2,8 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-ccr.html
 applies_to:
-  deployment:
-    eck:
-    ess:
-    ece:
-    self:
+  stack: ga
+  serverless: unavailable
 products:
   - id: elasticsearch
 ---

redirects.yml

@@ -206,7 +206,7 @@ redirects:
   'troubleshoot/elasticsearch/elasticsearch-client-net-api/logging.md': 'troubleshoot/elasticsearch/clients.md'
   'troubleshoot/elasticsearch/elasticsearch-client-net-api/net.md': 'troubleshoot/elasticsearch/clients.md'
   'troubleshoot/elasticsearch/elasticsearch-client-ruby-api/ruby.md': 'troubleshoot/elasticsearch/clients.md'
-  'solutions/observability/get-started/add-data-from-splunk.md': 'solutions/observability/get-started/other-tutorials/add-data-from-splunk.md'
+  'solutions/observability/get-started/add-data-from-splunk.md': 'solutions/observability/get-started.md'
   'solutions/observability/get-started/create-an-observability-project.md': 'solutions/observability/get-started.md'
   'solutions/observability/get-started/get-started-with-dashboards.md': 'solutions/observability/get-started.md'
 # Related to https://github.com/elastic/docs-content/pull/1329
@@ -586,4 +586,7 @@ redirects:
   'deploy-manage/monitor/autoops/cc-cloud-connect-autoops-faq.md': 'deploy-manage/monitor/autoops/ec-autoops-faq.md'
 
 # Related to https://github.com/elastic/docs-team/issues/104
-  'solutions/observability/get-started/what-is-elastic-observability': 'solutions/observability.md'
+  'solutions/observability/get-started/what-is-elastic-observability': 'solutions/observability.md'
+
+# Related to https://github.com/elastic/docs-content/pull/3808
+  'solutions/observability/get-started/other-tutorials/add-data-from-splunk.md': 'solutions/observability/get-started.md'

reference/fleet/migrate-elastic-agent.md

@@ -179,7 +179,6 @@ After the restart, {{integrations-server}} will enroll a new {{agent}} for the {
 ::::
 
 
-
 ### Confirm your policy settings [migrate-elastic-agent-confirm-policy]
 
 Now that the {{fleet}} settings are correctly set up, it pays to ensure that the {{agent}} policy is also correctly pointing to the correct entities.
@@ -200,7 +199,6 @@ If you modified the {{fleet-server}} and the output in place these would have be
 ::::
 
 
-
 ## Agent policies in the new target cluster [migrate-elastic-agent-migrated-policies]
 
 By creating the new target cluster from a snapshot, all of your policies should have been created along with all of the agents. These agents will be offline due to the fact that the actual agents are not checking in with the new, target cluster (yet) and are still communicating with the source cluster.
@@ -210,7 +208,11 @@ The agents can now be re-enrolled into these policies and migrated over to the n
 
 ## Migrate {{agent}}s to the new target cluster [migrate-elastic-agent-migrated-agents]
 
-In order to ensure that all required API keys are correctly created, the agents in your current cluster need to be re-enrolled into the new, target cluster.
+::::{note}
+Agents to be migrated cannot be tamper-protected or running as a {{fleet-server}}.
+::::
+
+In order to ensure that all required API keys are correctly created, the agents in your current cluster need to be re-enrolled into the new target cluster.
 
 This is best performed one policy at a time. For a given policy, you need to capture the enrollment token and the URL for the agent to connect to. You can find these by running the in-product steps to add a new agent.
 
@@ -224,27 +226,43 @@ This is best performed one policy at a time. For a given policy, you need to cap
     :screenshot:
     :::
 
-5. On the host machines where the current agents are installed, enroll the agents again using this copied URL and the enrollment token:
+5. Choose an approach:
 
-    ```shell
-    sudo elastic-agent enroll --url=<fleet server url> --enrollment-token=<token for the new policy>
-    ```
+    ::::{tab-set}
+    :::{tab-item} Fleet UI
 
-    The command output should be like the following:
+    {applies_to}`stack: ga 9.2` Migrate remote agents directly from the {{fleet}} UI:
 
-    :::{image} images/migrate-agent-install-command-output.png
-    :alt: Install command output
-    :screenshot:
+    1. In the source cluster, select the agents you want to migrate. Click the three dots next to the agents, and select **Migrate agents**.
+    2. In the migration dialog, provide the URI and enrollment token you obtained from the target cluster.
+    3. Use `replace_token` (Optional): When you are migrating a single agent, you can use the `replace_token` field to preserve the agent's original ID from the source cluster. This step helps with event matching, but will cause the migration to fail if the target cluster already has an agent with the same ID.
     :::
 
-6. The agent on each host will now check into the new {{fleet-server}} and appear in the new target cluster. In the source cluster, the agents will go offline as they won’t be sending any check-ins.
+    :::{tab-item} Command line
 
-    :::{image} images/migrate-agent-newly-enrolled-agents.png
-    :alt: Newly enrolled agents in the target cluster
-    :screenshot:
-    :::
+    Run the `enroll` command on each individual host:
+
+   1. On the host machines where the current agents are installed, enroll the agents again using the URL and enrollment token you obtained from the target cluster:
+
+       ```shell
+       sudo elastic-agent enroll --url=<fleet server url> --enrollment-token=<token for the new policy>
+        ```
+
+        The command output should resemble this:
+
+       :::{image} images/migrate-agent-install-command-output.png
+       :alt: Install command output
+        :screenshot:
+       :::
+
+     2. The agent on each host will now check into the new {{fleet-server}} and appear in the new target cluster. In the source cluster, the agents will go offline as they won’t be sending any check-ins.
 
-7. Repeat this procedure for each {{agent}} policy.
+        :::{image} images/migrate-agent-newly-enrolled-agents.png
+        :alt: Newly enrolled agents in the target cluster
+        :screenshot:
+        :::
 
-If all has gone well, you’ve successfully migrated your {{fleet}}-managed {{agent}}s to a new cluster.
+     3. Repeat this procedure for each {{agent}} policy.
+     :::
+     ::::
 

solutions/observability/get-started/other-tutorials/add-data-from-splunk.md

@@ -13,6 +13,5 @@ products:
 The following tutorials explore various use cases and {{observability}} scenarios.
 
 - [Tutorial: Monitor a Java application](/solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md)
-- [Tutorial: Add data from Splunk](/solutions/observability/get-started/other-tutorials/add-data-from-splunk.md)
 
 To get started with {{observability}}, refer to [Get started with Elastic {{observability}}](/solutions/observability/get-started.md).

solutions/observability/get-started/other-tutorials/index.md

@@ -38,7 +38,6 @@ Want to use {{fleet}} or some other feature not covered in the quickstarts? Foll
 
 Ready to dig into more features of Elastic Observability? See these guides:
 
-* [Add data from Splunk](/solutions/observability/get-started/other-tutorials/add-data-from-splunk.md).
 * [Create an alert](/solutions/observability/incident-management/alerting.md).
 * [Create a service-level objective (SLO)](/solutions/observability/incident-management/create-an-slo.md).
 

solutions/observability/get-started/quickstarts.md

@@ -19,7 +19,6 @@ To ingest data, you can use:
 * The {{agent}} with integrations, which are available in the [Elastic Package Registry (EPR)](/reference/fleet/index.md#package-registry-intro). To install an integration that works with {{elastic-sec}}, go to the {{kib}} Home page or navigation menu and click **Add integrations**. On the Integrations page, click the **Security** category filter, then select an integration to view the installation instructions. For more information on integrations, refer to [{{integrations}}](https://docs.elastic.co/en/integrations).
 * **{{beats}}** shippers installed for each system you want to monitor.
 * **{{ls}}**, which dynamically ingests, transforms, and ships your data regardless of format.
-* The {{agent}} to send data from Splunk to {{elastic-sec}}. Refer to [Get started with data from Splunk](/solutions/observability/get-started/other-tutorials/add-data-from-splunk.md).
 * Third-party collectors configured to ship ECS-compliant data. [](/reference/security/fields-and-object-schemas/siem-field-reference.md) provides a list of ECS fields used in {{elastic-sec}}.
 
 ::::{important}

solutions/security/get-started/ingest-data-to-elastic-security.md

@@ -146,7 +146,6 @@ toc:
           - file: observability/get-started/other-tutorials/index.md
             children:
               - file: observability/get-started/other-tutorials/tutorial-monitor-java-application.md
-              - file: observability/get-started/other-tutorials/add-data-from-splunk.md
           - file: observability/get-started/logs-essentials.md
       - file: observability/applications/index.md
         children: