Skip to content

Commit c0eca4f

Browse files
committed
Merge branch 'network-sec-core' into network-sec-file-renames-xlinks
2 parents 532a051 + 55fefe1 commit c0eca4f

37 files changed

+295
-174
lines changed

deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ In order to run {{agent}} as a non-root user you must choose how you want to per
253253
1. Run {{agent}} with an `emptyDir` volume. This has the downside of not persisting data between restarts of the {{agent}} which can duplicate work done by the previous running Agent.
254254
2. Run {{agent}} with a `hostPath` volume in addition to a `DaemonSet` running as `root` that sets up permissions for the `agent` user.
255255

256-
In addition to these decisions, if you are running {{agent}} in {{fleet}} mode as a non-root user, you must configure `certificate_authorities.ssl` in each `xpack.fleet.outputs` to trust the CA of the {{es}} Cluster.
256+
In addition to these decisions, if you are running {{agent}} in {{fleet}} mode as a non-root user, you must configure `ssl.certificate_authorities` in each `xpack.fleet.outputs` to trust the CA of the {{es}} Cluster.
257257

258258
To run {{agent}} with an `emptyDir` volume.
259259

deploy-manage/deploy/cloud-on-k8s/configure-eck.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,21 @@ To configure ECK settings, follow the instructions in the next sections dependin
2929

3030
If you installed ECK through the Helm chart commands listed in [](./install-using-helm-chart.md), add your configuration parameters under the `config` key in your values file, or set them inline using the equivalent `--set config.<setting-name>=<value>` flags when updating or installing the release.
3131

