Skip to content

Commit 2487410

Browse files
vishaangelovavishaangelova
authored
Merge branch 'main' into 2167-move-agent-providers
2 parents f3c495e + 7e9a41f commit 2487410

File tree

55 files changed

+528
-238
lines changed

Some content is hidden

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

55 files changed

+528
-238
lines changed

‎contribute-docs/_snippets/applies_to-key.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
`applies_to` accepts the following keys in this structure.
22

33
* `serverless`: Applies to [Elastic Cloud Serverless](https://www.elastic.co/docs/deploy-manage/deploy/elastic-cloud/serverless).
4-
* `security`: Applies to Serverless [security projects](https://www.elastic.co/docs/solutions/security/get-started/create-security-project).
4+
* `security`: Applies to Serverless [security projects](https://www.elastic.co/docs/solutions/security/get-started#create-sec-serverless-project).
55
* `elasticsearch`: Applies to Serverless [search projects](https://www.elastic.co/docs/solutions/search/serverless-elasticsearch-get-started).
66
* `observability`: Applies to Serverless [observability projects](https://www.elastic.co/docs/solutions/observability/get-started).
77
* `stack`: Applies to the [Elastic Stack](https://www.elastic.co/docs/get-started/the-stack) including any Elastic Stack components.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Your monthly bill is based on the capabilities you use. When you use {{obs-serve
2222

2323
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.
2424

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.
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, or you can create a [Serverless estimate](https://cloud.elastic.co/pricing/serverless?s=observability).
2626

2727
## Synthetics [synthetics-billing]
2828

‎deploy-manage/cloud-organization/billing/security-billing-dimensions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Your monthly bill is based on the capabilities you use. When you use Security An
2222

2323
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 {{agent}}, {{ls}}, OpenTelemetry, or collectors — with no impact on the cost.
2424

25+
[Create a serverless estimate](https://cloud.elastic.co/pricing/serverless?s=security) or refer to the [{{ecloud}} pricing table](https://cloud.elastic.co/cloud-pricing-table?productType=serverless&project=security) for more details.
2526

2627
## Endpoint Protection [security-billing-endpoint-protection]
2728

‎deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,26 @@ Verify that required traffic is allowed. Check the [Networking prerequisites](ec
9999

100100
* For Podman 5
101101

102-
* Install the latest available version of Podman `5.2.2` using dnf.
102+
* Install the latest available version `5.*` using dnf.
103103

104104
:::{note}
105-
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this bug, use a later build of `5.2.2`, such as `5.2.2-16` or newer. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information.
105+
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this bug, use a later version. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information.
106106
:::
107107

108108
```sh
109-
sudo dnf install podman-5.2.2 podman-remote-5.2.2
109+
sudo dnf install podman-5.* podman-remote-5.*
110110
```
111-
* To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2`.
111+
* To prevent automatic Podman major version updates, configure the Podman version to be locked at version `5.*` while still allowing minor and patch updates.
112112

113113
```sh
114114
## Install versionlock
115115
sudo dnf install 'dnf-command(versionlock)'
116116
117117
## Lock major version
118-
sudo dnf versionlock add --raw 'podman-5.2.2'
119-
sudo dnf versionlock add --raw 'podman-remote-5.2.2'
118+
sudo dnf versionlock add --raw 'podman-5.*'
119+
sudo dnf versionlock add --raw 'podman-remote-5.*'
120120
121-
## Verify that podman-5.2.2 and podman-remote-5.2.2 appear in the output
121+
## Verify that podman-5.* and podman-remote-5.* appear in the output
122122
sudo dnf versionlock list
123123
```
124124

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

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +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.2.0](https://download.elastic.co/cloud-enterprise/versions/9.2.0.zip) | ECE 4.0.0 |
42-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.2.0 | ECE 4.0.0 |
43-
| docker.elastic.co/cloud-release/kibana-cloud:9.2.0 | ECE 4.0.0 |
44-
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.2.0 | ECE 4.0.0 |
41+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.2.1](https://download.elastic.co/cloud-enterprise/versions/9.2.1.zip) | ECE 4.0.0 |
42+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.2.1 | ECE 4.0.0 |
43+
| docker.elastic.co/cloud-release/kibana-cloud:9.2.1 | ECE 4.0.0 |
44+
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.2.1 | ECE 4.0.0 |
45+
| | |
46+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.7](https://download.elastic.co/cloud-enterprise/versions/8.19.7.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.7 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
48+
| docker.elastic.co/cloud-release/kibana-cloud:8.19.7 | ECE 3.0.0 |
49+
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.19.7 | ECE 3.0.0 |
50+
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.19.7 | ECE 3.0.0 |
4551
| | |
4652
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.6](https://download.elastic.co/cloud-enterprise/versions/8.19.6.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
4753
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.19.6 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
@@ -67,11 +73,21 @@ Enterprise Search is not available in versions 9.0+.
6773
::::{dropdown} Expand to view the full list
6874
| Required downloads | Minimum required ECE version |
6975
| --- | --- |
76+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.2.1](https://download.elastic.co/cloud-enterprise/versions/9.2.1.zip) | ECE 4.0.0 |
77+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.2.1 | ECE 4.0.0 |
78+
| docker.elastic.co/cloud-release/kibana-cloud:9.2.1 | ECE 4.0.0 |
79+
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.2.1 | ECE 4.0.0 |
80+
| | |
7081
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.2.0](https://download.elastic.co/cloud-enterprise/versions/9.2.0.zip) | ECE 4.0.0 |
7182
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.2.0 | ECE 4.0.0 |
7283
| docker.elastic.co/cloud-release/kibana-cloud:9.2.0 | ECE 4.0.0 |
7384
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.2.0 | ECE 4.0.0 |
7485
| | |
86+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.1.7](https://download.elastic.co/cloud-enterprise/versions/9.1.7.zip) | ECE 4.0.0 |
87+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.7 | ECE 4.0.0 |
88+
| docker.elastic.co/cloud-release/kibana-cloud:9.1.7 | ECE 4.0.0 |
89+
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.1.7 | ECE 4.0.0 |
90+
| | |
7591
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 9.1.6](https://download.elastic.co/cloud-enterprise/versions/9.1.6.zip) | ECE 4.0.0 |
7692
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.1.6 | ECE 4.0.0 |
7793
| docker.elastic.co/cloud-release/kibana-cloud:9.1.6 | ECE 4.0.0 |
@@ -147,6 +163,12 @@ Enterprise Search is not available in versions 9.0+.
147163
| docker.elastic.co/cloud-release/kibana-cloud:9.0.0 | ECE 4.0.0 |
148164
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.0 | ECE 4.0.0 |
149165
| | |
166+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.7](https://download.elastic.co/cloud-enterprise/versions/8.19.7.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
167+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.19.7 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
168+
| docker.elastic.co/cloud-release/kibana-cloud:8.19.7 | ECE 3.0.0 |
169+
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.19.7 | ECE 3.0.0 |
170+
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.19.7 | ECE 3.0.0 |
171+
| | |
150172
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.6](https://download.elastic.co/cloud-enterprise/versions/8.19.6.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
151173
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.19.6 | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
152174
| docker.elastic.co/cloud-release/kibana-cloud:8.19.6 | ECE 3.0.0 |

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ $$$ece-elastic-stack-stackpacks-recent$$$
3737
| Stack pack download link | Minimum required ECE version |
3838
| --- | --- |
3939
| [{{es}}, {{kib}}, and APM stack pack: 9.2.0](https://download.elastic.co/cloud-enterprise/versions/9.2.0.zip) | ECE 4.0.0 |
40+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.7](https://download.elastic.co/cloud-enterprise/versions/8.19.7.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
41+
| [{{es}}, {{kib}}, and APM stack pack: 9.2.1](https://download.elastic.co/cloud-enterprise/versions/9.2.1.zip) | ECE 4.0.0 |
4042
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.6](https://download.elastic.co/cloud-enterprise/versions/8.19.6.zip) | ECE 3.0.0<br>(+ Docker 20.10.10+ required for 8.16+) |
4143
| [{{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 |
4244

@@ -48,7 +50,9 @@ Following is the full list of available packs containing {{stack}} versions. Not
4850
::::{dropdown} Expand to view the full list
4951
| Stack pack download link | Minimum required ECE version |
5052
| --- | --- |
53+
| [{{es}}, {{kib}}, and APM stack pack: 9.2.1](https://download.elastic.co/cloud-enterprise/versions/9.2.1.zip) | ECE 4.0.0 |
5154
| [{{es}}, {{kib}}, and APM stack pack: 9.2.0](https://download.elastic.co/cloud-enterprise/versions/9.2.0.zip) | ECE 4.0.0 |
55+
| [{{es}}, {{kib}}, and APM stack pack: 9.1.7](https://download.elastic.co/cloud-enterprise/versions/9.1.7.zip) | ECE 4.0.0 |
5256
| [{{es}}, {{kib}}, and APM stack pack: 9.1.6](https://download.elastic.co/cloud-enterprise/versions/9.1.6.zip) | ECE 4.0.0 |
5357
| [{{es}}, {{kib}}, and APM stack pack: 9.1.5](https://download.elastic.co/cloud-enterprise/versions/9.1.5.zip) | ECE 4.0.0 |
5458
| [{{es}}, {{kib}}, and APM stack pack: 9.1.4](https://download.elastic.co/cloud-enterprise/versions/9.1.4.zip) | ECE 4.0.0 |
@@ -64,6 +68,7 @@ Following is the full list of available packs containing {{stack}} versions. Not
6468
| [{{es}}, {{kib}}, and APM stack pack: 9.0.2](https://download.elastic.co/cloud-enterprise/versions/9.0.2.zip) | ECE 4.0.0 |
6569
| [{{es}}, {{kib}}, and APM stack pack: 9.0.1](https://download.elastic.co/cloud-enterprise/versions/9.0.1.zip) | ECE 4.0.0 |
6670
| [{{es}}, {{kib}}, and APM stack pack: 9.0.0](https://download.elastic.co/cloud-enterprise/versions/9.0.0.zip) | ECE 4.0.0 |
71+
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.7](https://download.elastic.co/cloud-enterprise/versions/8.19.7.zip) | ECE 3.0.0<br>(+ docker 20.10.10+ required for 8.16+) |
6772
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.6](https://download.elastic.co/cloud-enterprise/versions/8.19.6.zip) | ECE 3.0.0<br>(+ docker 20.10.10+ required for 8.16+) |
6873
| [{{es}}, {{kib}}, APM, and Enterprise Search stack pack: 8.19.5](https://download.elastic.co/cloud-enterprise/versions/8.19.5.zip) | ECE 3.0.0<br>(+ docker 20.10.10+ required for 8.16+) |
6974
| [{{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+) |

‎deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,27 +129,27 @@ Using Docker or Podman as container runtime is a configuration local to the host
129129

130130
* For Podman 5
131131

132-
* Install the latest available version of Podman `5.2.2` using dnf.
132+
* Install the latest available version `5.*` using dnf.
133133

134134
:::{note}
135-
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this bug, use a later build of `5.2.2`, such as `5.2.2-16` or newer. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information.
135+
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this bug, use a later version. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information.
136136
:::
137137

138138
```sh
139-
sudo dnf install podman-5.2.2 podman-remote-5.2.2
139+
sudo dnf install podman-5.* podman-remote-5.*
140140
```
141141

142-
* To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2`.
142+
* To prevent automatic Podman major version updates, configure the Podman version to be locked at version `5.*` while still allowing minor and patch updates.
143143

144144
```sh
145145
## Install versionlock
146146
sudo dnf install 'dnf-command(versionlock)'
147147
148148
## Lock major version
149-
sudo dnf versionlock add --raw 'podman-5.2.2'
150-
sudo dnf versionlock add --raw 'podman-remote-5.2.2'
149+
sudo dnf versionlock add --raw 'podman-5.*'
150+
sudo dnf versionlock add --raw 'podman-remote-5.*'
151151
152-
## Verify that podman-5.2.2 and podman-remote-5.2.2 appear in the output
152+
## Verify that podman-5.* and podman-remote-5.* appear in the output
153153
sudo dnf versionlock list
154154
```
155155

‎deploy-manage/deploy/cloud-enterprise/migrate-to-podman-5.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ This guide describes the supported ways to upgrade or migrate your {{ece}} (ECE)
1313

1414
* **Grow-and-shrink upgrade**: [Add new hosts](./install-ece-on-additional-hosts.md) running the desired Podman version to your ECE installation, then [remove the old ones](/deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md). This method is safer and preferred, as it avoids potential risks associated with upgrading the container engine or the operating system in place.
1515

16-
ECE only supports Podman 5 in version `5.2.2`, regardless of your upgrade method. Later versions such as `5.2.3` and above are not supported. Refer always to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for details on supported versions.
16+
ECE supports Podman 5, regardless of your upgrade method. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for details on supported versions.
1717

1818
:::{important}
19-
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this issue, use a later build such as `5.2.2-16` or newer.
19+
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this issue, use a later Podman version.
2020
:::
2121

2222
The following table summarizes the supported upgrade paths to Podman 5 in ECE.
2323

24-
| **From ↓** ... **To →** | Podman 5.2.2-latest | Podman 5.2.3 |
25-
|-----------------------------------------|-----------------|--------------|
26-
| **<vanilla Linux installation> (grow)** | ✓ | X |
27-
| **Docker (grow-and-shrink)** | ✓ | X |
28-
| **Podman 4.9.4 (grow-and-shrink)** | ✓ | X |
29-
| **Podman 4.9.4 (in-place)** | ✓ | X |
30-
| **Podman 5.2.2 (grow-and-shrink)** | ✓ | X |
31-
| **Podman 5.2.2 (in-place)** | ✓ | X |
24+
| **From ↓** ... **To →** | Podman 5 |
25+
|-----------------------------------------|-----------------|
26+
| **<vanilla Linux installation> (grow)** | ✓ |
27+
| **Docker (grow-and-shrink)** | ✓ |
28+
| **Podman 4.9.4 (grow-and-shrink)** | ✓ |
29+
| **Podman 4.9.4 (in-place)** | ✓ |
30+
| **Podman 5.2.2 (grow-and-shrink)** | ✓ |
31+
| **Podman 5.2.2 (in-place)** | ✓ |
3232

3333
As shown in the table above, [migrations from Docker](./migrate-ece-to-podman-hosts.md) are only supported using the grow-and-shrink method.

0 commit comments

Comments
 (0)