Skip to content

Commit 2cc574b

Browse files
Merge branch 'main' into issue-1932-prompts-tiles
2 parents f7b7caa + e9e6477 commit 2cc574b

File tree

375 files changed

+8823
-4495
lines changed

Some content is hidden

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

375 files changed

+8823
-4495
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
/solutions/observability/get-started/ @elastic/ski-docs
4848
/solutions/search/ @elastic/developer-docs
4949
/solutions/security/ @elastic/experience-docs
50-
/solutions/security/get-started/ @elastic/ingest-docs @elastic/experience-docs
51-
/solutions/security/cloud/ @elastic/ingest-docs
5250

5351
/troubleshoot/ @elastic/docs
5452
/troubleshoot/deployments/ @elastic/admin-docs

.github/workflows/doc-preview-comment.yml

Lines changed: 0 additions & 77 deletions
This file was deleted.

.github/workflows/docs-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
deployments: write
1717
id-token: write
1818
contents: read
19-
pull-requests: read
19+
pull-requests: write

cloud-account/multifactor-authentication.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,12 @@ The only secure and recommended approach is to use one Elastic account for each
106106

107107
For now, you will need to answer an MFA challenge on every login, but we are working on adding a **Trust this device** option, which will "silence" the MFA challenge for one month per user session.
108108

109+
**Can I use multiple email addresses for MFA?**
110+
111+
No, only one email address can be used for MFA verification. In alignment with security best practices, Elastic Cloud is designed to use only one designated email address for MFA purposes. This email is used to send your one-time verification codes during login. If you need to update your MFA email address, review [Update your email address](update-your-email-address.md) for more information.
112+
113+
114+
115+
116+
109117

deploy-manage/_snippets/ecloud-security.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{{ecloud}} has built-in security. For example, HTTPS communications between {{ecloud}} and the internet, as well as inter-node communications, are secured automatically, and cluster data is encrypted at rest.
22

3+
In both {{ech}} and {{serverless-full}}, you can also configure [IP filters](/deploy-manage/security/ip-filtering-cloud.md) to prevent unauthorized access to your deployments and projects.
4+
35
In {{ech}}, you can augment these security features in the following ways:
4-
* Configure [traffic filtering](/deploy-manage/security/traffic-filtering.md) to prevent unauthorized access to your deployments.
6+
* [Configure private connectivity and apply VPC filtering](/deploy-manage/security/private-connectivity.md) to establish a secure connection for your {{ecloud}} deployments to communicate with other cloud services, and restrict traffic to deployments based on those private connections.
57
* Encrypt your deployment with a [customer-managed encryption key](/deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md).
68
* [Secure your settings](/deploy-manage/security/secure-settings.md) using {{es}} and {{kib}} keystores.
79
* Use the list of [{{ecloud}} static IPs](/deploy-manage/security/elastic-cloud-static-ips.md) to allow or restrict communications in your infrastructure.

deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Currently, autoscaling behavior is as follows:
4343
* **Data tiers**
4444

