Skip to content

Commit 63cebf2

Browse files
authored
Merge branch 'main' into 1003-exposeConfig
2 parents 9e2edb8 + 19fac0a commit 63cebf2

File tree

25 files changed

+251
-99
lines changed

25 files changed

+251
-99
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Using [AutoOps for self-managed clusters](/deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md) through Cloud Connect is included with your [self-managed Enterprise license](https://www.elastic.co/subscriptions).

deploy-manage/cloud-connect.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ navigation_title: Cloud Connect
1111

1212
Cloud Connect enables you to use {{ecloud}} services in your self-managed cluster without having to install and maintain their infrastructure yourself. In this way, you can get faster access to new features while significantly reducing your operational overhead.
1313

14-
Cloud Connect is included with your [self-managed Enterprise license](https://www.elastic.co/subscriptions) and works with self-managed free trials for the duration of the trial period.
15-
1614
AutoOps is the first service available for use with Cloud Connect. More services are coming soon.
1715

1816
### AutoOps
@@ -21,24 +19,19 @@ AutoOps is the first service available for use with Cloud Connect. More services
2119

2220
Learn how to set up and use [](/deploy-manage/monitor/autoops/cc-autoops-as-cloud-connected.md).
2321

24-
## FAQs
22+
## FAQ
2523

2624
Find answers to your questions about Cloud Connect.
2725

2826
:::{dropdown} Does using Cloud Connect require additional payment?
2927

3028
$$$cc-payment$$$
3129

32-
No. Cloud Connect is included with your [self-managed Enterprise license](https://www.elastic.co/subscriptions) and works with self-managed free trials for the duration of the trial period.
30+
Each cloud connected service has its own licensing and payment requirements.
3331

34-
However, you may incur additional costs for specific functions within a cloud connected service. For example, when sending metrics data from your cluster in a CSP region to AutoOps in {{ecloud}}, shipping costs will be determined by your agreement with that CSP.
32+
:::{include} /deploy-manage/_snippets/autoops-cc-payment-faq.md
3533
:::
3634

37-
:::{dropdown} Does using Cloud Connect consume ECU?
38-
39-
$$$cc-ecu$$$
40-
41-
No. The currently available functionality does not consume ECU, but this may change when more features are introduced.
4235
:::
4336

4437
:::{dropdown} Will my data be safe when using Cloud Connect?

deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ products:
1010

1111
# Elastic for Observability billing dimensions [observability-billing]
1212

13-
{{obs-serverless}} projects provide you with all the capabilities of Elastic Observability to monitor critical applications. Projects are provided using a Software as a Service (SaaS) model, and pricing is entirely consumption-based.
13+
{{obs-serverless}} projects provide you with all the capabilities of Elastic Observability to monitor critical applications. Projects are provided using a Software as a Service (SaaS) model, and pricing is entirely consumption-based. {{obs-serverless}} projects are available in the following tiers of carefully selected features to enable common observability operations:
14+
15+
* **Observability Logs Essentials**: Includes everything you need to store and analyze logs at scale.
16+
* **Observability Complete**: Adds full-stack observability capabilities to monitor cloud-native and hybrid environments.
1417

1518
Your monthly bill is based on the capabilities you use. When you use {{obs-serverless}}, your bill is calculated based on data volume, which has these components:
1619

@@ -19,9 +22,12 @@ Your monthly bill is based on the capabilities you use. When you use {{obs-serve
1922

2023
Data volumes for ingest and retention are based on the fully enriched normalized data size at the end of the ingest pipeline, before {{es}} compression is performed, and will be higher than the volumes traditionally reported by {{es}} index size. In addition, these volumes might be larger than those reported by cloud provider proxy logs for data going into {{es}}. This allows you to have flexibility in choosing your preferred ingest architecture for enrichment, whether it’s through Elastic Agent, Logstash, OpenTelemetry, or collectors — with no impact on the cost.
2124

25+
Refer to [Serverless billing dimensions](serverless-project-billing-dimensions.md) and the [{{ecloud}} pricing table](https://cloud.elastic.co/cloud-pricing-table?productType=serverless&project=observability) for more details about {{obs-serverless}} billing dimensions and rates.
2226

2327
## Synthetics [synthetics-billing]
2428

25-
[Synthetic monitoring](/solutions/observability/synthetics/index.md) is an optional add-on to Observability Serverless projects that allows you to periodically check the status of your services and applications. In addition to the core ingest and retention dimensions, there is a charge to execute synthetic monitors on our testing infrastructure. Browser (journey) based tests are charged per-test-run, and ping (lightweight) tests have an all-you-can-use model per location used.
29+
[Synthetic monitoring](/solutions/observability/synthetics/index.md) is an optional add-on to Observability Serverless projects that allows you to periodically check the status of your services and applications as a part of your "Complete" tier subscription. In addition to the core ingest and retention dimensions, there is a charge to execute synthetic monitors on our testing infrastructure. Browser (journey) based tests are charged per-test-run, and ping (lightweight) tests have an all-you-can-use model per location used.
2630

27-
Refer to [Serverless billing dimensions](serverless-project-billing-dimensions.md) and the [{{ecloud}} pricing table](https://cloud.elastic.co/cloud-pricing-table?productType=serverless&project=observability) for more details about {{obs-serverless}} billing dimensions and rates.
31+
## Elastic Managed LLM
32+
33+
The default [Elastic Managed LLM](kibana://reference/connectors-kibana/elastic-managed-llm.md) enables you to leverage AI-powered search as a service without deploying a model in your serverless project. It's configured by default to use with the Security AI Assistant, Attack Discovery, and other applicable AI features as a part of your "Complete" tier subscription. Using the default LLM will use tokens and incur related token-based add-on billing for your serverless project.

deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Note that since version 2.7.0, system deployments are automatically upgraded whe
1616

1717
| {{ece}} version | Admin cluster | Logging & Metrics cluster | Security cluster |
1818
| --- | --- | --- | --- |
19-
| 4.0.1 | 8.18.0 | 8.18.0 | 8.18.0 |
19+
| 4.0.1 | 8.18.2 | 8.18.2 | 8.18.2 |
2020
| 4.0.0 | 8.18.0 | 8.18.0 | 8.18.0 |
2121
| 3.8.1 | 8.17.4 | 8.17.4 | 8.17.4 |
2222
| 3.8.0 | 8.17.4 | 8.17.4 | 8.17.4 |

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

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ products:
1212

1313
Versions of the {{stack}}, containing {{es}}, {{kib}}, and other products, are available as downloadable Docker images.
1414

15-
The first table contains the stack versions that shipped with the 4.0 version of {{ece}}. You can also check the [most recent stack packs and Docker images](#ece-recent-download-list), which might have released after the 4.0 version of ECE, as well as the [full list of available stack packs and Docker images](#ece-full-download-list).
15+
The first table contains the stack versions shipped with the current {{version.ece}} version of {{ece}}. You can also check the [most recent stack packs and Docker images](#ece-recent-download-list), which might have released after the current version of ECE, as well as the [full list of available stack packs and Docker images](#ece-full-download-list).
1616

1717
| Docker images included with {{ece}} {{version.ece}} |
1818
| --- |
1919
| docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}} |
20-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.0 |
21-
| docker.elastic.co/cloud-release/kibana-cloud:8.18.0 |
22-
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.0 |
23-
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.0 |
24-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.0 |
25-
| docker.elastic.co/cloud-release/kibana-cloud:9.0.0 |
26-
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.0 |
20+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2 |
21+
| docker.elastic.co/cloud-release/kibana-cloud:8.18.2 |
22+
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2 |
23+
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2 |
24+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1 |
25+
| docker.elastic.co/cloud-release/kibana-cloud:9.0.1 |
26+
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1 |
2727

2828
$$$ece-all-stacks$$$Additional {{stack}} versions are available as Docker images that you can use with ECE. For offline installations, you need to download both the {{stack}} pack and the Docker images for the same version.
2929

@@ -38,16 +38,16 @@ Enterprise Search is not available in versions 9.0+.
3838

3939
| Required downloads | Minimum required ECE version |
4040
| --- | --- |
41-
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.0.4](https://download.elastic.co/cloud-enterprise/versions/9.0.4.zip) | ECE 4.0.0 |
42-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.4 | ECE 4.0.0 |
43-
| docker.elastic.co/cloud-release/kibana-cloud:9.0.4 | ECE 4.0.0 |
44-
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.4 | ECE 4.0.0 |
41+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.1.1](https://download.elastic.co/cloud-enterprise/versions/9.1.1.zip) | ECE 4.0.0 |
42+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.1 | ECE 4.0.0 |
43+
| docker.elastic.co/cloud-release/kibana-cloud:9.1.1 | ECE 4.0.0 |
44+
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.1.1 | ECE 4.0.0 |
4545
| | |
46-
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.18.4](https://download.elastic.co/cloud-enterprise/versions/8.18.4.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
47-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.4 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
48-
| docker.elastic.co/cloud-release/kibana-cloud:8.18.4 | ECE 3.0.0 |
49-
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.4 | ECE 3.0.0 |
50-
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.4 | ECE 3.0.0 |
46+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.1](https://download.elastic.co/cloud-enterprise/versions/8.19.1.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
47+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.19.1 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
48+
| docker.elastic.co/cloud-release/kibana-cloud:8.19.1 | ECE 3.0.0 |
49+
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.19.1 | ECE 3.0.0 |
50+
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.19.1 | ECE 3.0.0 |
5151
| | |
5252
| [{{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 |
5353
| docker.elastic.co/cloud-assets/elasticsearch:7.17.29-0 | ECE 2.2.2 |
@@ -67,6 +67,11 @@ Enterprise Search is not available in versions 9.0+.
6767
::::{dropdown} Expand to view the full list
6868
| Required downloads | Minimum required ECE version |
6969
| --- | --- |
70+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.1.1](https://download.elastic.co/cloud-enterprise/versions/9.1.1.zip) | ECE 4.0.0 |
71+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.1 | ECE 4.0.0 |
72+
| docker.elastic.co/cloud-release/kibana-cloud:9.1.1 | ECE 4.0.0 |
73+
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.1.1 | ECE 4.0.0 |
74+
| | |
7075
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.0.4](https://download.elastic.co/cloud-enterprise/versions/9.0.4.zip) | ECE 4.0.0 |
7176
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.4 | ECE 4.0.0 |
7277
| docker.elastic.co/cloud-release/kibana-cloud:9.0.4 | ECE 4.0.0 |
@@ -92,6 +97,12 @@ Enterprise Search is not available in versions 9.0+.
9297
| docker.elastic.co/cloud-release/kibana-cloud:9.0.0 | ECE 4.0.0 |
9398
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.0 | ECE 4.0.0 |
9499
| | |
100+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.1](https://download.elastic.co/cloud-enterprise/versions/8.19.1.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
101+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.19.1 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
102+
| docker.elastic.co/cloud-release/kibana-cloud:8.19.1 | ECE 3.0.0 |
103+
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.19.1 | ECE 3.0.0 |
104+
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.19.1 | ECE 3.0.0 |
105+
| | |
95106
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.18.4](https://download.elastic.co/cloud-enterprise/versions/8.18.4.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
96107
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.4 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
97108
| docker.elastic.co/cloud-release/kibana-cloud:8.18.4 | ECE 3.0.0 |

deploy-manage/deploy/cloud-enterprise/ece-install-offline-no-registry.md

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,52 @@ products:
1111

1212
# Air-gapped install without a private Docker registry [ece-install-offline-no-registry]
1313

14-
To perform an offline installation without a private Docker registry, you have to download the available Docker Images on each host.
14+
To perform an offline installation without a private Docker registry, you have to download the required Docker images on each host.
1515

16-
1. On an internet-connected host that has Docker installed, download the [Available Docker Images](ece-install-offline-images.md). Note that for ECE version 4.0, if you want to use {{stack}} version 9.0 in your deployments, you need to download and make available both the version 8.x and version 9.x Docker images (the version 8.x images are required for system deployments).
16+
1. On an internet-connected host with Docker installed, download the Docker images required by the {{ece}} version you want to install. Refer to [available docker images](ece-install-offline-images.md) for more information.
17+
18+
For example, for {{ece}} {{version.ece}} and the {{stack}} versions it includes, you need:
1719

1820
```sh subs=true
1921
docker pull docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
2022
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2
2123
docker pull docker.elastic.co/cloud-release/kibana-cloud:8.18.2
22-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.0
23-
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.0
24-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.0
25-
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.0
26-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.0
24+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2
25+
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2
26+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1
27+
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.1
28+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1
2729
```
2830

29-
For example, for {{ece}} {{version.ece}} and the {{stack}} versions it shipped with, you need:
30-
31-
* {{ece}} {{version.ece}}
32-
* {{es}} 9.0.0, {{kib}} 9.0.0, and APM 9.0.0
31+
::::{note}
32+
Version 8.x images are required for system deployments.
33+
::::
3334

3435
2. Create .tar files of the images:
3536

3637
```sh subs=true
3738
docker save -o ece.{{version.ece}}.tar docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
38-
docker save -o es.8.18.0.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2
39-
docker save -o kibana.8.18.0.tar docker.elastic.co/cloud-release/kibana-cloud:8.18.2
40-
docker save -o apm.8.18.0.tar docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.0
41-
docker save -o enterprise-search.8.18.0.tar docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.0
42-
docker save -o es.9.0.0.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.0
43-
docker save -o kibana.9.0.0.tar docker.elastic.co/cloud-release/kibana-cloud:9.0.0
44-
docker save -o apm.9.0.0.tar docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.0
39+
docker save -o es.8.18.2.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2
40+
docker save -o kibana.8.18.2.tar docker.elastic.co/cloud-release/kibana-cloud:8.18.2
41+
docker save -o apm.8.18.2.tar docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2
42+
docker save -o enterprise-search.8.18.2.tar docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2
43+
docker save -o es.9.0.1.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1
44+
docker save -o kibana.9.0.1.tar docker.elastic.co/cloud-release/kibana-cloud:9.0.1
45+
docker save -o apm.9.0.1.tar docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1
4546
```
4647

4748
3. Copy the .tar files to a location on your network where they are available to each host where you plan to install {{ece}}. Alternatively, you can copy the .tar files to each host directly.
4849
4. On each host, load the images into Docker, replacing `FILE_PATH` with the correct path to the .tar files:
4950

5051
```sh subs=true
5152
docker load < FILE_PATH/ece.{{version.ece}}.tar
52-
docker load < FILE_PATH/es.8.18.0.tar
53-
docker load < FILE_PATH/kibana.8.18.0.tar
54-
docker load < FILE_PATH/apm.8.18.0.tar
55-
docker load < FILE_PATH/enterprise-search.8.18.0.tar
56-
docker load < FILE_PATH/es.9.0.0.tar
57-
docker load < FILE_PATH/kibana.9.0.0.tar
58-
docker load < FILE_PATH/apm.9.0.0.tar
53+
docker load < FILE_PATH/es.8.18.2.tar
54+
docker load < FILE_PATH/kibana.8.18.2.tar
55+
docker load < FILE_PATH/apm.8.18.2.tar
56+
docker load < FILE_PATH/enterprise-search.8.18.2.tar
57+
docker load < FILE_PATH/es.9.0.1.tar
58+
docker load < FILE_PATH/kibana.9.0.1.tar
59+
docker load < FILE_PATH/apm.9.0.1.tar
5960
```
6061

6162
5. Optional: Remove the .tar files after installation.

0 commit comments

Comments
 (0)