Merge branch 'main' into 1868-rollback-integration-docs

Author: vishaangelova

contribute-docs/_snippets/applies_to-key.md

@@ -1,7 +1,7 @@
 `applies_to` accepts the following keys in this structure.
 
 * `serverless`: Applies to [Elastic Cloud Serverless](https://www.elastic.co/docs/deploy-manage/deploy/elastic-cloud/serverless).
-  * `security`: Applies to Serverless [security projects](https://www.elastic.co/docs/solutions/security/get-started/create-security-project).
+  * `security`: Applies to Serverless [security projects](https://www.elastic.co/docs/solutions/security/get-started#create-sec-serverless-project).
   * `elasticsearch`: Applies to Serverless [search projects](https://www.elastic.co/docs/solutions/search/serverless-elasticsearch-get-started).
   * `observability`: Applies to Serverless [observability projects](https://www.elastic.co/docs/solutions/observability/get-started).
 * `stack`: Applies to the [Elastic Stack](https://www.elastic.co/docs/get-started/the-stack) including any Elastic Stack components.

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

@@ -99,26 +99,26 @@ Verify that required traffic is allowed. Check the [Networking prerequisites](ec
 
     * For Podman 5
 
-        * Install the latest available version of Podman `5.2.2` using dnf.
+        * Install the latest available version `5.*` using dnf.
 
             :::{note}
-            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.
+            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 version. 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 podman-remote-5.2.2
+            sudo dnf install podman-5.* podman-remote-5.*
             ```
-        * To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2`.
+        * To prevent automatic Podman major version updates, configure the Podman version to be locked at version `5.*` while still allowing minor and patch updates.
 
             ```sh
             ## Install versionlock
             sudo dnf install 'dnf-command(versionlock)'
 
             ## Lock major version
-            sudo dnf versionlock add --raw 'podman-5.2.2'
-            sudo dnf versionlock add --raw 'podman-remote-5.2.2'
+            sudo dnf versionlock add --raw 'podman-5.*'
+            sudo dnf versionlock add --raw 'podman-remote-5.*'
 
-            ## Verify that podman-5.2.2 and podman-remote-5.2.2 appear in the output
+            ## Verify that podman-5.* and podman-remote-5.* appear in the output
             sudo dnf versionlock list
             ```
 

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

@@ -129,27 +129,27 @@ Using Docker or Podman as container runtime is a configuration local to the host
 
     * For Podman 5
 
-        * Install the latest available version of Podman `5.2.2` using dnf.
+        * Install the latest available version `5.*` using dnf.
 
             :::{note}
-            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.
+            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 version. 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 podman-remote-5.2.2
+            sudo dnf install podman-5.* podman-remote-5.*
             ```
 
-        * To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2`.
+        * To prevent automatic Podman major version updates, configure the Podman version to be locked at version `5.*` while still allowing minor and patch updates.
 
             ```sh
             ## Install versionlock
             sudo dnf install 'dnf-command(versionlock)'
 
             ## Lock major version
-            sudo dnf versionlock add --raw 'podman-5.2.2'
-            sudo dnf versionlock add --raw 'podman-remote-5.2.2'
+            sudo dnf versionlock add --raw 'podman-5.*'
+            sudo dnf versionlock add --raw 'podman-remote-5.*'
 
-            ## Verify that podman-5.2.2 and podman-remote-5.2.2 appear in the output
+            ## Verify that podman-5.* and podman-remote-5.* appear in the output
             sudo dnf versionlock list
             ```
 

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

@@ -13,21 +13,21 @@ This guide describes the supported ways to upgrade or migrate your {{ece}} (ECE)
 
 * **Grow-and-shrink upgrade**: [Add new hosts](./install-ece-on-additional-hosts.md) running the desired Podman version to your ECE installation, then [remove the old ones](/deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md). This method is safer and preferred, as it avoids potential risks associated with upgrading the container engine or the operating system in place.
 
-ECE only supports Podman 5 in version `5.2.2`, regardless of your upgrade method. Later versions such as `5.2.3` and above are not supported. Refer always to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for details on supported versions.
+ECE supports Podman 5, regardless of your upgrade method. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for details on supported versions.
 
 :::{important}
-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 issue, use a later build such as `5.2.2-16` or newer. 
+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 issue, use a later Podman version. 
 :::
 
 The following table summarizes the supported upgrade paths to Podman 5 in ECE.
 
-| **From ↓** ...       **To →**           | Podman 5.2.2-latest | Podman 5.2.3 |
-|-----------------------------------------|-----------------|--------------|
-| **<vanilla Linux installation> (grow)** | ✓               | X            |
-| **Docker (grow-and-shrink)**            | ✓               | X            |
-| **Podman 4.9.4 (grow-and-shrink)**      | ✓               | X            |
-| **Podman 4.9.4 (in-place)**             | ✓               | X            |
-| **Podman 5.2.2 (grow-and-shrink)**      | ✓               | X            |
-| **Podman 5.2.2 (in-place)**             | ✓               | X            |
+| **From ↓** ...       **To →**           | Podman 5 |
+|-----------------------------------------|-----------------|
+| **<vanilla Linux installation> (grow)** | ✓               |
+| **Docker (grow-and-shrink)**            | ✓               |
+| **Podman 4.9.4 (grow-and-shrink)**      | ✓               |
+| **Podman 4.9.4 (in-place)**             | ✓               |
+| **Podman 5.2.2 (grow-and-shrink)**      | ✓               |
+| **Podman 5.2.2 (in-place)**             | ✓               |
 
 As shown in the table above, [migrations from Docker](./migrate-ece-to-podman-hosts.md) are only supported using the grow-and-shrink method.

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/deploy/cloud-on-k8s/managing-deployments-using-helm-chart.md

@@ -144,10 +144,7 @@ kind: Ingress
 metadata:
   name: elasticsearch
   labels:
-    helm.sh/chart: eck-elasticsearch-0.14.1
-    app.kubernetes.io/name: eck-elasticsearch
-    app.kubernetes.io/instance: es-kb-quickstart
-    app.kubernetes.io/managed-by: Helm
+    ...
 spec:
   rules:
   - host: "elasticsearch.example.com"
@@ -167,10 +164,7 @@ kind: Ingress
 metadata:
   name: es-kb-quickstart-eck-kibana
   labels:
-    helm.sh/chart: eck-kibana-0.14.1
-    app.kubernetes.io/name: eck-kibana
-    app.kubernetes.io/instance: es-kb-quickstart
-    app.kubernetes.io/managed-by: Helm
+    ...
 spec:
   rules:
   - host: "kibana.example.com"

deploy-manage/deploy/elastic-cloud/create-an-organization.md

@@ -47,7 +47,7 @@ For more information, check the [{{ech}} documentation](cloud-hosted.md).
 
 * [{{es}}](../../../solutions/search.md)
 * [Observability](../../../solutions/observability.md)
-* [Security](../../../solutions/security/elastic-security-serverless.md)
+* [Security](../../../solutions/security.md)
 
 When you create a project, you select the project type applicable to your use case, so only the relevant and impactful applications and features are easily accessible to you.
 

deploy-manage/deploy/elastic-cloud/create-serverless-project.md

@@ -19,5 +19,5 @@ Choose the type of project that matches your needs and we’ll help you get star
 |  |  |
 | ![elasticsearch](../../images/64x64_Color_elasticsearch-logo-color-64px.png "elasticsearch =50%") | **Elasticsearch**<br> Build custom search applications with {{es}}.<br><br>[**View guide →**](/solutions/search/get-started.md)<br> |
 | ![observability](../../images/64x64_Color_observability-logo-color-64px.png "observability =50%") | **Observability**<br> Monitor applications and systems with Elastic Observability.<br><br>[**View guide →**](/solutions/observability/get-started.md)<br> |
-| ![security](../../images/64x64_Color_security-logo-color-64px.png "security =50%") | **Security**<br> Detect, investigate, and respond to threats with Elastic Security.<br><br>[**View guide →**](/solutions/security/get-started/create-security-project.md)<br> |
+| ![security](../../images/64x64_Color_security-logo-color-64px.png "security =50%") | **Security**<br> Detect, investigate, and respond to threats with Elastic Security.<br><br>[**View guide →**](/solutions/security/get-started.md#create-sec-serverless-project)<br> |
 |  |  |

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

@@ -29,7 +29,7 @@ Elastic provides three serverless solutions available on {{ecloud}}. Follow thes
 
 * **[{{es-serverless}}](/solutions/search/get-started.md)**: Build powerful applications and search experiences using a rich ecosystem of vector search capabilities, APIs, and libraries.
 * **[{{obs-serverless}}](../../../solutions/observability/get-started.md)**: Monitor your own platforms and services using powerful machine learning and analytics tools with your logs, metrics, traces, and APM data.
-* **[{{sec-serverless}}](../../../solutions/security/get-started/create-security-project.md)**: Detect, investigate, and respond to threats with SIEM, endpoint protection, and AI-powered analytics capabilities.
+* **[{{sec-serverless}}](../../../solutions/security/get-started.md#create-sec-serverless-project)**: Detect, investigate, and respond to threats with SIEM, endpoint protection, and AI-powered analytics capabilities.
 
 Afterwards, you can:
 

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
 ---