Merge branch 'main' into issue-2810-closing-reason

Author: natasha-moore-elastic

deploy-manage/_snippets/autoops-cc-ech-faq.md

@@ -1,3 +1,3 @@
 This path is not supported. Currently, we only support using Cloud Connect to connect ECE, ECK, and self-managed clusters to AutoOps.
 
-For {{ech}} clusters, AutoOps is set up and enabled automatically in all supported [regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md), and can be [accessed](/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md) from the deployment overview page.
+For {{ech}} clusters, AutoOps is set up and enabled automatically in all supported [regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md), and can be [accessed](/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md#ec-autoops-how-to-access) from the deployment overview page.

deploy-manage/cloud-connect.md

@@ -23,11 +23,11 @@ Learn how to set up and use [](/deploy-manage/monitor/autoops/cc-autoops-as-clou
 
 Find answers to your questions about Cloud Connect.
 
-* [Does using Cloud Connect require additional payment?](#cc-additional-payment)
+* [Does Cloud Connect require additional payment?](#cc-additional-payment)
 * [Can I use Cloud Connect to connect my Elastic Cloud Hosted clusters to AutoOps?](#cc-ech)
 * [Are more services going to be available with Cloud Connect?](#cc-more-services)
 
-$$$cc-additional-payment$$$ **Does using Cloud Connect require additional payment?** 
+$$$cc-additional-payment$$$ **Does Cloud Connect require additional payment?** 
 :   Each cloud connected service has its own licensing and payment requirements. 
     :::{include} /deploy-manage/_snippets/autoops-cc-payment-faq.md
 ::: 

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

@@ -3,6 +3,9 @@ mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-faq-billing.html
 applies_to:
   deployment:
+    self:
+    ece:
+    eck:
     ess: all
   serverless: all
 products:
@@ -29,6 +32,7 @@ This frequently-asked-questions list answers some of your more common questions
 * [How can I delete my {{ecloud}} account?](#faq-deleteaccount)
 * [Can I get a refund?](#faq-refund)
 * [What is included in my paid {{ecloud}} deployment?](#faq-included)
+* [Does Cloud Connect require additional payment?](#billing-cc-additional-payment)
 * [What are the data transfer and storage charges and how can I control them?](#faq-dts)
 * [What taxes will be applied on my invoice?](#faq-taxes)
 
@@ -94,6 +98,9 @@ $$$faq-deleteaccount$$$How can I delete my {{ecloud}} account?
 $$$faq-refund$$$Can I get a refund?
 :   Charges are non-refundable, but once you delete a deployment we’ll stop charging you for that deployment immediately. You only pay for what you use and you can stop using the service at any time. For any special considerations warranting a potential refund, use the {{ecloud}} Console [Support form](https://cloud.elastic.co/support?page=docs&placement=docs-body) to open a support case and select *Billing issue* as the category. To ensure quick processing, be sure to provide detail about the reasons for the refund request as well as other matters pertaining to the issue. For other ways to open a Support case, check [Contact us](../../../troubleshoot/index.md).
 
+$$$billing-cc-additional-payment$$$ **Does Cloud Connect require additional payment?** 
+:   Each cloud connected service has its own licensing and payment requirements. For more information, refer to the [Elastic self-managed subscriptions](https://www.elastic.co/subscriptions) page.
+
 $$$faq-included$$$What is included in my paid {{ech}} deployment?
 :   All subscription tiers for {{ech}} include the following free allowance:
 

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

@@ -72,6 +72,9 @@ You can [change your subscription level](/deploy-manage/cloud-organization/billi
 `Field-level or document-level security`
 :   Remove any user role configurations based on field or document access [through the API](/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md) or the {{kib}} [Roles](/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md) page.
 
+`ES|QL cross-cluster search`
+:   Discontinue all [ES|QL CCS queries](elasticsearch://reference/query-languages/esql/esql-cross-clusters.md) or upgrade license tier to Enterprise.
+
 ::::{note}
 After you have made your changes to the deployment, it can take up to one hour to clear the notification banner.
 ::::

deploy-manage/deploy/cloud-on-k8s/elastic-stack-configuration-policies.md

@@ -11,14 +11,17 @@ products:
 # {{stack}} configuration policies [k8s-stack-config-policy]
 
 ::::{warning}
-We have identified an issue with {{es}} 8.15.1 and 8.15.2 that prevents security role mappings configured via Stack configuration policies to work correctly. Avoid these versions and upgrade to 8.16.0 to remedy this issue if you are affected.
+We have identified an issue with {{es}} 8.15.1 and 8.15.2 that prevents security role mappings configured via Stack configuration policies to work correctly. Avoid these versions and upgrade to 8.16+ to remedy this issue if you are affected.
 ::::
 
 
 ::::{note}
 This requires a valid Enterprise license or Enterprise trial license. Check [the license documentation](../../license/manage-your-license-in-eck.md) for more details about managing licenses.
 ::::
 
+::::{note}
+Component templates created in configuration policies cannot currently be referenced from index templates created through the {{es}} API or {{kib}} UI.
+::::
 
 Starting from ECK `2.6.1` and {{es}} `8.6.1`, {{stack}} configuration policies allow you to configure the following settings for {{es}}:
 

deploy-manage/deploy/cloud-on-k8s/propagate-labels-annotations.md

@@ -6,13 +6,13 @@ products:
   - id: cloud-kubernetes
 ---
 
-# Propagate Labels and Annotations [k8s-propagate-labels-annotations]
+# Propagate labels and annotations [k8s-propagate-labels-annotations]
 
 Starting with version `3.1.0`, {{eck}} supports propagating labels and annotations from the parent resource to the child resources it creates. This can be used on all custom resources managed by ECK, such as {{eck_resources_list}}.
 
 The example below demonstrates how to use this feature on a {{es}} cluster, however, as mentioned above, this can be also applied to any custom resource managed by {{eck}}.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
@@ -29,7 +29,7 @@ metadata:
     my-label2: "my-label2-value"
   name: elasticsearch-sample
 spec:
-  version: 9.1.0
+  version: {{version.stack}}
   nodeSets:
     - name: default
       config:
@@ -60,7 +60,7 @@ service/elasticsearch-sample-es-transport       ClusterIP   None             <no
 
 It is possible to use `*` as a wildcard to propagate all labels and annotations from the parent resource to the child resources. For example:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
@@ -70,7 +70,7 @@ metadata:
     eck.k8s.alpha.elastic.co/propagate-labels: "*"
   name: elasticsearch-sample
 spec:
-  version: 9.1.0
+  version: {{version.stack}}
   nodeSets:
     - name: default
       config:

deploy-manage/deploy/deployment-comparison.md

@@ -30,7 +30,7 @@ For more details about feature availability in Serverless, check [](elastic-clou
 
 | Feature/capability | Self-managed | {{ech}} | Serverless |
 |-------------------|-------------|--------------------------------|-------------------------|
-| [Deployment health monitoring](/deploy-manage/monitor.md) | Monitoring cluster | AutoOps or monitoring cluster | Managed by Elastic |
+| [Deployment health monitoring](/deploy-manage/monitor.md) | AutoOps or monitoring cluster | AutoOps or monitoring cluster | Managed by Elastic |
 | [Alerting](/explore-analyze/alerts-cases.md) | Watcher or {{kib}} alerts | Watcher or {{kib}} alerts | Alerts ([why?](/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md#elasticsearch-differences-serverless-features-replaced)) |
 
 ## Data lifecycle