Merge branch 'main' into shainaraskas-patch-3

Author: shainaraskas

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

deploy-manage/images/cloud-autoops-deployment-view.png

@@ -36,11 +36,14 @@ To help you make your decision, refer to [](/deploy-manage/monitor/autoops-vs-st
 ```{applies_to}
 deployment:
   ess:
+  self:
+  ece:
+  eck:
 ```
 
 AutoOps diagnoses issues in {{es}} by analyzing hundreds of metrics, providing root-cause analysis and accurate resolution paths. With AutoOps, customers can prevent and resolve issues, cut down administration time, and optimize resource utilization.
 
-AutoOps is currently only available for Elastic Cloud Hosted deployments.
+AutoOps is available in all {{ech}} deployments and {{serverless-full}} projects, and can be set up for [ECE, ECK, and self-managed clusters](/deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md). 
 
 ### Stack monitoring
 

deploy-manage/images/cloud-autoops-setup.png

@@ -1,11 +1,16 @@
 ---
 applies_to:
+  serverless:
   deployment:
     ess: all
     ece: all
     eck: all
     self: all
 navigation_title: AutoOps vs. Stack Monitoring
+products:
+  - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # AutoOps and Stack Monitoring comparison
@@ -18,26 +23,32 @@ Review how these tools differ in their provisioning, set up procedure, method of
 ### Resource provisioning and billing
 
 #### AutoOps [ao-resource]
-AutoOps stores and backs up your monitoring data internally on {{ecloud}} infrastructure so you don’t need to think about provisioning, sizing, and availability. The data is retained for four days by default. Using AutoOps is free for {{ecloud}} customers and is offered to [all subscription tiers](https://www.elastic.co/subscriptions/cloud).
+AutoOps stores and backs up your monitoring data internally on {{ecloud}} infrastructure so you don’t need to think about provisioning, sizing, and availability. The data is retained for 10 days by default. Using AutoOps is free for {{ecloud}} customers and is offered to [all subscription tiers](https://www.elastic.co/subscriptions/cloud).
 
 #### Stack Monitoring [sm-resource]
 With Stack Monitoring, you are responsible for storing your monitoring data. This requires provisioning the necessary resources based on your performance and retention needs as well as paying for the allocated resources. The default retention period is six days.
 
 ### Setup
 
 #### AutoOps [ao-setup]
-On {{ech}} (ECH), AutoOps is set up and enabled automatically in all supported [regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md), with no action required from you.
-
-:::{note}
-AutoOps is planned to be available in self-managed environments in the future.
-:::
+On {{ech}} and {{serverless-full}}, AutoOps is set up and enabled automatically in all supported [regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md), with no action required from you.
 
 :::{image} /deploy-manage/images/cloud-autoops-setup.png
 :alt: Diagram showing AutoOps setup in Elastic Cloud
 :::
 
+For {{ece}} (ECE), {{eck}} (ECK), and self-managed clusters, you need to [connect your cluster to AutoOps](/deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md). This involves installing {{agent}} to ship your monitoring metrics to {{ecloud}} through [](/deploy-manage/cloud-connect.md). Since you can only access AutoOps from the {{ecloud}} UI, you need an {{ecloud}} account for this service.
+
+:::{image} /deploy-manage/images/self-managed-autoops-setup.png
+:alt: Diagram showing AutoOps setup for ECE, ECK, and self-managed clusters
+:::
+
+:::{note}
+AutoOps will be available for self-managed air-gapped environments (ECE, ECK, or standard stack deployments) in the future.
+:::
+
 #### Stack Monitoring [sm-setup]
-Stack Monitoring is a {{kib}} application that can be enabled on self-managed clusters on your premises, ECH deployments, {{eck}} (ECK), and {{ece}} (ECE). Stack Monitoring is not available on {{serverless-full}} since Elastic takes care of monitoring and managing your Serverless projects.
+Stack Monitoring is a {{kib}} application that can be enabled on self-managed clusters on your premises, {{ech}} deployments, {{ece}} (ECE), and {{eck}} (ECK). Stack Monitoring is not available on {{serverless-full}} since Elastic takes care of monitoring and managing your Serverless projects.
 
 Depending on your deployment model, there is [some setting up](/deploy-manage/monitor/stack-monitoring.md#configure-and-use-stack-monitoring) involved to enable Stack Monitoring. You need to configure an agent, specify which logs and metrics you want to collect from all your {{stack}} components, and where to send them.