Merge branch 'main' into 369/index-basics

Author: wajihaparvez

.github/workflows/docs-deploy.yml

@@ -4,4 +4,6 @@
 
 % GitHub issue: https://github.com/elastic/docs-projects/issues/349
 
-% Scope notes: Elasticsearch & Kibana authentication API Keys
+% Scope notes: Elasticsearch & Kibana authentication API Keys
+
+⚠️ **This page is a work in progress.** ⚠️

deploy-manage/api-keys.md

@@ -14,7 +14,7 @@ mapped_urls:
 
 % What needs to be done: Refine
 
-% GitHub issue: https://github.com/elastic/docs-projects/issues/344  
+% GitHub issue: https://github.com/elastic/docs-projects/issues/344
 
 % Scope notes: Collapse to a single page, explain what deciders are
 
@@ -27,4 +27,17 @@ mapped_urls:
 % - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-storage-decider.md
 % - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-existence-decider.md
 % - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-machine-learning-decider.md
-% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-fixed-decider.md
+% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-fixed-decider.md
+
+⚠️ **This page is a work in progress.** ⚠️
+
+The documentation team is working to combine content pulled from the following pages:
+
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-deciders.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-deciders.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-reactive-storage-decider.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-reactive-storage-decider.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-proactive-storage-decider.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-proactive-storage-decider.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-shards-decider.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-shards-decider.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-storage-decider.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-storage-decider.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-existence-decider.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-frozen-existence-decider.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-machine-learning-decider.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-machine-learning-decider.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-fixed-decider.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/autoscaling-fixed-decider.md)

deploy-manage/autoscaling/autoscaling-deciders.md

@@ -14,7 +14,6 @@ The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application
 
 * Kibana
 * APM Server
-* Enterprise Search
 * Elastic Maps Server
 
 These resources expose the `scale` subresource which can be used by the Horizontal Pod Autoscaler controller to automatically adjust the number of replicas according to the CPU load or any other custom or external metric. This example shows how to create an `HorizontalPodAutoscaler` resource to adjust the replicas of a Kibana deployment according to the CPU load:

deploy-manage/autoscaling/autoscaling-stateless-applications-on-eck.md

@@ -39,7 +39,6 @@ $$$ec-autoscaling-api-example-requirements-table$$$
 | coordinating and master nodes | ✓ | ✕ | ✕ |
 | Kibana | ✓ | ✕ | ✕ |
 | APM | ✓ | ✕ | ✕ |
-| Enterprise Search | ✓ | ✕ | ✕ |
 
 +
 

deploy-manage/autoscaling/ec-autoscaling-api-example.md

@@ -78,7 +78,6 @@ The following are known limitations and restrictions with autoscaling:
 
 * Autoscaling will not run if the cluster is unhealthy or if the last Elasticsearch plan failed.
 * Trial deployments cannot be configured to autoscale beyond the normal Trial deployment size limits. The maximum size per zone is increased automatically from the Trial limit when you convert to a paid subscription.
-* If Enterprise Search is left at the default size, and has no engines or sources configured for an extended period, it will be automatically disabled. This occurs whether autoscaling is enabled or not. Reactivate the service by editing the **Enterprise Search** settings for your deployment under **Cloud > Deployments > *your-deployment* > Edit**.
 * ELSER deployments do not scale automatically. For more information, refer to [ELSER](../../explore-analyze/machine-learning/nlp/ml-nlp-elser.md) and [Trained model autoscaling](../../explore-analyze/machine-learning/nlp/ml-nlp-auto-scale.md).
 
 

deploy-manage/autoscaling/ec-autoscaling.md

@@ -40,7 +40,6 @@ $$$ece-autoscaling-api-example-requirements-table$$$
 | coordinating and master nodes | ✓ | ✕ | ✕ |
 | Kibana | ✓ | ✕ | ✕ |
 | APM | ✓ | ✕ | ✕ |
-| Enterprise Search | ✓ | ✕ | ✕ |
 
 +
 

deploy-manage/autoscaling/ece-autoscaling-api-example.md

@@ -96,7 +96,6 @@ $$$faq-included$$$What is included in my paid {{ech}} deployment?
 
     * Free 1GB RAM Kibana instance
     * Free 1GB RAM Machine Learning node
-    * Free 2GB RAM Enterprise Search instance
     * Free 1GB RAM APM server
     * A free allowance for [data transfer and snapshot storage costs](#faq-dts)
 

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

@@ -37,7 +37,6 @@ Other Products
     * [APM event intake API Reference](/solutions/observability/apps/elastic-apm-events-intake-api.md)
     * [App Search API Reference](https://www.elastic.co/guide/en/app-search/current/api-reference.html)
     * [Elastic Security APIs](https://www.elastic.co/guide/en/security/current/security-apis.html)
-    * [Enterprise Search management APIs](https://www.elastic.co/guide/en/enterprise-search/current/management-apis.html)
     * [Fleet APIs](https://www.elastic.co/guide/en/fleet/current/fleet-api-docs.html)
     * [Logstash APIs](https://www.elastic.co/guide/en/logstash/current/monitoring-logstash.html)
     * [Workplace Search API Reference](https://www.elastic.co/guide/en/workplace-search/current/workplace-search-api-overview.html)

deploy-manage/cloud-organization/tools-and-apis.md

@@ -15,4 +15,11 @@ mapped_urls:
 % Use migrated content from existing pages that map to this page:
 
 % - [ ] ./raw-migrated-files/docs-content/serverless/intro.md
-% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/elasticsearch-intro-deploy.md
+% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/elasticsearch-intro-deploy.md
+
+⚠️ **This page is a work in progress.** ⚠️
+
+The documentation team is working to combine content pulled from the following pages:
+
+* [/raw-migrated-files/docs-content/serverless/intro.md](/raw-migrated-files/docs-content/serverless/intro.md)
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/elasticsearch-intro-deploy.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/elasticsearch-intro-deploy.md)