Skip to content

Commit da42eeb

Browse files
authored
Merge branch 'main' into ece-4.0.1-bump
2 parents 9490228 + 31031da commit da42eeb

File tree

21 files changed

+608
-169
lines changed

21 files changed

+608
-169
lines changed

deploy-manage/deploy/cloud-enterprise/ece-manage-capacity.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,26 @@ ECE does not support hot-adding of resources to a running node. When increasing
3131
::::
3232

3333

34-
To adjust the allocator capacity, prior to ECE 3.5.0; it is necessary to reinstall ECE on the host with a new value assigned to the `--capacity` parameter. From ECE 3.5.0 onwards, just use the ECE API :
34+
To adjust the allocator capacity prior to ECE 3.5.0, you must reinstall ECE on the host with a new value assigned to the `--capacity` parameter. Starting with ECE 3.5.0, you can update the allocator capacity using the [allocator settings ECE API](https://www.elastic.co/docs/api/doc/cloud-enterprise/operation/operation-set-allocator-settings). After making this change, you must restart the allocator service for it to take effect.
3535

3636
```sh
3737
curl -X PUT \
3838
http(s)://<ece_admin_url:port>/api/v1/platform/infrastructure/allocators/<allocator_id>/settings \
39-
-H “Authorization: ApiKey $ECE_API_KEY” \
39+
-H “Authorization: ApiKey $ECE_API_KEY\ <1>
4040
-H 'Content-Type: application/json' \
4141
-d '{"capacity":<Capacity_Value_in_MB>}'
4242
```
43-
44-
For more information on how to use API keys for authentication, check the section [Access the API from the Command Line](cloud://reference/cloud-enterprise/ece-api-command-line.md).
43+
1. For information on how to use API keys for authentication, refer to [Access the API from the command line](cloud://reference/cloud-enterprise/ece-api-command-line.md).
4544

4645
::::{important}
47-
Prior to ECE 3.5.0, regardless of the use of this API, the [CPU quota](#ece-alloc-cpu) used the memory specified at installation time.
46+
When running ECE on Podman, CPU quotas for existing instances cannot be disabled or updated. As a result, changing an allocator’s capacity won’t affect the CPU quotas of already running containers.
4847
::::
4948

49+
After applying the change, log in to the allocator host you updated and restart the allocator service:
5050

51+
```sh
52+
docker restart frc-allocators-allocator
53+
```
5154

5255
### Examples [ece_examples]
5356

@@ -67,6 +70,9 @@ ECE uses CPU quotas to assign shares of the allocator host to the instances that
6770

6871
`CPU quota = DeploymentRAM / HostCapacity`
6972

73+
::::{important}
74+
In ECE versions prior to 3.5.0, the CPU quota is always calculated using the memory specified at installation time, even if you later update the host capacity using the API.
75+
::::
7076

7177
### Examples [ece_examples_2]
7278

deploy-manage/deploy/cloud-enterprise/resource-overrides.md

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ products:
1010

1111
# Resource overrides [ece-resource-overrides]
1212

13-
{{ecloud}} allocators assign resources to {{es}} instances based on RAM, where RAM is proportional to CPU and disk resources. As needed, you can temporarily override the allocated resources to stabilize the deployment. You should reset overrides as soon as possible, or make the override permanent by [changing your configuration](working-with-deployments.md).
13+
{{ecloud}} allocators assign resources to {{es}} instances based on RAM, where RAM is proportional to CPU and disk resources. As needed, you can temporarily override the allocated resources to stabilize the deployment. To do this, use the contextual menu available on each instance in the deployment UI.
14+
15+
Overrides are intended to be temporary and may be lost after making configuration changes to the deployment. You should reset overrides as soon as possible, or make them permanent by [changing your configuration](./configure-deployment.md).
1416

1517
The RAM to CPU proportions can’t be overridden per instance.
1618

@@ -31,3 +33,35 @@ Overriding the instance size restarts the {{es}} node.
3133
::::
3234

3335
When an instance within a deployment has resource overrides, it displays a warning banner reading **Elastic added temporary capacity to stabilize the deployment**. [Configuration changes](working-with-deployments.md) can still be safely submitted.
36+
37+
## Disabling CPU quotas at deployment level [cpu-hard-limit]
38+
39+
In addition to overriding resources for individual instances, you can also completely disable CPU limits for your deployment from the **Operations** page of each deployment.
40+
41+
::::{note}
42+
When running ECE on Podman, CPU quotas for existing instances cannot be removed or updated. As a result, disabling the CPU hard limit has no effect on Podman-based allocators.
43+
::::
44+
45+
::::{important}
46+
Disabling the CPU hard limit for an entire deployment is an advanced action and should be approached with caution. This setting removes CPU quotas from the containers, which means some instances could consume excessive CPU resources and degrade the performance of other instances running on the same allocators.
47+
48+
We strongly recommend making this change only under the guidance of Elastic Support, and only as a temporary measure or for troubleshooting purposes.
49+
::::
50+
51+
To disable CPU limits of your deployment instances, choose one of the following methods:
52+
53+
* Open the **Operations** page of the deployment UI, and select **Turn off** in the **CPU hard limit** section.
54+
55+
* Use the [advanced editor](./advanced-cluster-configuration.md), and in the **{{es}} cluster data** section, look for the following setting:
56+
57+
```yaml
58+
"resources": {
59+
"cpu": {
60+
"hard_limit": false
61+
}
62+
}
63+
```
64+
65+
Set `hard_limit` to `false` to disable CPU limits, or to `true` to enforce strict CPU limits (default behavior).
66+
67+
This change doesn’t require a restart of the deployment.

deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ The information below reflects our strategic goals, plans and objectives and inc
3434
| **User management** | Elastic Cloud-managed and deployment-local users | Elastic Cloud-managed users only. Serverless users are managed at the organization level with SAML authentication support. |
3535
| **Backups** | User-managed with Snapshot & Restore | Automatically backed up by Elastic |
3636
| **Solutions** | Full {{stack}} per deployment | Single solution per project |
37+
| **Cross-origin resource sharing (CORS)** | Supported | Not available. Browser-based applications must route requests through a backend proxy server. |
3738

3839
In Serverless, Elastic automatically manages:
3940
* Cluster scaling and optimization

deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-elastic-agent.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ To collect {{es}} monitoring data, add an {{es}} integration to an {{agent}} and
3636

3737
5. Configure the integration name and optionally add a description. Make sure you configure all required settings:
3838

39-
1. Under **Collect {{es}} logs**, modify the log paths to match your {{es}} environment.
40-
2. Under **Collect {{es}} metrics**, make sure the hosts setting points to your {{es}} host URLs. By default, the integration collects {{es}} monitoring metrics from `localhost:9200`. If that host and port number are not correct, update the `hosts` setting. If you configured {{es}} to use encrypted communications, you must access it via HTTPS. For example, use a `hosts` setting like `https://localhost:9200`.
39+
1. Under **Logs**, modify the log paths to match your {{es}} environment.
40+
2. Under **Metrics (Stack Monitoring)**, make sure the hosts setting points to your {{es}} host URLs. By default, the integration collects {{es}} monitoring metrics from `localhost:9200`. If that host and port number are not correct, update the `hosts` setting. If you configured {{es}} to use encrypted communications, you must access it via HTTPS. For example, use a `hosts` setting like `https://localhost:9200`.
4141
3. Expand **Advanced options**. If the Elastic {{security-features}} are enabled, enter the username and password of a user that has the `remote_monitoring_collector` role.
4242
4. Specify the scope:
4343

deploy-manage/monitor/stack-monitoring/kibana-monitoring-elastic-agent.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ To learn about monitoring in general, refer to [](/deploy-manage/monitor/stack-m
1919

2020
## Prerequisites [_prerequisites]
2121

22-
* [Set up {{es}} monitoring](/deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md) and optionally [create a monitoring cluster](/deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md).
22+
* [Set up {{es}} monitoring](/deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md) and optionally [create a monitoring cluster](/deploy-manage/monitor/stack-monitoring/es-self-monitoring-prod.md).
2323
* Create a user on the production cluster that has the `remote_monitoring_collector` [built-in role](../../users-roles/cluster-or-deployment-auth/built-in-roles.md).
2424

2525

@@ -43,8 +43,8 @@ To collect {{kib}} monitoring data, add a {{kib}} integration to an {{agent}} an
4343

4444
5. Configure the integration name and optionally add a description. Make sure you configure all required settings:
4545

46-
* Under **Collect {{kib}} logs**, modify the log paths to match your {{kib}} environment.
47-
* Under **Collect {{kib}} metrics**, make sure the hosts setting points to your {{kib}} host URLs. By default, the integration collects {{kib}} monitoring metrics from `localhost:5601`. If that host and port number are not correct, update the `hosts` setting. If you configured {{kib}} to use encrypted communications, you must access it via HTTPS. For example, use a `hosts` setting like `https://localhost:5601`.
46+
* Under **Logs**, modify the log paths to match your {{kib}} environment.
47+
* Under **Metrics (Stack Monitoring)**, make sure the hosts setting points to your {{kib}} host URLs. By default, the integration collects {{kib}} monitoring metrics from `localhost:5601`. If that host and port number are not correct, update the `hosts` setting. If you configured {{kib}} to use encrypted communications, you must access it via HTTPS. For example, use a `hosts` setting like `https://localhost:5601`.
4848
* If the Elastic {{security-features}} are enabled, expand **Advanced options** under the Hosts setting and enter the username and password of a user that has the `remote_monitoring_collector` role.
4949

5050
6. Choose where to add the integration policy. Click **New hosts** to add it to new agent policy or **Existing hosts** to add it to an existing agent policy.

deploy-manage/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ toc:
7979
- file: deploy/cloud-enterprise/ece-load-balancers.md
8080
- file: deploy/cloud-enterprise/ece-jvm.md
8181
- file: deploy/cloud-enterprise/ece-wildcard-dns.md
82-
- file: deploy/cloud-enterprise/ece-manage-capacity.md
8382
- file: deploy/cloud-enterprise/install.md
8483
children:
8584
- file: deploy/cloud-enterprise/identify-deployment-scenario.md
@@ -128,6 +127,7 @@ toc:
128127
- file: deploy/cloud-enterprise/change-ece-api-url.md
129128
- file: deploy/cloud-enterprise/change-endpoint-urls.md
130129
- file: deploy/cloud-enterprise/enable-custom-endpoint-aliases.md
130+
- file: deploy/cloud-enterprise/ece-manage-capacity.md
131131
- file: deploy/cloud-enterprise/configure-allocator-affinity.md
132132
- file: deploy/cloud-enterprise/change-allocator-disconnect-timeout.md
133133
- file: deploy/cloud-enterprise/manage-elastic-stack-versions.md

deploy-manage/users-roles/cluster-or-deployment-auth/openid-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ This realm has a few mandatory settings, and a number of optional settings. The
169169
1. Set the `Client Secret` that was assigned to the RP during registration in the OP. To set the client secret, add the `xpack.security.authc.realms.oidc.<oidc1>.rp.client_secret` setting [to the {{es}} keystore](/deploy-manage/security/secure-settings.md).
170170

171171
:::{warning}
172-
In {{ech}} and {{ece}}, after you configure Client Secret, any attempt to restart the deployment will fail until you complete the rest of the configuration steps. If you want to roll back the Active Directory realm configurations, you need to remove the `xpack.security.authc.realms.oidc.oidc1.rp.client_secret` that was just added.
172+
In {{ech}} and {{ece}}, after you configure Client Secret, any attempt to restart the deployment will fail until you complete the rest of the configuration steps. If you want to roll back the OpenID Connect realm configurations, you need to remove the `xpack.security.authc.realms.oidc.oidc1.rp.client_secret` that was just added.
173173
:::
174174

175175
::::{note}

0 commit comments

Comments
 (0)