Skip to content

Commit 3cd4c1c

Browse files
Merge branch 'main' into ts-sec
2 parents 7ccbe7e + c396fa2 commit 3cd4c1c

File tree

103 files changed

+140
-757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+140
-757
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application
1414

1515
* Kibana
1616
* APM Server
17-
* Enterprise Search
1817
* Elastic Maps Server
1918

2019
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/ec-autoscaling-api-example.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ $$$ec-autoscaling-api-example-requirements-table$$$
3939
| coordinating and master nodes ||||
4040
| Kibana ||||
4141
| APM ||||
42-
| Enterprise Search ||||
4342

4443
+
4544

deploy-manage/autoscaling/ec-autoscaling.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ The following are known limitations and restrictions with autoscaling:
7878

7979
* Autoscaling will not run if the cluster is unhealthy or if the last Elasticsearch plan failed.
8080
* 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.
81-
* 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**.
8281
* 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).
8382

8483

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ $$$ece-autoscaling-api-example-requirements-table$$$
4040
| coordinating and master nodes ||||
4141
| Kibana ||||
4242
| APM ||||
43-
| Enterprise Search ||||
4443

4544
+
4645

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ $$$faq-included$$$What is included in my paid {{ech}} deployment?
9696

9797
* Free 1GB RAM Kibana instance
9898
* Free 1GB RAM Machine Learning node
99-
* Free 2GB RAM Enterprise Search instance
10099
* Free 1GB RAM APM server
101100
* A free allowance for [data transfer and snapshot storage costs](#faq-dts)
102101

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Other Products
3737
* [APM event intake API Reference](/solutions/observability/apps/elastic-apm-events-intake-api.md)
3838
* [App Search API Reference](https://www.elastic.co/guide/en/app-search/current/api-reference.html)
3939
* [Elastic Security APIs](https://www.elastic.co/guide/en/security/current/security-apis.html)
40-
* [Enterprise Search management APIs](https://www.elastic.co/guide/en/enterprise-search/current/management-apis.html)
4140
* [Fleet APIs](https://www.elastic.co/guide/en/fleet/current/fleet-api-docs.html)
4241
* [Logstash APIs](https://www.elastic.co/guide/en/logstash/current/monitoring-logstash.html)
4342
* [Workplace Search API Reference](https://www.elastic.co/guide/en/workplace-search/current/workplace-search-api-overview.html)

deploy-manage/deploy/cloud-enterprise/change-ece-api-url.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mapped_pages:
55

66
# Change the ECE API URL [ece-config-api-base-url]
77

8-
You can configure the HTTPS URL used to access the ECE API. You can specify either a DNS host name or an IP address. The primary use for this is to enable [single sign-on](../../users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md) on your deployments, so you can log into Kibana and Enterprise Search automatically once logged in to ECE.
8+
You can configure the HTTPS URL used to access the ECE API. You can specify either a DNS host name or an IP address. The primary use for this is to enable [single sign-on](../../users-roles/cloud-enterprise-orchestrator/configure-sso-for-deployments.md) on your deployments, so you can log into Kibana automatically once logged in to ECE.
99

1010
To change the ECE API URL in the Cloud UI:
1111

deploy-manage/deploy/cloud-enterprise/deployment-templates.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ The components of the Elastic Stack that we support as part of a deployment are
1313
* Machine Learning (ML) nodes
1414
* Kibana instances
1515
* APM and Fleet instances
16-
* Enterprise Search instances
1716

1817
Elastic Cloud Enterprise comes with some deployment templates already built in, but you can [create new deployment templates](ece-configuring-ece-create-templates.md) to address a particular use case you might have. To make the most out of your hardware, we also recommend that you [configure deployment templates](configure-deployment-templates.md), so that ECE knows where to deploy components of the Elastic Stack.
1918

@@ -39,10 +38,6 @@ The deployment templates available are:
3938

4039
Use this template to prevent, collect, detect, and respond to threats for unified protection across your infrastructure. Check the [**Elastic Security**](../../../solutions/security.md) documentation for more information.
4140

42-
* **Elastic Enterprise Search template**
43-
44-
Default deployment template for Elastic Enterprise Search. Check the [**Enterprise Search**](https://www.elastic.co/guide/en/enterprise-search/current/index.html) documentation for more information.
45-
4641
* **Elastic Observability template**
4742

4843
This template allows you to consolidate your logs, metrics, application traces, and system availability with purpose-built UIs. Check the [**Elastic Observability**](../../../solutions/observability/get-started/what-is-elastic-observability.md) documentation for more information.

deploy-manage/deploy/cloud-enterprise/ece-configuring-ece-create-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ Before you start creating your own deployment templates, you should have: [tagge
399399

400400

401401
::::{note}
402-
When specifying `node_roles` in the Elasticsearch plan of the deployment template, the template must contain all resource types and all Elasticsearch tiers. The deployment template must contain exactly one entry for each resource type. It must have one Elasticsearch, one Kibana, one APM, and one Enterprise Search. On top of that, it must also include all supported Elasticsearch tiers in the Elasticsearch plan. The supported tiers are identified by the IDs `hot_content`, `warm`, `cold`, `frozen`, `master`, `coordinating` and `ml`.
402+
When specifying `node_roles` in the Elasticsearch plan of the deployment template, the template must contain all resource types and all Elasticsearch tiers. The deployment template must contain exactly one entry for each resource type. It must have one Elasticsearch, one Kibana, and one APM. On top of that, it must also include all supported Elasticsearch tiers in the Elasticsearch plan. The supported tiers are identified by the IDs `hot_content`, `warm`, `cold`, `frozen`, `master`, `coordinating` and `ml`.
403403
::::
404404

405405

deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ To learn more about adding the stack pack to ECE, check [Manage Elastic Stack Ve
3131

3232
## Most recent Elastic Stack packs and Docker images [ece-recent-download-list]
3333

34+
:::{important}
35+
Enterprise Search is not available in versions 9.0+.
36+
:::
37+
3438
| Required downloads | Minimum required ECE version |
3539
| --- | --- |
3640
| [Elasticsearch, Kibana, APM, and Enterprise Search stack pack: 8.17.1](https://download.elastic.co/cloud-enterprise/versions/8.17.1.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |

0 commit comments

Comments
 (0)