4545
* Each {{es}} [data tier](../../manage-data/lifecycle/data-tiers.md) scales upward based on the amount of available storage. When we detect more storage is needed, autoscaling will scale up each data tier independently to ensure you can continue and ingest more data to your hot and content tier, or move data to the warm, cold, or frozen data tiers.
46-
* In addition to scaling up existing data tiers, a new data tier will be automatically added when necessary, based on your [index lifecycle management policies](https://www.elastic.co/guide/en/cloud-enterprise/current/ece-configure-index-management.html).
46+
* In addition to scaling up existing data tiers, a new data tier will be automatically added when necessary, based on your [index lifecycle management policies](/manage-data/lifecycle/index-lifecycle-management.md).
4747
* To control the maximum size of each data tier and ensure it will not scale above a certain size, you can use the maximum size per zone field.
4848
* Autoscaling based on memory or CPU, as well as autoscaling downward, is not currently supported. In case you want to adjust the size of your data tier to add more memory or CPU, or in case you deleted data and want to scale it down, you can set the current size per zone of each data tier manually.
4949

deploy-manage/autoscaling/trained-model-autoscaling.md

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Refer to the tables in the [Model deployment resource matrix](#model-deployment-
8181

8282
In {{serverless-full}}, Search projects are given access to more processing resources, while Security and Observability projects have lower limits. This difference is reflected in the UI configuration: Search projects have higher resource limits compared to Security and Observability projects to accommodate their more complex operations.
8383

84-
On {{serverless-short}}, adaptive allocations are automatically enabled for all project types. However, the "Adaptive resources" control is not displayed in {{kib}} for Observability and Security projects.
84+
On {{serverless-short}}, adaptive allocations are automatically enabled for all project types.
8585

8686
## Model deployment resource matrix [model-deployment-resource-matrix]
8787

@@ -152,16 +152,6 @@ In case of ingest-optimized deployments, we maximize the number of model allocat
152152

153153
:::
154154

155-
:::{tab-item} {{serverless-short}}
156-
157-
| Level | Allocations | Threads | VCUs |
158-
| --- | --- | --- | --- |
159-
| Low | Exactly 2 | 1 | 16 |
160-
| Medium | Exactly 32 | 1 | 256 |
161-
| High | 512 for Search<br> No static allocations for Security and Observability<br> | 1 | 4096 for Search<br> No static allocations for Security and Observability<br> |
162-
163-
:::
164-
165155
::::
166156

167157
### Search optimized
@@ -188,9 +178,9 @@ In case of search-optimized deployments, we maximize the number of threads. The
188178

189179
| Level | Allocations | Threads | VCUs |
190180
| --- | --- | --- | --- |
191-
| Low | 0 to 1 dynamically | Always 2 | 0 to 16 dynamically |
192-
| Medium | 1 to 2 (if threads=16), dynamically | Maximum (for example, 16) | 8 to 256 dynamically |
193-
| High | 1 to 32 (if threads=16), dynamically<br> 1 to 128 for Security and Observability<br> | Maximum (for example, 16) | 8 to 4096 for Search<br> 8 to 1024 for Security and Observability<br> |
181+
| Low | 0 to 1 dynamically | 2 | 0 to 16 dynamically |
182+
| Medium | 0 to 2 dynamically for Search and Observatibility<br> 1 to 2 dynamically for Security | 4 | 0 to 256 dynamically for Search and Observatibility<br> 8 to 256 dynamically for Security |
183+
| High | 0 to 32 dynamically for Search and Observatibility<br> 1 to 128 dynamically for Security<br> | 8 | 0 to 4096 dynamically for Search<br> 0 to 1024 dynamically for Observability<br>8 to 1014 dynamically for Security |
194184

195185
:::
196186

@@ -212,14 +202,4 @@ In case of search-optimized deployments, we maximize the number of threads. The
212202

213203
:::
214204

215-
:::{tab-item} {{serverless-short}}
216-
217-
| Level | Allocations | Threads | VCUs |
218-
| --- | --- | --- | --- |
219-
| Low | 1 statically | Always 2 | 16 |
220-
| Medium | 2 statically (if threads=16) | Maximum (for example, 16) | 256 |
221-
| High | 32 statically (if threads=16) for Search<br> No static allocations for Security and Observability<br> | Maximum (for example, 16) | 4096 for Search<br> No static allocations for Security and Observability<br> |
222-
223-
:::
224-
225205
::::

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ $$$faq-included$$$What is included in my paid {{ech}} deployment?
9999

100100
* Free 1GB RAM {{kib}} instance
101101
* Free 1GB RAM Machine Learning node
102-
* Free 1GB RAM APM server
102+
* Free 1GB RAM APM / Integrations Server instance
103103
* A free allowance for [data transfer and snapshot storage costs](#faq-dts)
104104

105105
Note that if you go above the free tier of Kibana/ML/APM (for example, a 2GB {{kib}} instance), you will be charged in full for the size of that instance.

deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ products:
1515
* [Offerings](#offerings)
1616
* [Add-ons](#add-ons)
1717

18+
Specific prices can be found in the [Cloud Pricing Table](https://cloud.elastic.co/cloud-pricing-table?productType=serverless).
1819

1920
## Offerings [offerings]
2021

deploy-manage/deploy/cloud-enterprise/add-custom-bundles-plugins.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Custom plugins can include the official {{es}} plugins not provided with {{ece}}
7171
"elasticsearch_version" : "<es_version>" <2>
7272
},
7373
{
74-
"url": "http://www.MYURL.com/my-custom-plugin.zip",
74+
"url": "<MY_HOST_URL>/my-custom-plugin.zip",
7575
"name": "my-custom-plugin",
7676
"elasticsearch_version": "7.17.1"
7777
}
@@ -105,7 +105,7 @@ This example adds a custom LDAP bundle for deployment level role-based access co
105105
"user_bundles": [
106106
{
107107
"name": "ldap-cert",
108-
"url": "http://www.MYURL.com/ldapcert.zip", <1>
108+
"url": "<MY_HOST_URL>/ldapcert.zip", <1>
109109
"elasticsearch_version": "*"
110110
}
111111
]
@@ -151,7 +151,7 @@ In this example, we assume the Identity Provider does not publish its SAML metad
151151
"user_bundles": [
152152
{
153153
"name": "saml-metadata",
154-
"url": "http://www.MYURL.com/saml-metadata.zip", <1>
154+
"url": "<MY_HOST_URL>/saml-metadata.zip", <1>
155155
"elasticsearch_version": "*"
156156
}
157157
]
@@ -184,7 +184,7 @@ In this example, we assume the Identity Provider does not publish its SAML metad
184184
185185
## Example: Custom JVM trust store bundle [ece-add-custom-bundle-example-cacerts]
186186
187-
If you are using SSL certificates signed by non-public certificate authorities, {{es}} is not able to communicate with the services using those certificates unless you import a custom JVM trust store containing the certificates of your signing authority into your {{ece}} installation. You’ll need the trust store to access snapshot repositories like Minio, for your {{ece}} proxy, or to reindex from remote.
187+
If you are using SSL certificates signed by non-public certificate authorities, {{es}} is not able to communicate with the services using those certificates unless you import a custom JVM trust store containing the certificates of your signing authority into your {{ece}} installation. You’ll need the trust store to access snapshot repositories like MinIO, for your {{ece}} proxy, or to reindex from remote.
188188
189189
To import a JVM trust store:
190190
@@ -254,7 +254,7 @@ To import a JVM trust store:
254254
"user_bundles": [
255255
{
256256
"name": "custom-ca-certs",
257-
"url": "http://www.MYURL.com/cacerts.zip", <1>
257+
"url": "<MY_HOST_URL>/cacerts.zip", <1>
258258
"elasticsearch_version": "*" <2>
259259
}
260260
]
@@ -309,7 +309,7 @@ To import a JVM trust store:
309309
"user_bundles": [
310310
{
311311
"name": "custom-geoip-db",
312-
"url": "http://www.MYURL.com/my-geoip-file.zip",
312+
"url": "<MY_HOST_URL>/my-geoip-file.zip",
313313
"elasticsearch_version": "*"
314314
}
315315
]
@@ -359,7 +359,7 @@ To import a JVM trust store:
359359
"user_bundles": [
360360
{
361361
"name": "custom-synonyms",
362-
"url": "http://www.MYURL.com/synonyms.zip",
362+
"url": "<MY_HOST_URL>/synonyms.zip",
363363
"elasticsearch_version": "*"
364364
}
365365
]

0 commit comments

Comments
 (0)