Skip to content

Commit a1059ff

Browse files
committed
Merge remote-tracking branch 'origin/main' into leemthompo/move-syntax-guide
2 parents 810358d + 56111e9 commit a1059ff

File tree

60 files changed

+752
-272
lines changed

Some content is hidden

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

60 files changed

+752
-272
lines changed

.vscode/extensions.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"Elastic.elastic-docs-v3-utilities"
4+
]
5+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Using [AutoOps for ECE, ECK, and 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) and self-managed free trials.
1+
Using AutoOps for self-managed clusters (ECE, ECK, or standalone) on-premise or in private cloud environments through Cloud Connect is included with [self-managed Enterprise licenses](https://www.elastic.co/subscriptions) and self-managed free trials. This does not consume ECU.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ $$$faq-refund$$$Can I get a refund?
101101
$$$billing-cc-additional-payment$$$Does Cloud Connect require additional payment?
102102
: Each [cloud connected service](/deploy-manage/cloud-connect.md) has its own licensing and payment requirements. For more information, refer to the [Elastic self-managed subscriptions](https://www.elastic.co/subscriptions) page.
103103

104+
:::{include} /deploy-manage/_snippets/autoops-cc-payment-faq.md
105+
:::
106+
104107
$$$faq-included$$$What is included in my paid {{ech}} deployment?
105108
: All subscription tiers for {{ech}} include the following free allowance:
106109

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 |

0 commit comments

Comments
 (0)