32-
For example, to add the `ca-cert-validity` setting with a value of `43800h`, you can use any of the following methods:
32+
Note that the Helm chart uses its own configuration parameters rather than the actual ECK parameters that are described in [{{eck}} configuration flags](cloud-on-k8s://reference/eck-configuration-flags.md). To view all configurable values in the Helm chart for the ECK operator, run the following command:
33+
34+
```sh
35+
helm show values elastic/eck-operator
36+
```
37+
38+
For example, the parameter `caValidity` in the Helm chart corresponds to the `ca-cert-validity` ECK parameter. To add the `caValidity` setting with a value of `43800h`, you can use either of the following methods:
3339

3440
### Option 1: Use a values file and reference it in the helm upgrade command:
3541

3642
Create a values file with the following content:
3743

3844
```yaml
3945
config:
40-
ca-cert-validity: 43800h
46+
caValidity: 43800h
4147
```
4248
4349
Then, update the installed release pointing to the values file:
@@ -49,7 +55,7 @@ helm upgrade elastic-operator elastic/eck-operator -f my-values-file.yaml -n ela
4955
### Option 2: Use `--set` in the helm upgrade command
5056

5157
```sh
52-
helm upgrade elastic-operator elastic/eck-operator --set config.ca-cert-validity=43800h -n elastic-system
58+
helm upgrade elastic-operator elastic/eck-operator --set config.caValidity=43800h -n elastic-system
5359
```
5460

5561
## Using the operator YAML manifests

deploy-manage/deploy/elastic-cloud/change-hardware.md

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ products:
88
- id: cloud-hosted
99
---
1010

11-
# Change hardware [ec-change-hardware-for-a-specific-resource]
11+
# Customize instance configuration [ec-change-instance-configuration]
1212

13-
The virtual hardware on which {{stack}} deployments run is defined by instance configurations. To learn more about what an instance configuration is, refer to [Instance configurations](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations).
13+
This document explains how to modify the instance configurations used by specific components of your deployment without changing the overall hardware profile assigned to the deployment. This advanced configuration scenario is useful in situations where you need to migrate an Elasticsearch tier or stateless resource to a different hardware type.
14+
15+
## Consideration [ec-considerations-on-changing-ic]
16+
17+
{{stack}} deployments run on virtual hardware defined by instance configurations. For more details, refer to [Hardware profiles](./ec-change-hardware-profile.md#ec-hardware-profile) and [Instance configurations](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations) documents.
1418

1519
When a deployment is created, each {{es}} tier and stateless resource (e.g., Kibana) gets an instance configuration assigned to it, based on the hardware profile used. The combination of instance configurations defined within each hardware profile is designed to provide the best possible outcome for each use case. Therefore, it is not advisable to use instance configurations that are not specified on the hardware profile, except in specific situations in which we may need to migrate an {{es}} tier or stateless resource to a different hardware type. An example of such a scenario is when a cloud provider stops supporting a hardware type in a specific region.
1620

@@ -89,6 +93,30 @@ Having an instance configuration mismatch between the deployment and the hardwar
8993

9094
## Deprecated instance configurations (ICs) and deployment templates (DTs) [ec-deprecated-icdt]
9195

92-
A list of deprecated and valid ICs/DTs can be found on the [Available regions, deployment templates and instance configurations](cloud://reference/cloud-hosted/ec-regions-templates-instances.md) page, as well as through the API, using `hide_deprecated` to return valid ICs/DTs. For example, to return valid ICs/DTs the following request can be used: `https://api.elastic-cloud.com/api/v1/deployments/templates?region=us-west-2&hide_deprecated=true`. To list only the deprecated ones, this can be used: `https://api.elastic-cloud.com/api/v1/deployments/templates?region=us-west-2&metadata=legacy:true`.
96+
Hardware profile is also referenced as deployment templates in {{ecloud}}.
97+
98+
You can find a list of deprecated and valid instance configurations (ICs) and deployment templates (DTs) in two ways:
99+
100+
### Public documentation page
101+
102+
Visit the [Available regions, deployment templates and instance configurations](cloud://reference/cloud-hosted/ec-regions-templates-instances.md) page for detailed information.
103+
104+
### API access
105+
106+
Use the [Get deployment templates API](https://www.elastic.co/docs/api/doc/cloud/operation/operation-get-deployment-templates-v2) with query parameters like `hide_deprecated` to retrieve valid ICs and DTs. This API request returns a list of DTs along with the respective ICs referenced within each DT.
107+
108+
For example,
109+
* To return valid ICs/DTs the following request can be used: `https://api.elastic-cloud.com/api/v1/deployments/templates?region=us-west-2&hide_deprecated=true`.
110+
* To list only the deprecated ones, this can be used: `https://api.elastic-cloud.com/api/v1/deployments/templates?region=us-west-2&metadata=legacy:true`.
93111

94112
If a deprecated IC/DT is already in use, it can continue to be used. However, creating or migrating to a deprecated IC/DT is no longer possible and will result in a plan failing. In order to migrate to a valid IC/DT, navigate to the **Edit hardware profile** option in the Cloud UI or use the [Deployment API](https://www.elastic.co/docs/api/doc/cloud/operation/operation-migrate-deployment-template).
113+
114+
::::{note}
115+
Deployments using {{stack}} versions prior to 7.10 do not support changing the hardware profile through the {{ecloud}} console or API. To change the hardware profile, first upgrade to version 7.10 or later.
116+
::::
117+
118+
In addtion, you can refer to below information about how these terminologies are referenced.
119+
* _Deprecated_ is also referenced as _legacy_.
120+
* Using the `metadata=legacy:true` query parameter will return only legacy/deprecated DTs.
121+
* Using the `hide_deprecated=true` query parameter will return only valid DTs.
122+
* Not using any of the query parameters above will return all DTs. In this case, check the presence of `legacy: true` in the `metadata` entries within the API response, to verify if an IC/DT is deprecated or not.

deploy-manage/deploy/elastic-cloud/custom-endpoint-aliases.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ New deployments are assigned a default alias derived from the deployment name. T
3232
To add an alias to an existing deployment:
3333

3434
1. From the **Hosted deployments** menu, select a deployment.
35-
2. Under **Custom endpoint alias**, select **Edit**.
35+
2. Under **Connection alias**, select **Create an alias**.
3636
3. Define a new alias. Make sure you choose something meaningful to you.
3737

3838
::::{tip}
@@ -47,8 +47,8 @@ To add an alias to an existing deployment:
4747
To remove an alias from your deployment, or if you want to re-assign an alias to another deployment, follow these steps:
4848

4949
1. From the **Hosted deployments** menu, select a deployment.
50-
2. Under **Custom endpoint alias**, select **Edit**.
51-
3. Remove the text from the **Custom endpoint alias** text box.
50+
2. Under *Connection alias**, select **Edit**.
51+
3. Remove the text from the **Connection alias** text box.
5252
4. Select **Update alias**.
5353

5454
::::{note}

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
@@ -65,6 +65,7 @@ This table compares the core platform capabilities between {{ech}} deployments a
6565
| **Deployment health monitoring** | AutoOps or monitoring cluster | Managed by Elastic | - No monitoring cluster required <br>- Automatically handled by Elastic |
6666
| **Deployment model** | Single deployments with multiple solutions | Separate projects for specific use cases | Fundamental architectural difference - [Learn more](https://www.elastic.co/blog/elastic-serverless-architecture) |
6767
| **Deployment monitoring** | AutoOps or monitoring cluster | Managed | Monitoring is handled by Elastic |
68+
| **Email service** ||| Preconfigured email connector available - [Learn more about limits and usage](/deploy-manage/deploy/elastic-cloud/tools-apis.md#elastic-cloud-email-service) |
6869
| **Hardware configuration** | Limited control | Managed | Hardware choices are managed by Elastic |
6970
| **High availability** ||| Automatic resilience |
7071
| **Network security** | IP filtering, private connectivity (VPCs, PrivateLink) | IP filtering | Private connectivity options anticipated in a future release |

deploy-manage/deploy/elastic-cloud/ec-change-hardware-profile.md

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ products:
88
- id: cloud-hosted
99
---
1010

11-
# Change hardware profiles [ec-change-hardware-profile]
11+
# Manage hardware profiles [ec-change-hardware-profile]
12+
13+
## Hardware profile [ec-hardware-profile]
1214

1315
Deployment hardware profiles deploy the {{stack}} on virtual hardware. Each hardware profile has a different blend of storage, RAM, and vCPU.
1416

@@ -24,6 +26,11 @@ The {{ecloud}} console indicates when a new version of a hardware profile is ava
2426

2527
## Change the hardware profile using the {{ecloud}} console [ec_change_the_hardware_profile_using_the_elastic_cloud_console]
2628

29+
::::{note}
30+
Deployments using {{stack}} versions prior to 7.10 do not support changing the hardware profile through the {{ecloud}} console or API. To change the hardware profile, first upgrade to version 7.10 or later.
31+
::::
32+
33+
2734
### Upgrade to the newest version of your current hardware profile [ec_upgrade_to_the_newest_version_of_your_current_hardware_profile]
2835

2936
Note that if there’s no indication that a newer version is available, that means that your deployment is already running on the latest version of that hardware profile.
@@ -72,6 +79,11 @@ If your deployment is configured for high availability, the hardware profile cha
7279

7380
## Change the hardware profile using the API [ec_change_the_hardware_profile_using_the_api]
7481

82+
::::{note}
83+
Deployments using {{stack}} versions prior to 7.10 do not support changing the hardware profile through the {{ecloud}} console or API. To change the hardware profile, first upgrade to version 7.10 or later.
84+
::::
85+
86+
7587
Prerequisites:
7688

7789
* A valid {{ecloud}} [API key](../../api-keys/elastic-cloud-api-keys.md) (`$EC_API_KEY`)
@@ -176,21 +188,28 @@ Consider this configuration for ingestion use cases with 1-4 days of data availa
176188
177189
### CPU optimized (ARM) [ec-profiles-compute-optimized-arm]
178190
179-
This profile is similar to CPU optimized profile but is powered by AWS Graviton2 instances. You can find the exact storage, memory, and vCPU allotment on the [hardware details page](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations) for each cloud provider.
191+
This profile is similar to CPU optimized profile but powered by ARM instances. Currently, we offer ARM instances on AWS. You can find the exact storage, memory, and vCPU allotment on the [hardware details page](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations) for each cloud provider.
180192
181193
**Ideal use case**
182194
183195
Consider this configuration for ingestion use cases with 1-4 days of data available for fast access and for search use cases with indexing and querying workloads. Provides the most CPU resources per unit of RAM.
184196
185-
186-
### Vector search optimized (ARM) [ec-profiles-vector-search]
197+
### Vector search optimized [ec-profiles-vector-search]
187198
188199
This profile is suited for Vector search, Generative AI and Semantic search optimized workloads. You can find the exact storage, memory, and vCPU allotment on the [hardware details page](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations) for each cloud provider.
189200
190201
**Ideal use case**
191202
192203
Optimized for applications that leverage Vector Search and/or Generative AI. Also the optimal choice for utilizing ELSER for semantic search applications. Broadly suitable for all semantic search, text embedding, image search, and other Vector Search use cases.
193204
205+
### Vector search optimized (ARM) [ec-profiles-vector-search-arm]
206+
207+
This profile is suited for Vector search, Generative AI and Semantic search optimized workloads powered by ARM instances. Currently, we offer ARM instances on AWS. You can find the exact storage, memory, and vCPU allotment on the [hardware details page](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations) for each cloud provider.
208+
209+
**Ideal use case**
210+
211+
Optimized for applications that leverage Vector Search and/or Generative AI. Also the optimal choice for utilizing ELSER for semantic search applications. Broadly suitable for all semantic search, text embedding, image search, and other Vector Search use cases.
212+
194213
195214
### General purpose [ec-profiles-general-purpose]
196215
@@ -203,7 +222,7 @@ Suitable for ingestion use cases with 5-7 days of data available for fast access
203222
204223
### General purpose (ARM) [ec-profiles-general-purpose-arm]
205224
206-
This profile is similar to the General purpose profile but is powered by AWS Graviton2 instances. You can find the exact storage, memory, and vCPU allotment on the [hardware details page](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations) for each cloud provider.
225+
This profile is similar to General purpose profile but powered by ARM instances. Currently, we offer ARM instances on AWS. You can find the exact storage, memory, and vCPU allotment on the [hardware details page](cloud://reference/cloud-hosted/hardware.md#ec-getting-started-configurations) for each cloud provider.
207226
208227
**Ideal use case**
209228

deploy-manage/deploy/elastic-cloud/ec-vcpu-boost-instance.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ products:
1313

1414
{{ecloud}} allows smaller instance sizes to get temporarily boosted vCPU when under heavy load. vCPU boosting is governed by vCPU credits that instances can earn over time when vCPU usage is less than the assigned amount.
1515

16+
::::{important}
17+
vCPU credits temporarily assigns extra CPU resources beyond the default. These credits are not always guaranteed, and might be reset during essential maintenance.
18+
::::
1619

1720
## How does vCPU boosting work? [ec_how_does_vcpu_boosting_work]
1821

deploy-manage/deploy/elastic-cloud/serverless.md

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,38 +61,37 @@ Serverless projects run on cloud platforms, which may undergo changes in availab
6161

6262
To learn more about serverless status, see [Service status](../../cloud-organization/service-status.md).
6363

64-
## Answers to common serverless questions [general-what-is-serverless-elastic-answers-to-common-serverless-questions]
64+
## Frequently asked questions (FAQ) about {{serverless-full}} projects [general-what-is-serverless-elastic-answers-to-common-serverless-questions]
6565

66-
**Is there migration support between hosted deployments and serverless projects?**
66+
The following FAQ addresses common questions about using {{serverless-full}} projects.
6767

68-
Migration paths between hosted deployments and serverless projects are currently unsupported.
68+
### Pricing and availability
69+
**Q: Where can I learn about pricing for {{serverless-short}}?**
70+
A: See pricing information for [{{es-serverless}}](https://www.elastic.co/pricing/serverless-search), [{{observability}}](https://www.elastic.co/pricing/serverless-observability), and [{{sec-serverless}}](https://www.elastic.co/pricing/serverless-security).
6971

70-
**How can I move data to or from serverless projects?**
72+
**Q: What Cloud regions does {{serverless-full}} support?**
73+
A: {{serverless-full}} is available in select AWS, GCP, and Azure regions, with plans to expand to more regions. For more information, refer to [](/deploy-manage/deploy/elastic-cloud/regions.md).
7174

72-
We are working on data migration tools! In the interim, [use Logstash](logstash://reference/index.md) with {{es}} input and output plugins to move data to and from serverless projects.
75+
### Data management
76+
**Q: How can I move data to or from {{serverless-short}} projects?**
77+
A: We are working on data migration tools. In the interim, [use Logstash](logstash://reference/index.md) with {{es}} input and output plugins to move data to and from {{serverless-short}} projects.
7378

74-
**How does serverless ensure compatibility between software versions?**
79+
**Q: Can I request backups or restores for my serverless projects?**
80+
A: Request for project backups or restores is currently unsupported, and we are working on data migration tools to better support this.
7581

76-
Connections and configurations are unaffected by upgrades. To ensure compatibility between software versions, quality testing and API versioning are used.
82+
### Security, compliance, and access
83+
**Q: How can I create {{serverless-full}} service accounts?**
84+
A: Create API keys for service accounts in your {{serverless-short}} projects. Options to automate the creation of API keys with tools such as Terraform will be available in the future.
7785

78-
**Can I convert a serverless project into a hosted deployment, or a hosted deployment into a serverless project?**
86+
### Project lifecycle and support
87+
**Q: How does {{serverless-full}} ensure compatibility between software versions?**
88+
A: Connections and configurations are unaffected by upgrades. To ensure compatibility between software versions, quality testing and API versioning are used.
7989

80-
Projects and deployments are based on different architectures, and you are unable to convert.
90+
**Q: Can I convert a {{serverless-full}} project into an {{ech}} deployment, or a hosted deployment into a {{serverless-short}} project?**
91+
A: Projects and deployments are based on different architectures, so you are unable to convert.
8192

82-
**Can I convert a serverless project into a project of a different type?**
93+
**Q: Can I convert a {{serverless-short}} project into a project of a different type?**
94+
A: You are unable to convert projects into different project types, but you can create as many projects as you’d like. You will be charged only for your usage.
8395

84-
You are unable to convert projects into different project types, but you can create as many projects as you’d like. You will be charged only for your usage.
85-
86-
**How can I create serverless service accounts?**
87-
88-
Create API keys for service accounts in your serverless projects. Options to automate the creation of API keys with tools such as Terraform will be available in the future.
89-
90-
To raise a Support case with Elastic, raise a case for your subscription the same way you do today. In the body of the case, make sure to mention you are working in serverless to ensure we can provide the appropriate support.
91-
92-
**Where can I learn about pricing for serverless?**
93-
94-
See serverless pricing information for [Search](https://www.elastic.co/pricing/serverless-search), [Observability](https://www.elastic.co/pricing/serverless-observability), and [Security](https://www.elastic.co/pricing/serverless-security).
95-
96-
**Can I request backups or restores for my projects?**
97-
98-
It is not currently possible to request backups or restores for projects, but we are working on data migration tools to better support this.
96+
**Q: How do I raise a support case for {{serverless-full}}?**
97+
A: Raise a case for your subscription as you do today. In the body of the case, mention you are working with a {{serverless-short}} project to ensure appropriate support.

0 commit comments

Comments
 (0)