Merge branch 'main' into rip-serverless-files-pt3

Author: nastasha-solomon

deploy-manage/_snippets/deployment-options-overview.md

@@ -0,0 +1,12 @@
+**Quick start options**
+
+* [**Elastic Cloud**](/deploy-manage/deploy/elastic-cloud.md): Get a hosted solution up and running in minutes.
+   * [**Elastic Cloud Hosted**](/deploy-manage/deploy/elastic-cloud/cloud-hosted.md): Our hosted Elastic Stack offering, deployed in the cloud with your provider of choice. Sign up for a [14-day free trial](https://cloud.elastic.co/registration).
+   * [**Elastic Cloud Serverless**](/deploy-manage/deploy/elastic-cloud/serverless.md): Create serverless projects for autoscaled and fully managed Elastic deployments. Sign up for a [14-day free trial](https://cloud.elastic.co/serverless-registration).
+* [**Local development**](/solutions/search/run-elasticsearch-locally.md): Get started quickly with {{es}} and {{kib}} in Docker for local development and testing.
+
+**Advanced options**
+
+* [**Self-managed**](/deploy-manage/deploy/self-managed.md): Install, configure, and run Elastic on your own premises.
+* [**Elastic Cloud Enterprise**](https://www.elastic.co/guide/en/cloud-enterprise/current/Elastic-Cloud-Enterprise-overview.html): Deploy Elastic Cloud on public or private clouds, virtual machines, or your own premises.
+* [**Elastic Cloud on Kubernetes**](/deploy-manage/deploy/cloud-on-k8s.md): Deploy Elastic Cloud on Kubernetes.

deploy-manage/deploy.md

@@ -4,8 +4,6 @@ mapped_urls:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro-deploy.html
 ---
 
-# Deploy
-
 % What needs to be done: Write from scratch
 
 % GitHub issue: https://github.com/elastic/docs-projects/issues/334
@@ -17,9 +15,90 @@ mapped_urls:
 % - [ ] ./raw-migrated-files/docs-content/serverless/intro.md
 % - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/elasticsearch-intro-deploy.md
 
-⚠️ **This page is a work in progress.** ⚠️
+# Deploy
+
+Whether you're planning to use Elastic's pre-built solutions or Serverless projects, build your own applications with {{es}}, or analyze your data using {{kib}} tools, you'll need to deploy Elastic first.
+
+This page will help you understand your deployment options and choose the approach that best fits your needs.
+
+## Core components
+
+Every Elastic deployment requires {{es}} as its core data store and search/analytics engine.
+Additionally, {{kib}} provides the user interface for all Elastic solutions and Serverless projects. It is required for most use cases, from data exploration to monitoring and security analysis.
+
+Your choice of deployment type determines how you'll set up and manage these core components, plus any additional components you need.
+
+:::{tip}
+Learn more about the [{{stack}}](/get-started/the-stack.md) to understand the core and optional components of an Elastic deployment.
+:::
+
+## Choosing your deployment type
+
+:::{include} _snippets/deployment-options-overview.md
+:::
+
+### Who manages the infrastructure?
+
+#### Managed by Elastic
+
+If you want to focus on using Elastic products rather than managing infrastructure, choose:
+
+- **Serverless**: Zero operational overhead, automatic scaling and updates, latest features
+- **Cloud hosted**: Balance of control and managed operations, choice of resources and regions
+
+#### Self-hosted options
+
+If you need to run Elastic on your infrastructure, choose between a fully self-managed deployment or using an orchestrator:
+
+- **Fully self-managed**: Complete control and responsibility for your Elastic deployment
+- **With orchestration**:
+  - **Elastic Cloud on Kubernetes (ECK)**: If you need Kubernetes-native orchestration
+  - **Elastic Cloud Enterprise (ECE)**: If you need a multi-tenant orchestration platform
+
+:::::{note}
+:::{dropdown} About orchestration
+
+An orchestrator automates the deployment and management of multiple Elastic clusters, handling tasks like scaling, upgrades, and monitoring.
+
+Consider orchestration if you:
+- Need to manage multiple Elastic clusters
+- Want automated operations at scale
+- Have a Kubernetes environment (ECK)
+- Need to build a multi-tenant platform (ECE)
+
+Orchestrators manage the lifecycle of your Elastic deployments but don't change how the core products work. When using ECK or ECE:
+- You'll still use the same Elasticsearch and Kibana features and configurations
+- Most product documentation remains applicable
+- You can add other Elastic products as needed
+- The orchestrator handles operational tasks while you focus on using and configuring the products
+
+::::{tip}
+Documentation will specify when certain features or configurations are not applicable to specific deployment types.
+::::
+:::
+:::::
+
+### Versioning and compatibility 
+
+In {{serverless-full}}, you automatically get access to the latest versions of Elastic features and you don't need to manage version compatibility.
+
+With other deployment types ({{ecloud}} Hosted, ECE, and ECK), you control which {{stack}} versions you deploy and when you upgrade. The ECE and ECK orchestrators themselves also receive regular version updates, independent of the {{stack}} versions they manage.
+
+Consider this when choosing your deployment type:
+
+- Choose Serverless if you want automatic access to the latest features and don't want to manage version compatibility
+- Choose other deployment types if you need more control over version management
+
+:::{tip}
+Learn more about [versioning and availability](/get-started/versioning-availability.md). 
+:::
+
+### Cost considerations
 
-The documentation team is working to combine content pulled from the following pages:
+- **Serverless**: Pay for what you use
+- **Cloud hosted**: Subscription-based with resource allocation
+- **Self-hosted options**: Infrastructure costs plus operational overhead mean a higher total cost of ownership (TCO)
 
-* [/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)
+:::::{tip}
+For a detailed comparison of features and capabilities across deployment types, see the [Deployment comparison reference](./deploy/deployment-comparison.md).
+:::::

deploy-manage/deploy/deployment-comparison.md

@@ -0,0 +1,57 @@
+
+# Deployment comparison reference
+
+This reference provides detailed comparisons of features and capabilities across Elastic's deployment options: self-managed deployments, Elastic Cloud Hosted, and Serverless. For a high-level overview of deployment types and guidance on choosing between them, see the [overview](../deploy.md).
+
+## Security features
+
+| Feature/capability | Self-managed | Elastic Cloud Hosted | Serverless |
+|-------------------|-------------|--------------------------------|-------------------------|
+| Custom security configurations | Yes | Limited | No |
+| Authentication realms and custom roles | Yes | Yes | No |
+| Audit logging | Yes | Yes | No |
+
+## Management features
+
+| Feature/capability | Self-managed | Elastic Cloud Hosted | Serverless |
+|-------------------|-------------|--------------------------------|-------------------------|
+| Full control over configuration | Yes | Limited | No |
+| Infrastructure flexibility | Yes | No | No |
+| Autoscaling | No | Yes | Yes |
+| Data tiers management | No | Yes | No |
+| Snapshot management | No | Yes | No |
+| High availability and disaster recovery | Yes | Yes | Yes |
+| Multi-cloud support | No | Yes | Yes |
+| Shard management and replicas | Yes | Yes | No |
+
+## Monitoring features
+
+| Feature/capability | Self-managed | Elastic Cloud Hosted | Serverless |
+|-------------------|-------------|--------------------------------|-------------------------|
+| Watcher | Yes | Yes | No |
+
+## Data lifecycle features
+
+| Feature/capability | Self-managed | Elastic Cloud Hosted | Serverless |
+|-------------------|-------------|--------------------------------|-------------------------|
+| Index lifecycle management (ILM) | Yes | Yes | No (uses data streams) |
+| Data tiers management | No | Yes | No |
+| Snapshot management | No | Yes | No |
+
+## Integration features
+
+| Feature/capability | Self-managed | Elastic Cloud Hosted | Serverless |
+|-------------------|-------------|--------------------------------|-------------------------|
+| Custom plugins | Yes | No | No |
+| Self-managed connectors | Yes | No | Limited |
+| Elasticsearch-Hadoop integration | Yes | Yes | No |
+| Cross cluster search (CCS) | Yes | Yes | No |
+| Cross cluster replication | Yes | Yes | Yes |
+
+## Development and testing features
+
+| Feature/capability | Self-managed | Elastic Cloud Hosted | Serverless |
+|-------------------|-------------|--------------------------------|-------------------------|
+| Advanced testing and development | Yes | No | No |
+| Java (JVM) customization | Yes | No | No |
+

deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md

@@ -146,24 +146,12 @@ The following features are planned for future support in all {{serverless-full}}
 * Clone index API
 * Traffic filtering and VPCs
 
-The following {{es-serverless}} project-specific features are planned for future support:
-
-* [Behavioral Analytics](../../../solutions/search/site-or-app/behavioral-analytics.md)
-* [Search Applications](../../../solutions/search/search-applications.md)
-* Managed web crawler
-
-    You can use the [self-managed web crawler](https://github.com/elastic/crawler) in the meantime.
-
-* Managed Search connectors
-
-    You can use [self-managed Search connectors](asciidocalypse://docs/elasticsearch/docs/reference/ingestion-tools/search-connectors/self-managed-connectors.md) in the meantime.
-
-
-
 ### Unplanned features [elasticsearch-differences-serverless-feature-unavailable]
 
 The following features are not available in {{es-serverless}} and are not planned for future support:
 
 * [Custom plugins and bundles](/deploy-manage/deploy/elastic-cloud/upload-custom-plugins-bundles.md)
 * [{{es}} for Apache Hadoop](asciidocalypse://docs/elasticsearch-hadoop/docs/reference/ingestion-tools/elasticsearch-hadoop/elasticsearch-for-apache-hadoop.md)
 * [Scripted metric aggregations](asciidocalypse://docs/elasticsearch/docs/reference/data-analysis/aggregations/search-aggregations-metrics-scripted-metric-aggregation.md)
+* Managed web crawler: You can use the [self-managed web crawler](https://github.com/elastic/crawler) instead.
+* Managed Search connectors: You can use [self-managed Search connectors](asciidocalypse://docs/elasticsearch/docs/reference/ingestion-tools/search-connectors/self-managed-connectors.md) instead.

deploy-manage/deploy/self-managed.md

@@ -5,5 +5,4 @@ mapped_pages:
 
 # Self-managed cluster [dependencies-versions]
 
-See [Elastic Stack Third-party Dependencices](https://artifacts.elastic.co/reports/dependencies/dependencies-current.md) for the complete list of dependencies for {{es}}.
-
+See [Elastic Stack Third-party Dependencices](https://artifacts.elastic.co/reports/dependencies/dependencies-current.md) for the complete list of dependencies for {{es}}.

deploy-manage/deploy/self-managed/deploy-cluster.md

@@ -24,7 +24,6 @@ $$$dedicated-host$$$
 
 **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/elasticsearch-intro-deploy.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/elasticsearch-intro-deploy.md)
 * [/raw-migrated-files/elasticsearch/elasticsearch-reference/setup.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/setup.md)
 
 % Doesn't exist

deploy-manage/toc.yml

@@ -24,6 +24,7 @@ toc:
       - file: distributed-architecture/kibana-tasks-management.md
   - file: deploy.md
     children:
+      - file: deploy/deployment-comparison.md
       - file: deploy/elastic-cloud.md
         children:
           - file: deploy/elastic-cloud/create-an-organization.md

explore-analyze/alerts-cases/alerts/notifications-domain-allowlist.md

@@ -24,7 +24,7 @@ Changes to the allowlist do not take effect immediately. After saving your chang
 
 ### Using the UI [using-the-ui]
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. Select a deployment.
 3. From your deployment menu, go to the **Edit** page.
 4. Select **Save**.

explore-analyze/alerts-cases/cases/manage-cases.md

@@ -37,7 +37,7 @@ Open a new case to keep track of issues and share their details with colleagues.
 
 You can configure email notifications that occur when users are assigned to cases.
 
-For hosted {{kib}} on {{ess}}:
+For {{kib}} on {{ecloud}}:
 
 1. Add the email domains to the [notifications domain allowlist](../alerts.md).
 

explore-analyze/alerts-cases/watcher/enable-watcher.md

@@ -24,11 +24,11 @@ To learn more about Kibana alerting and how to use it, check [Alerting and Actio
 
 ## Send alerts by email [watcher-allowlist]
 
-You can configure notifications similar to the [operational emails](../../../deploy-manage/cloud-organization/operational-emails.md) that Elasticsearch Service sends automatically to alert you about performance issues in your clusters.
+You can configure notifications similar to the [operational emails](../../../deploy-manage/cloud-organization/operational-emails.md) that {{ecloud}} sends automatically to alert you about performance issues in your clusters.
 
 Watcher in Elastic Cloud is preconfigured with an email service and can be used without any additional configuration. Alternatively, a custom mail server can be configured as described in [Configuring a custom mail server](#watcher-custom-mail-server)
 
-You can optionally add [HTML sanitization](../../../explore-analyze/alerts-cases/watcher/actions-email.md#email-html-sanitization) settings under [Elasticsearch User settings](../../../deploy-manage/deploy/elastic-cloud/edit-stack-settings.md) in the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body) so that HTML elements are sanitized in the email notification.
+You can optionally add [HTML sanitization](../../../explore-analyze/alerts-cases/watcher/actions-email.md#email-html-sanitization) settings under [Elasticsearch User settings](../../../deploy-manage/deploy/elastic-cloud/edit-stack-settings.md) in the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body) so that HTML elements are sanitized in the email notification.
 
 For more information on sending alerts by email, check [Email action](../../../explore-analyze/alerts-cases/watcher/actions-email.md).