[GA] AutoOps for self-managed clusters updates

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/monitor.md

@@ -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/monitor/autoops-vs-stack-monitoring.md

@@ -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
@@ -26,18 +31,24 @@ With Stack Monitoring, you are responsible for storing your monitoring data. Thi
 ### 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 go through a [connection process](/deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md) to connect to AutoOps. 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.
 

deploy-manage/monitor/autoops.md

@@ -4,8 +4,13 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+    self:
+    ece:
+    eck:
 products:
   - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # AutoOps [ec-autoops]
@@ -43,7 +48,7 @@ AutoOps diagnoses issues in {{es}} by analyzing hundreds of metrics, providing r
 
 ## AutoOps retention period [ec_autoops_retention_period]
 
-AutoOps currently has a four-day retention period for all {{ech}} customers.
+AutoOps currently has a four-day retention period.
 
 
 ## AutoOps scope [ec_autoops_scope]

deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md

@@ -5,6 +5,9 @@ applies_to:
     ece:
     eck:
 navigation_title: AutoOps for self-managed clusters
+products:
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # AutoOps for self-managed clusters

deploy-manage/monitor/autoops/cc-cloud-connect-autoops-faq.md

@@ -5,6 +5,9 @@ applies_to:
     ece:
     eck:
 navigation_title: FAQ
