Skip to content

Commit 5e926fc

Browse files
authored
Merge branch 'main' into 2997-agentless-integrations-toggle
2 parents 2f50b09 + ae0b043 commit 5e926fc

File tree

104 files changed

+2153
-820
lines changed

Some content is hidden

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

104 files changed

+2153
-820
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
This path is not supported. Currently, we only support using Cloud Connect to connect ECE, ECK, and self-managed clusters to AutoOps.
22

3-
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.
3+
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ Learn how to set up and use [](/deploy-manage/monitor/autoops/cc-autoops-as-clou
2323

2424
Find answers to your questions about Cloud Connect.
2525

26-
* [Does using Cloud Connect require additional payment?](#cc-additional-payment)
26+
* [Does Cloud Connect require additional payment?](#cc-additional-payment)
2727
* [Can I use Cloud Connect to connect my Elastic Cloud Hosted clusters to AutoOps?](#cc-ech)
2828
* [Are more services going to be available with Cloud Connect?](#cc-more-services)
2929

30-
$$$cc-additional-payment$$$ **Does using Cloud Connect require additional payment?**
30+
$$$cc-additional-payment$$$ **Does Cloud Connect require additional payment?**
3131
: Each cloud connected service has its own licensing and payment requirements.
3232
:::{include} /deploy-manage/_snippets/autoops-cc-payment-faq.md
3333
:::

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ mapped_pages:
33
- https://www.elastic.co/guide/en/cloud/current/ec-faq-billing.html
44
applies_to:
55
deployment:
6+
self:
7+
ece:
8+
eck:
69
ess: all
710
serverless: all
811
products:
@@ -29,6 +32,7 @@ This frequently-asked-questions list answers some of your more common questions
2932
* [How can I delete my {{ecloud}} account?](#faq-deleteaccount)
3033
* [Can I get a refund?](#faq-refund)
3134
* [What is included in my paid {{ecloud}} deployment?](#faq-included)
35+
* [Does Cloud Connect require additional payment?](#billing-cc-additional-payment)
3236
* [What are the data transfer and storage charges and how can I control them?](#faq-dts)
3337
* [What taxes will be applied on my invoice?](#faq-taxes)
3438

@@ -94,6 +98,9 @@ $$$faq-deleteaccount$$$How can I delete my {{ecloud}} account?
9498
$$$faq-refund$$$Can I get a refund?
9599
: 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).
96100

101+
$$$billing-cc-additional-payment$$$ **Does Cloud Connect require additional payment?**
102+
: 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.
103+
97104
$$$faq-included$$$What is included in my paid {{ech}} deployment?
98105
: All subscription tiers for {{ech}} include the following free allowance:
99106

deploy-manage/deploy/cloud-enterprise/generate-roles-tokens.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ To generate an ephemeral token for additional allocators:
5252

5353
```sh
5454
curl -H 'Content-Type: application/json' -u USER:PASSWORD https://$COORDINATOR_HOST:12443/api/v1/platform/configuration/security/enrollment-tokens -d '{ "persistent": false, "roles": [ "allocator"] }'
55+
```
56+
```sh
5557
{
5658
"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0Njk3N2I3ZC1hM2U2LTQ2MDUtYjcwZC0xNzIzMTI5YWY4ZTQiLCJyb2xlcyI6WyJwcm94eSIsImFsbG9jYXRvciJdLCJpc3MiOiJib290c3RyYXAtaW5pdGlhbCIsImV4cCI6MTQ5MzY0NjIxM30.xsaRb72CsNMuXKy6Y-PJgqLc0qmjCljlB4Smcx_MRxg"
5759
}
@@ -61,6 +63,8 @@ To generate a persistent token for additional allocators:
6163

6264
```sh
6365
curl -H 'Content-Type: application/json' -u USER:PASSWORD https://$COORDINATOR_HOST:12443/api/v1/platform/configuration/security/enrollment-tokens -d '{ "persistent": true, "roles": [ "allocator"] }'
66+
```
67+
```sh
6468
{
6569
"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0Yzg5OTBkZi0xZmI3LTQ4MjAtYjg2OC02YmM5ZTg4NjA4MTQiLCJyb2xlcyI6WyJwcm94eSIsImFsbG9jYXRvciJdLCJpc3MiOiJib290c3RyYXAtaW5pdGlhbCJ9.mfTkO4j8uZJ-qwB2jmBuMScyYfLmcJpvKgSTLx2WV24",
6670
"token_id": "4c8990df-1fb7-4820-b868-6bc9e8860814"
@@ -83,6 +87,8 @@ To delete a token:
8387

8488
```sh
8589
curl -u USER:PASSWORD https://localhost:12443/api/v1/platform/configuration/security/enrollment-tokens
90+
```
91+
```sh
8692
{
8793
"tokens": [{
8894
"token_id": "5f9cad2f-c6e7-4ee2-8f6e-53225df45be5",
@@ -98,6 +104,8 @@ To delete a token:
98104

99105
```sh
100106
curl -XDELETE -u USER:PASSWORD 'https://localhost:12443/api/v1/platform/configuration/security/enrollment-tokens/4c8990df-1fb7-4820-b868-6bc9e8860814'
107+
```
108+
```sh
101109
{
102110
}
103111
```

deploy-manage/deploy/cloud-enterprise/manage-elastic-stack-versions.md

Lines changed: 6 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@ products:
1919

2020
New or updated versions of the {{stack}} must be prepared to work with {{ece}} and are provided as packs that you can download.
2121

22-
::::{important}
23-
{{es}} 7.8 and later comes with Index Lifecycle Management (ILM) always enabled. Before upgrading to 7.8 or later, to avoid any unpredictable behavior it is important to configure hot-warm clusters on {{ece}} with ILM rather than index curation. Check [migrate to index lifecycle management](/manage-data/lifecycle/index-lifecycle-management/migrate-index-management.md) for existing clusters, and [configure index management](/manage-data/lifecycle/index-lifecycle-management.md) for new clusters.
24-
::::
25-
26-
2722

2823
## Most recent {{stack}} packs [ece_most_recent_elastic_stack_packs]
2924

30-
:::{important}
25+
:::{admonition} {{ece}} 4 removed support for {{stack}} 7.x versions
26+
{{ece}} 4 no longer supports {{stack}} versions prior to 8.0.0. Upgrade all deployments to 8.0.0 or later before upgrading to {{ece}} 4.x. Refer to the [Product compatibility support matrix -> Compatibility with {{ece}}](https://www.elastic.co/support/matrix#matrix_compatibility) for details.
27+
:::
28+
29+
:::{note}
3130
Enterprise Search is not available in versions 9.0+.
3231
:::
3332

34-
The following are the most recently released {{stack}} packs for version 9.x, 8.x, 7.x, and 6.x, respectively:
33+
The following are the most recently released {{stack}} packs for version 9.x, 8.x, and 7.x, respectively:
3534

3635
$$$ece-elastic-stack-stackpacks-recent$$$
3736

@@ -40,7 +39,6 @@ $$$ece-elastic-stack-stackpacks-recent$$$
4039
| [{{es}}, {{kib}}, and APM stack pack: 9.1.4](https://download.elastic.co/cloud-enterprise/versions/9.1.4.zip) | ECE 4.0.0 |
4140
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.4](https://download.elastic.co/cloud-enterprise/versions/8.19.4.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
4241
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 7.17.29](https://download.elastic.co/cloud-enterprise/versions/7.17.29.zip) | ECE 2.2.2 |
43-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.23](https://download.elastic.co/cloud-enterprise/versions/6.8.23.zip) | ECE 1.1.4 |
4442

4543

4644
## All available {{stack}} packs [ece-elastic-stack-stackpacks]
@@ -229,58 +227,6 @@ Following is the full list of available packs containing {{stack}} versions. Not
229227
| [{{es}}, {{kib}}, and APM stack pack: 7.1.0](https://download.elastic.co/cloud-enterprise/versions/7.1.0.zip) | ECE 2.2.2 |
230228
| [{{es}}, {{kib}}, and APM stack pack: 7.0.1](https://download.elastic.co/cloud-enterprise/versions/7.0.1.zip) | ECE 2.2.0 |
231229
| [{{es}}, {{kib}}, and APM stack pack: 7.0.0](https://download.elastic.co/cloud-enterprise/versions/7.0.0.zip) | ECE 2.2.0 |
232-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.23](https://download.elastic.co/cloud-enterprise/versions/6.8.23.zip) | ECE 1.1.4 |
233-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.22](https://download.elastic.co/cloud-enterprise/versions/6.8.22.zip) | ECE 1.1.4 |
234-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.21](https://download.elastic.co/cloud-enterprise/versions/6.8.21.zip) | ECE 1.1.4 |
235-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.20](https://download.elastic.co/cloud-enterprise/versions/6.8.20.zip) | ECE 1.1.4 |
236-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.19](https://download.elastic.co/cloud-enterprise/versions/6.8.19.zip) | ECE 1.1.4 |
237-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.18](https://download.elastic.co/cloud-enterprise/versions/6.8.18.zip) | ECE 1.1.4 |
238-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.17](https://download.elastic.co/cloud-enterprise/versions/6.8.17.zip) | ECE 1.1.4 |
239-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.16](https://download.elastic.co/cloud-enterprise/versions/6.8.16.zip) | ECE 1.1.4 |
240-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.15](https://download.elastic.co/cloud-enterprise/versions/6.8.15.zip) | ECE 1.1.4 |
241-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.14](https://download.elastic.co/cloud-enterprise/versions/6.8.14.zip) | ECE 1.1.4 |
242-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.13](https://download.elastic.co/cloud-enterprise/versions/6.8.13.zip) | ECE 1.1.4 |
243-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.12](https://download.elastic.co/cloud-enterprise/versions/6.8.12.zip) | ECE 1.1.4 |
244-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.11](https://download.elastic.co/cloud-enterprise/versions/6.8.11.zip) | ECE 1.1.4 |
245-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.10](https://download.elastic.co/cloud-enterprise/versions/6.8.10.zip) | ECE 1.1.4 |
246-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.9](https://download.elastic.co/cloud-enterprise/versions/6.8.9.zip) | ECE 1.1.4 |
247-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.8](https://download.elastic.co/cloud-enterprise/versions/6.8.8.zip) | ECE 1.1.4 |
248-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.7](https://download.elastic.co/cloud-enterprise/versions/6.8.7.zip) | ECE 1.1.4 |
249-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.6](https://download.elastic.co/cloud-enterprise/versions/6.8.6.zip) | ECE 1.1.4 |
250-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.5](https://download.elastic.co/cloud-enterprise/versions/6.8.5.zip) | ECE 1.1.4 |
251-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.4](https://download.elastic.co/cloud-enterprise/versions/6.8.4.zip) | ECE 1.1.4 |
252-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.3](https://download.elastic.co/cloud-enterprise/versions/6.8.3.zip) | ECE 1.1.4 |
253-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.2](https://download.elastic.co/cloud-enterprise/versions/6.8.2.zip) | ECE 1.1.4 |
254-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.1](https://download.elastic.co/cloud-enterprise/versions/6.8.1.zip) | ECE 1.1.4 |
255-
| [{{es}}, {{kib}}, and APM stack pack: 6.8.0](https://download.elastic.co/cloud-enterprise/versions/6.8.0.zip) | ECE 1.1.4 |
256-
| [{{es}}, {{kib}}, and APM stack pack: 6.7.2](https://download.elastic.co/cloud-enterprise/versions/6.7.2.zip) | ECE 1.1.4 |
257-
| [{{es}}, {{kib}}, and APM stack pack: 6.7.1](https://download.elastic.co/cloud-enterprise/versions/6.7.1.zip) | ECE 1.1.4 |
258-
| [{{es}}, {{kib}}, and APM stack pack: 6.7.0](https://download.elastic.co/cloud-enterprise/versions/6.7.0.zip) | ECE 1.1.4 |
259-
| [{{es}}, {{kib}}, and APM stack pack: 6.6.2](https://download.elastic.co/cloud-enterprise/versions/6.6.2.zip) | ECE 1.1.4 |
260-
| [{{es}}, {{kib}}, and APM stack pack: 6.6.1](https://download.elastic.co/cloud-enterprise/versions/6.6.1.zip) | ECE 1.1.4 |
261-
| [{{es}}, {{kib}}, and APM stack pack: 6.6.0](https://download.elastic.co/cloud-enterprise/versions/6.6.0.zip) | ECE 1.1.4 |
262-
| [{{es}}, {{kib}}, and APM stack pack: 6.5.4](https://download.elastic.co/cloud-enterprise/versions/6.5.4.zip) | ECE 1.1.4 |
263-
| [{{es}}, {{kib}}, and APM stack pack: 6.5.3](https://download.elastic.co/cloud-enterprise/versions/6.5.3.zip) | ECE 1.1.4 |
264-
| [{{es}}, {{kib}}, and APM stack pack: 6.5.2](https://download.elastic.co/cloud-enterprise/versions/6.5.2.zip) | ECE 1.1.4 |
265-
| [{{es}}, {{kib}}, and APM stack pack: 6.5.1](https://download.elastic.co/cloud-enterprise/versions/6.5.1.zip) | ECE 1.1.4 |
266-
| [{{es}}, {{kib}}, and APM stack pack: 6.5.0](https://download.elastic.co/cloud-enterprise/versions/6.5.0.zip) | ECE 1.1.4 |
267-
| [{{es}}, {{kib}}, and APM stack pack: 6.4.3](https://download.elastic.co/cloud-enterprise/versions/6.4.3.zip) | ECE 1.1.4 |
268-
| [{{es}}, {{kib}}, and APM stack pack: 6.4.2](https://download.elastic.co/cloud-enterprise/versions/6.4.2.zip) | ECE 1.1.4 |
269-
| [{{es}}, {{kib}}, and APM stack pack: 6.4.1](https://download.elastic.co/cloud-enterprise/versions/6.4.1.zip) | ECE 1.1.4 |
270-
| [{{es}}, {{kib}}, and APM stack pack: 6.4.0](https://download.elastic.co/cloud-enterprise/versions/6.4.0.zip) | ECE 1.1.4 |
271-
| [{{es}}, {{kib}}, and APM stack pack: 6.3.2](https://download.elastic.co/cloud-enterprise/versions/6.3.2.zip) | ECE 1.1.4 |
272-
| [{{es}}, {{kib}}, and APM stack pack: 6.3.1](https://download.elastic.co/cloud-enterprise/versions/6.3.1.zip) | ECE 1.1.4 |
273-
| [{{es}}, {{kib}}, and APM stack pack: 6.3.0](https://download.elastic.co/cloud-enterprise/versions/6.3.0.zip) | ECE 1.1.4 |
274-
| [{{es}} and {{kib}} stack pack: 6.2.4](https://download.elastic.co/cloud-enterprise/versions/6.2.4.zip) | ECE 1.1.2 |
275-
| [{{es}} and {{kib}} stack pack: 6.2.3](https://download.elastic.co/cloud-enterprise/versions/6.2.3.zip) | ECE 1.1.2 |
276-
| [{{es}} and {{kib}} stack pack: 6.2.2](https://download.elastic.co/cloud-enterprise/versions/6.2.2.zip) | ECE 1.1.2 |
277-
| [{{es}} and {{kib}} stack pack: 6.1.4](https://download.elastic.co/cloud-enterprise/versions/6.1.4.zip) | ECE 1.1.2 |
278-
| [{{es}} and {{kib}} stack pack: 6.1.3](https://download.elastic.co/cloud-enterprise/versions/6.1.3.zip) | ECE 1.1.2 |
279-
| [{{es}} and {{kib}} stack pack: 6.0.1](https://download.elastic.co/cloud-enterprise/versions/6.0.1.zip) | ECE 1.1.2 |
280-
| [{{es}} and {{kib}} stack pack: 6.0.0](https://download.elastic.co/cloud-enterprise/versions/6.0.0.zip) | ECE 1.1.0 |
281-
| [{{es}} and {{kib}} stack pack: 5.6.16](https://download.elastic.co/cloud-enterprise/versions/5.6.16.zip) | ECE 1.1.0 |
282-
| [{{es}} and {{kib}} stack pack: 2.4.6](https://download.elastic.co/cloud-enterprise/versions/2.4.6.zip) | ECE 1.0.0 |
283-
| [{{es}} and {{kib}} stack pack: 2.4.5](https://download.elastic.co/cloud-enterprise/versions/2.4.5.zip) | ECE 1.0.0 |
284230

285231
::::
286232

deploy-manage/deploy/deployment-comparison.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ For more details about feature availability in Serverless, check [](elastic-clou
3030

3131
| Feature/capability | Self-managed | {{ech}} | Serverless |
3232
|-------------------|-------------|--------------------------------|-------------------------|
33-
| [Deployment health monitoring](/deploy-manage/monitor.md) | Monitoring cluster | AutoOps or monitoring cluster | Managed by Elastic |
33+
| [Deployment health monitoring](/deploy-manage/monitor.md) | AutoOps or monitoring cluster | AutoOps or monitoring cluster | Managed by Elastic |
3434
| [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)) |
3535

3636
## Data lifecycle
-385 KB
Binary file not shown.
8.21 KB
Loading
125 KB
Loading

deploy-manage/monitor.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@ To help you make your decision, refer to [](/deploy-manage/monitor/autoops-vs-st
3636
```{applies_to}
3737
deployment:
3838
ess:
39+
self:
40+
ece:
41+
eck:
3942
```
4043

4144
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.
4245

43-
AutoOps is currently only available for Elastic Cloud Hosted deployments.
46+
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).
4447

4548
### Stack monitoring
4649

0 commit comments

Comments
 (0)