Skip to content

Commit 99614ad

Browse files
authored
Merge branch 'main' into fundamentals-fix
2 parents 06157e0 + 2099ceb commit 99614ad

File tree

18 files changed

+224
-35
lines changed

18 files changed

+224
-35
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FIPS (Federal Information Processing Standards) compliance is not officially supported in ECE. While ECE may function on FIPS-enabled systems, this configuration has not been validated through our testing processes and is not recommended for production environments.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
::::{important}
2+
Make sure to use a supported combination of Linux distribution and container engine version as defined in our official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise). Unsupported combinations can lead to various issues in your ECE environment, including failures when creating system deployments, upgrading workload deployments, proxy timeouts, and more.
3+
4+
:::{include} /deploy-manage/deploy/_snippets/ece-fips-message.md
5+
:::
6+
::::

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ Verify that required traffic is allowed. Check the [Networking prerequisites](ec
2525

2626
**Example:** For AWS, allowing traffic between hosts is implemented using security groups.
2727

28-
::::{important}
29-
Make sure to use a supported combination of Linux distribution and container engine version as defined in our official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise). Unsupported combinations can lead to various issues in your ECE environment, including failures when creating system deployments, upgrading workload deployments, proxy timeouts, and more.
28+
::::{include} /deploy-manage/deploy/_snippets/ece-supported-combinations.md
3029
::::
3130

3231
## Install Podman and configure the host [ece-configure-hosts-rhel8-podman]

deploy-manage/deploy/cloud-enterprise/configure-host-suse.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ Regardless of which approach you take, the steps in this section need to be perf
2828

2929
## Install Docker on SLES [ece-install-docker-sles12]
3030

31-
::::{important}
32-
Make sure to use a supported combination of Linux distribution and container engine version as defined in our official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise). Unsupported combinations can lead to various issues in your ECE environment, including failures when creating system deployments, upgrading workload deployments, proxy timeouts, and more.
31+
::::{include} /deploy-manage/deploy/_snippets/ece-supported-combinations.md
3332
::::
3433

3534

deploy-manage/deploy/cloud-enterprise/configure-host-ubuntu.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ The following instructions show you how to prepare your hosts on Ubuntu.
2424

2525
Install a compatible Docker version on Ubuntu.
2626

27-
::::{important}
28-
Make sure to use a supported combination of Linux distribution and container engine version as defined in our official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise). Unsupported combinations can lead to various issues in your ECE environment, including failures when creating system deployments, upgrading workload deployments, proxy timeouts, and more.
27+
::::{include} /deploy-manage/deploy/_snippets/ece-supported-combinations.md
2928
::::
3029

3130

deploy-manage/deploy/cloud-enterprise/configure-operating-system.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ Before installing {{ece}}, you have to prepare your hosts with one of the follow
1717
* [Red Hat Enterprise Linux (RHEL) and Rocky Linux](configure-host-rhel.md)
1818
* [SUSE Linux Enterprise Server (SLES)](configure-host-suse.md)
1919

20-
::::{important}
21-
Make sure to use a supported combination of Linux distribution and container engine version, such as `Docker` or `Podman`, as defined in our official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise). Unsupported combinations can lead to various issues in your ECE environment, including failures when creating system deployments, upgrading workload deployments, proxy timeouts, and more.
22-
::::
20+
::::{include} /deploy-manage/deploy/_snippets/ece-supported-combinations.md
21+
::::

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ 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.3 | 8.18.8 | 8.18.8 | 8.18.8 |
1920
| 4.0.2 | 8.18.8 | 8.18.8 | 8.18.8 |
2021
| 4.0.1 | 8.18.2 | 8.18.2 | 8.18.2 |
2122
| 4.0.0 | 8.18.0 | 8.18.0 | 8.18.0 |
23+
| 3.8.3 | 8.17.10 | 8.17.10 | 8.17.10 |
2224
| 3.8.2 | 8.17.10 | 8.17.10 | 8.17.10 |
2325
| 3.8.1 | 8.17.4 | 8.17.4 | 8.17.4 |
2426
| 3.8.0 | 8.17.4 | 8.17.4 | 8.17.4 |

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ To perform an offline installation without a private Docker registry, you have t
3636

3737
```sh subs=true
3838
docker save -o ece.{{version.ece}}.tar docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
39-
docker save -o es.8.18.2.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}}
40-
docker save -o kibana.8.18.2.tar docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-8}}
41-
docker save -o apm.8.18.2.tar docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}}
42-
docker save -o enterprise-search.8.18.2.tar docker.elastic.co/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}}
43-
docker save -o es.9.0.1.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}}
44-
docker save -o kibana.9.0.1.tar docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-9}}
45-
docker save -o apm.9.0.1.tar docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}}
39+
docker save -o es.{{ece-docker-images-8}}.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}}
40+
docker save -o kibana.{{ece-docker-images-8}}.tar docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-8}}
41+
docker save -o apm.{{ece-docker-images-8}}.tar docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}}
42+
docker save -o enterprise-search.{{ece-docker-images-8}}.tar docker.elastic.co/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}}
43+
docker save -o es.{{ece-docker-images-9}}.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}}
44+
docker save -o kibana.{{ece-docker-images-9}}.tar docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-9}}
45+
docker save -o apm.{{ece-docker-images-9}}.tar docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}}
4646
```
4747

4848
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.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ Installing ECE on multiple hosts with your own registry server is simpler, becau
4242

4343
```sh subs=true
4444
docker tag docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}} REGISTRY/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
45-
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.2 REGISTRY/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}}
46-
docker tag docker.elastic.co/cloud-release/kibana-cloud:8.18.2 REGISTRY/cloud-release/kibana-cloud:{{ece-docker-images-8}}
47-
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2 REGISTRY/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}}
48-
docker tag docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2 REGISTRY/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}}
49-
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1 REGISTRY/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}}
50-
docker tag docker.elastic.co/cloud-release/kibana-cloud:9.0.1 REGISTRY/cloud-release/kibana-cloud:{{ece-docker-images-9}}
51-
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1 REGISTRY/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}}
45+
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}} REGISTRY/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}}
46+
docker tag docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-8}} REGISTRY/cloud-release/kibana-cloud:{{ece-docker-images-8}}
47+
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}} REGISTRY/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}}
48+
docker tag docker.elastic.co/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}} REGISTRY/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}}
49+
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}} REGISTRY/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}}
50+
docker tag docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-9}} REGISTRY/cloud-release/kibana-cloud:{{ece-docker-images-9}}
51+
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}} REGISTRY/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}}
5252
```
5353

5454
4. Push the Docker images to your private Docker registry, using the same tags from the previous step. Replace `REGISTRY` with your actual registry URL, for example `my.private.repo:5000`:

deploy-manage/deploy/cloud-enterprise/ece-software-prereq.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ To install ECE, make sure you prepare your environment with the following softwa
1616
* [Linux distributions with compatible Docker versions](#ece-linux-docker)
1717
* [Free RAM](#ece-free-ram)
1818
* [XFS](#ece-xfs)
19+
* [FIPS compliance](#ece-fips)
1920

2021

2122
## Supported Linux kernel [ece-linux-kernel]
@@ -81,3 +82,9 @@ You must use XFS and have quotas enabled on all allocators, otherwise disk usage
8182
::::
8283

8384

85+
## FIPS compliance [ece-fips]
86+
87+
:::{include} /deploy-manage/deploy/_snippets/ece-fips-message.md
88+
:::
89+
90+
For more information about FIPS compliance across the {{stack}}, refer to [](/deploy-manage/security/fips.md).

0 commit comments

Comments
 (0)