+products:
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # AutoOps for self-managed clusters FAQ
@@ -16,7 +19,7 @@ Find answers to your questions about AutoOps for ECE, ECK, and self-managed clus
 * [Does this feature require additional payment?](#additional-payment)
 * [Is there an added cost for shipping metrics data to {{ecloud}}?](#autoops-metrics-cost)
 * [Which versions of {{es}} does AutoOps support?](#es-versions)
-* [Which deployment types can be connected to AutoOps?](#deployment-types)
+* [Which deployment types can be connected to AutoOps through Cloud Connect?](#deployment-types)
 
 **Questions about setting up**
 * [Can I use Cloud Connect to connect my {{ech}} clusters to AutoOps?](#cc-autoops-ech)
@@ -44,7 +47,7 @@ $$$autoops-metrics-cost$$$ **Is there an added cost for shipping metrics data to
 $$$es-versions$$$ **Which versions of {{es}} does AutoOps support?**
 :   AutoOps is compatible with all [supported {{es}} versions](https://www.elastic.co/support/eol).
 
-$$$deployment-types$$$ **Which deployment types can be connected to AutoOps?**
+$$$deployment-types$$$ **Which deployment types can be connected to AutoOps through Cloud Connect?**
 :   You can connect to AutoOps on a standalone {{stack}}, ECE ({{ece}}), or ECK ({{eck}}) deployment.
 
 ## Questions about setting up

deploy-manage/monitor/autoops/cc-cloud-connect-autoops-troubleshooting.md

@@ -5,6 +5,9 @@ applies_to:
     ece:
     eck:
 navigation_title: Troubleshooting
+products:
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # AutoOps for self-managed clusters troubleshooting

deploy-manage/monitor/autoops/cc-connect-local-dev-to-autoops.md

@@ -3,6 +3,9 @@ applies_to:
   deployment:
     self:
 navigation_title: Connect your local development cluster
+products:
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # Connect your local development cluster to AutoOps

deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md

@@ -5,6 +5,9 @@ applies_to:
     ece:
     eck:
 navigation_title: Connect your self-managed cluster
+products:
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # Connect your self-managed cluster to AutoOps

deploy-manage/monitor/autoops/cc-manage-users.md

@@ -5,6 +5,9 @@ applies_to:
     ece:
     eck:
 navigation_title: Manage connected cluster users
+products:
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # Manage connected cluster users

deploy-manage/monitor/autoops/ec-autoops-deployment-view.md

@@ -1,21 +1,22 @@
 ---
-navigation_title: Deployment
+navigation_title: Deployment or Cluster
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-autoops-deployment-view.html
 applies_to:
   deployment:
     ess: all
+    self:
+    ece:
+    eck:
 products:
   - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
-# Deployment view in AutoOps [ec-autoops-deployment-view]
+# Deployment or Cluster view in AutoOps [ec-autoops-deployment-view]
 
-The **Deployment** view is the event control panel that allows you to see which issues are affecting the {{es}} cluster and get a list of action items to address them.
-
-:::{image} /deploy-manage/images/cloud-autoops-deployment-view.png
-:alt: The Deployment view
-:::
+The **Deployment** view (for {{ECH}} deployments) or **Cluster** view (for ECE, ECK, and self-managed clusters), is the event control panel that allows you to see which issues are affecting the {{es}} cluster and get a list of action items to address them.
 
 ## Events over time [ec-autoops-events-over-time]
 
@@ -34,9 +35,9 @@ The **Open Events** panel lists open events sorted by severity and time. When th
 The **Events History** panel lists events that happened at some point and that have been triggered, but some conditions changed and are no longer active. For example, when your cluster experiences a peak in search rate, that might trigger a "Too many tasks on queue" event. Now, your cluster is more relaxed in terms of search rate, so this event is no longer an issue, but it was recorded for historical reasons. Events history is also sorted by severity first and then by time.
 
 
-## Deployment Resources [ec-deployment-resources]
+## Resources [ec-deployment-resources]
 
-The **Deployment Resources** panel provides a quick overview of Elasticsearch cluster resource usage. The resources are presented based on their respective data tiers and include JVM memory usage, CPU usage, and storage usage over time. You can view essential cluster information such as the Elasticsearch version, total number of nodes, total shards, and total used storage.
+The **Resources** panel provides a quick overview of Elasticsearch cluster resource usage. The resources are presented based on their respective data tiers and include JVM memory usage, CPU usage, and storage usage over time. You can view essential cluster information such as the Elasticsearch version, total number of nodes, total shards, and total used storage.
 
 :::{image} /deploy-manage/images/cloud-autoops-deployment-resources.png
 :alt: The AutoOps Resources panel
@@ -51,7 +52,7 @@ The **Performance** panel shows key performance metrics, aggregated at both the
 :alt: The AutoOps Deployment Performance
 :::
 
-* **Search rate**: The number of search requests executed per second across all shards in the deployment, as well as within the selected data tiers.
-* **Search latency**: The average latency of search operations across all shards in the deployment, and within the selected data tiers.
-* **Indexing rate**: The number of documents indexed per second across all shards in the deployment, as well as within the selected data tiers.
-* **Indexing latency**: The average latency of indexing operations across all shards in the deployment, and within the selected data tiers.
+* **Search rate**: The number of search requests executed per second across all shards in the deployment or cluster, as well as within the selected data tiers.
+* **Search latency**: The average latency of search operations across all shards in the deployment or cluster, and within the selected data tiers.
+* **Indexing rate**: The number of documents indexed per second across all shards in the deployment or cluster, as well as within the selected data tiers.
+* **Indexing latency**: The average latency of indexing operations across all shards in the deployment or cluster, and within the selected data tiers.

deploy-manage/monitor/autoops/ec-autoops-dismiss-event.md

@@ -4,8 +4,13 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+    self:
+    ece:
+    eck:
 products:
   - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # Dismiss Events [ec-autoops-dismiss-event]

deploy-manage/monitor/autoops/ec-autoops-event-settings.md

@@ -4,8 +4,13 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+    self:
+    ece:
+    eck:
 products:
   - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # Event Settings [ec-autoops-event-settings]

deploy-manage/monitor/autoops/ec-autoops-events.md

@@ -4,8 +4,13 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+    self:
+    ece:
+    eck:
 products:
   - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 navigation_title: Events
 ---
 
@@ -17,7 +22,7 @@ When AutoOps detects an issue, it creates an event. Events provide detailed anal
 
 ## Event insights
 
-You can view events on the **Deployment** page in the **Open Events** and **Events History** sections.
+You can view events on the **Deployment** page (for {{ECH}} deployments) or the **Cluster** page (for ECE, ECK, and self-managed clusters) in the **Open Events** and **Events History** sections.
 
 When you select an event, a flyout appears with insights and context for the detected issue.
 
@@ -63,6 +68,6 @@ This action can be reversed using the **Dismiss events** report.
 You can share event information with other users by sending them a link to the event in AutoOps. Select **Share event link** to share the event.
 
 :::{note}
-Users can only view the event from the shared link if they have access to the AutoOps deployment from which the link was copied.
+Users can only view the event from the shared link if they have access to the AutoOps deployment or cluster from which the link was copied.
 :::
 

deploy-manage/monitor/autoops/ec-autoops-faq.md

@@ -2,10 +2,16 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-autoops-faq.html
 applies_to:
+  serverless:
   deployment:
     ess: all
+    self:
+    ece:
+    eck:
 products:
   - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # AutoOps FAQ [ec-autoops-faq]
@@ -15,8 +21,8 @@ Here are answers to some common questions about AutoOps.
 $$$faq-what-is-autoops$$$What does AutoOps do?
 :   AutoOps for {{es}} significantly simplifies cluster management with performance recommendations, resource utilization and cost insights, real-time issue detection and resolution paths. By analyzing hundreds of {{es}} metrics, your configuration, and usage patterns, AutoOps recommends operational and monitoring insights that deliver savings in administration time and hardware costs.
 
-$$$faq-autoops-availability$$$Will AutoOps be available for {{serverless-full}} and self-hosted users?
-:   AutoOps will be available for {{serverless-full}} and self-hosted customers with a different set of capabilities in the future.
+$$$faq-autoops-deployment-types$$$Is AutoOps available in all types of deployments?
+:   AutoOps is available in all {{ech}} deployments and {{serverless-full}} projects, and can be set up for ECE, ECK, and self-managed clusters.
 
 $$$faq-autoops-monitoring$$$Does AutoOps monitor the entire {{stack}}?
 :   AutoOps is currently limited to {{es}} (not {{kib}}, Logstash, and Beats).
@@ -25,10 +31,12 @@ $$$faq-autoops-supported-versions$$$What versions of {{es}} are supported for {{
 :   AutoOps supports {{es}} versions according to the [supported {{stack}} versions](https://www.elastic.co/support/eol).
 
 $$$faq-autoops-license$$$How is AutoOps currently licensed?
-:   AutoOps' current feature set is available to {{ech}} customers at all subscription tiers. For more information, refer to the [subscription page](https://www.elastic.co/subscriptions/cloud).
+:   Using AutoOps for {{ech}} deployments is available at all [subscription tiers](https://www.elastic.co/subscriptions/cloud).
+    :::{include} /deploy-manage/_snippets/autoops-cc-payment-faq.md
+    ::: 
 
 $$$faq-autoops-installation$$$How does AutoOps get installed and why may I not see AutoOps available on specific deployments?
-:   AutoOps is automatically applied to {{es}} clusters on {{ecloud}}, rolling out in phases across CSPs and regions. Read more about AutoOps [regions](ec-autoops-regions.md).
+:   AutoOps is automatically available in {{es}} clusters on {{ecloud}} and can be [set up](/deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md) for ECE, ECK, and self-managed clusters. AutoOps is rolling out in phases across CSPs and [regions](ec-autoops-regions.md), so you may not see it if your deployment is in a region where AutoOps is not available yet. 
 
 $$$faq-autoops-issue-resolution$$$Can AutoOps currently automatically resolve issues?
 :   AutoOps only analyzes metrics, and is a read-only solution.

deploy-manage/monitor/autoops/ec-autoops-index-view.md

@@ -5,8 +5,13 @@ mapped_pages:
 applies_to:
   deployment:
     ess: all
+    self:
+    ece:
+    eck:
 products:
   - id: cloud-hosted
+  - id: cloud-kubernetes
+  - id: cloud-enterprise
 ---
 
 # Indices view in AutoOps [ec-autoops-index-view]