Skip to content

Commit 6748c33

Browse files
authored
Merge branch 'main' into szabosteve/mark-elser-eis-ga
2 parents f3f8219 + 188d445 commit 6748c33

File tree

184 files changed

+2521
-4257
lines changed

Some content is hidden

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

184 files changed

+2521
-4257
lines changed

deploy-manage/deploy/cloud-enterprise/ece-install-offline-images.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ The first table contains the stack versions shipped with the current {{version.e
1717
| Docker images included with {{ece}} {{version.ece}} |
1818
| --- |
1919
| docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}} |
20-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8 |
21-
| docker.elastic.co/cloud-release/kibana-cloud:8.18.8 |
22-
| docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8 |
23-
| docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8 |
24-
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8 |
25-
| docker.elastic.co/cloud-release/kibana-cloud:9.0.8 |
26-
| docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8 |
20+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}} |
21+
| docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-8}} |
22+
| docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}} |
23+
| docker.elastic.co/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}} |
24+
| docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}} |
25+
| docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-9}} |
26+
| docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}} |
2727

2828
$$$ece-all-stacks$$$Additional {{stack}} versions are available as Docker images that you can use with ECE. For offline installations, you need to download both the {{stack}} pack and the Docker images for the same version.
2929

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

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

2020
```sh subs=true
2121
docker pull docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
22-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8
23-
docker pull docker.elastic.co/cloud-release/kibana-cloud:8.18.8
24-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8
25-
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8
26-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8
27-
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.8
28-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8
22+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}}
23+
docker pull docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-8}}
24+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}}
25+
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}}
26+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}}
27+
docker pull docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-9}}
28+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}}
2929
```
3030

3131
::::{note}
@@ -36,27 +36,27 @@ 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:8.18.8
40-
docker save -o kibana.8.18.2.tar docker.elastic.co/cloud-release/kibana-cloud:8.18.8
41-
docker save -o apm.8.18.2.tar docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8
42-
docker save -o enterprise-search.8.18.2.tar docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8
43-
docker save -o es.9.0.1.tar docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8
44-
docker save -o kibana.9.0.1.tar docker.elastic.co/cloud-release/kibana-cloud:9.0.8
45-
docker save -o apm.9.0.1.tar docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8
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}}
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.
4949
4. On each host, load the images into Docker, replacing `FILE_PATH` with the correct path to the .tar files:
5050

5151
```sh subs=true
5252
docker load < FILE_PATH/ece.{{version.ece}}.tar
53-
docker load < FILE_PATH/es.8.18.8.tar
54-
docker load < FILE_PATH/kibana.8.18.8.tar
55-
docker load < FILE_PATH/apm.8.18.8.tar
56-
docker load < FILE_PATH/enterprise-search.8.18.8.tar
57-
docker load < FILE_PATH/es.9.0.8.tar
58-
docker load < FILE_PATH/kibana.9.0.8.tar
59-
docker load < FILE_PATH/apm.9.0.8.tar
53+
docker load < FILE_PATH/es.{{ece-docker-images-8}}.tar
54+
docker load < FILE_PATH/kibana.{{ece-docker-images-8}}.tar
55+
docker load < FILE_PATH/apm.{{ece-docker-images-8}}.tar
56+
docker load < FILE_PATH/enterprise-search.{{ece-docker-images-8}}.tar
57+
docker load < FILE_PATH/es.{{ece-docker-images-9}}.tar
58+
docker load < FILE_PATH/kibana.{{ece-docker-images-9}}.tar
59+
docker load < FILE_PATH/apm.{{ece-docker-images-9}}.tar
6060
```
6161

6262
5. Optional: Remove the .tar files after installation.

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

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

2626
```sh subs=true
2727
docker pull docker.elastic.co/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
28-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:8.18.8
29-
docker pull docker.elastic.co/cloud-release/kibana-cloud:8.18.8
30-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.8
31-
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.8
32-
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.8
33-
docker pull docker.elastic.co/cloud-release/kibana-cloud:9.0.8
34-
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.8
28+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}}
29+
docker pull docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-8}}
30+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}}
31+
docker pull docker.elastic.co/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}}
32+
docker pull docker.elastic.co/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}}
33+
docker pull docker.elastic.co/cloud-release/kibana-cloud:{{ece-docker-images-9}}
34+
docker pull docker.elastic.co/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}}
3535
```
3636

3737
::::{note}
@@ -42,26 +42,26 @@ 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:8.18.8
46-
docker tag docker.elastic.co/cloud-release/kibana-cloud:8.18.2 REGISTRY/cloud-release/kibana-cloud:8.18.8
47-
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:8.18.2 REGISTRY/cloud-release/elastic-agent-cloud:8.18.8
48-
docker tag docker.elastic.co/cloud-release/enterprise-search-cloud:8.18.2 REGISTRY/cloud-release/enterprise-search-cloud:8.18.8
49-
docker tag docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.0.1 REGISTRY/cloud-release/elasticsearch-cloud-ess:9.0.8
50-
docker tag docker.elastic.co/cloud-release/kibana-cloud:9.0.1 REGISTRY/cloud-release/kibana-cloud:9.0.8
51-
docker tag docker.elastic.co/cloud-release/elastic-agent-cloud:9.0.1 REGISTRY/cloud-release/elastic-agent-cloud:9.0.8
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}}
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`:
5555

5656
```sh subs=true
5757
docker push REGISTRY/cloud-enterprise/elastic-cloud-enterprise:{{version.ece}}
58-
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:8.18.8
59-
docker push REGISTRY/cloud-release/kibana-cloud:8.18.8
60-
docker push REGISTRY/cloud-release/elastic-agent-cloud:8.18.8
61-
docker push REGISTRY/cloud-release/enterprise-search-cloud:8.18.8
62-
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:9.0.8
63-
docker push REGISTRY/cloud-release/kibana-cloud:9.0.8
64-
docker push REGISTRY/cloud-release/elastic-agent-cloud:9.0.8
58+
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-8}}
59+
docker push REGISTRY/cloud-release/kibana-cloud:{{ece-docker-images-8}}
60+
docker push REGISTRY/cloud-release/elastic-agent-cloud:{{ece-docker-images-8}}
61+
docker push REGISTRY/cloud-release/enterprise-search-cloud:{{ece-docker-images-8}}
62+
docker push REGISTRY/cloud-release/elasticsearch-cloud-ess:{{ece-docker-images-9}}
63+
docker push REGISTRY/cloud-release/kibana-cloud:{{ece-docker-images-9}}
64+
docker push REGISTRY/cloud-release/elastic-agent-cloud:{{ece-docker-images-9}}
6565
```
6666

6767
5. On an internet-connected host, download the installation script:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ To learn more about serverless status, see [Service status](../../cloud-organiza
6565

6666
The following FAQ addresses common questions about using {{serverless-full}} projects.
6767

68+
For information about upcoming features, refer to our [roadmap](https://www.elastic.co/cloud/serverless/roadmap).
69+
6870
### Pricing and availability
6971
**Q: Where can I learn about pricing for {{serverless-short}}?**
7072
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).
@@ -73,6 +75,7 @@ A: See pricing information for [{{es-serverless}}](https://www.elastic.co/pricin
7375
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).
7476

7577
### Data management
78+
7679
**Q: How can I move data to or from {{serverless-short}} projects?**
7780
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.
7881

@@ -83,6 +86,9 @@ A: Request for project backups or restores is currently unsupported, and we are
8386
**Q: How can I create {{serverless-full}} service accounts?**
8487
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.
8588

89+
**Q: What compliance and privacy standards does {{serverless-full}} adhere to?**
90+
A: Alongside the entire Elastic platform, {{serverless-full}} is independently audited and certified to meet industry-leading compliance and privacy standards. Refer to the [Elastic Trust Center](https://www.elastic.co/trust) for more information. Further details about specific standards are available on our [roadmap](https://www.elastic.co/cloud/serverless/roadmap).
91+
8692
### Project lifecycle and support
8793
**Q: How does {{serverless-full}} ensure compatibility between software versions?**
8894
A: Connections and configurations are unaffected by upgrades. To ensure compatibility between software versions, quality testing and API versioning are used.

deploy-manage/kibana-reporting-configuration.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ Before upgrading {{kib}} in a production environment, we encourage you to test y
3636

3737
To secure {{report-features}}, you must grant users access to reporting functionality and protect the reporting endpoints with TLS/SSL encryption. Additionally, you can install graphical packages on the operating system to enable screenshot capabilities in the {{kib}} server.
3838

39+
:::{note}
40+
:applies_to: {stack: ga, serverless: unavailable}
41+
API keys are used to authenticate requests to generate reports. If you have a cross-cluster search environment and want to generate reports from remote clusters, you must have the appropriate cluster and index privileges on the remote cluster and local cluster. For example, if requests are authenticated with an API key, the API key requires certain privileges on the local cluster that contains the leader index, instead of the remote. For more information and examples, refer to [Configure roles and users for remote clusters](../deploy-manage/remote-clusters/remote-clusters-cert.md#remote-clusters-privileges-cert).
42+
:::
43+
3944
Configuring reporting in your environment involves two main areas:
4045

4146
### Granting users access to {{report-features}}

deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ With this authentication method, you need to create an API key to grant access t
157157

158158
```
159159
5. Select **Create API key**.
160-
6. When prompted to copy the key, select **Beats** from the dropdown.
161-
7. Copy the key and save it for later. You will need it when you [install the agent](#install-agent).
160+
6. Copy the key and save it for later. You will need it when you [install the agent](#install-agent).
162161

163162
::::
164163

deploy-manage/remote-clusters/_snippets/rcs-elasticsearch-api-snippet-self.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ This snippet is in use in the following locations:
55
-->
66
To configure a self-managed cluster as a remote cluster, use the [cluster update settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings). Configure the following fields:
77

8+
* `Remote cluster alias`: When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI as **Remote cluster name**.
89
* `mode`: `proxy`
910
* `proxy_address`: Enter the endpoint of the remote self-managed cluster, including the hostname, FQDN, or IP address, and the port. Both IPv4 and IPv6 addresses are supported.
1011

@@ -16,17 +17,17 @@ To configure a self-managed cluster as a remote cluster, use the [cluster update
1617

1718
* `server_name`: Specify a value if the certificate presented by the remote cluster is signed for a different name than the proxy_address.
1819

19-
This is an example of the API call to `_cluster/settings`:
20+
This is an example of the API call to add or update a remote cluster:
2021

2122
```json
2223
PUT /_cluster/settings
2324
{
2425
"persistent": {
2526
"cluster": {
2627
"remote": {
27-
"alias-for-my-remote-cluster": {
28+
"alias-for-my-remote-cluster": { // Align the alias with the remote cluster name used when adding the API key.
2829
"mode":"proxy",
29-
"proxy_address": "a542184a7a7d45b88b83f95392f450ab.192.168.44.10.ip.es.io:9300",
30+
"proxy_address": "a542184a7a7d45b88b83f95392f450ab.192.168.44.10.ip.es.io:9400",
3031
"server_name": "a542184a7a7d45b88b83f95392f450ab.192.168.44.10.ip.es.io"
3132
}
3233
}
@@ -35,8 +36,4 @@ PUT /_cluster/settings
3536
}
3637
```
3738

38-
::::{note}
39-
When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI.
40-
::::
41-
42-
For a full list of available client connection settings in proxy mode, refer to [remote cluster settings reference](elasticsearch://reference/elasticsearch/configuration-reference/remote-clusters.md#remote-cluster-proxy-settings).
39+
For a full list of available client connection settings in proxy mode, refer to the [remote cluster settings reference](elasticsearch://reference/elasticsearch/configuration-reference/remote-clusters.md#remote-cluster-proxy-settings).
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!--
2+
This snippet is in use in the following locations:
3+
- ec-remote-cluster-same-ess.md
4+
- ec-remote-cluster-other-ess.md
5+
- ec-remote-cluster-ece.md
6+
- ece-remote-cluster-same-ece.md
7+
- ece-remote-cluster-other-ece.md
8+
- ece-remote-cluster-ess.md
9+
10+
It requires remote_type substitution to be defined
11+
-->
12+
To configure a deployment as a remote cluster, use the [cluster update settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings). Configure the following fields:
13+
14+
* `Remote cluster alias`: When using API key authentication, the cluster alias must match the one you configured when adding the API key in the Cloud UI as **Remote cluster name**.
15+
* `mode`: `proxy`
16+
* `proxy_address`: This value can be found on the **Security** page of the {{remote_type}} you want to use as a remote. Copy the **Proxy address** from the **Remote cluster parameters** section.
17+
18+
Using the API, this value can be obtained from the {{es}} resource info, concatenating the field `metadata.endpoint` and port `9400` using a semicolon.
19+
20+
::::{note}
21+
If you’re using API keys as security model, change the port to `9443`.
22+
::::
23+
24+
* `server_name`: This value can be found on the **Security** page of the {{remote_type}} you want to use as a remote. Copy the **Server name** from the **Remote cluster parameters** section.
25+
26+
Using the API, this can be obtained from the {{es}} resource info field `metadata.endpoint`.
27+
28+
This example shows the API call to add or update a remote cluster. The alias `alias-for-my-remote-cluster` must match the remote cluster name used when adding the API key to the deployment:
29+
30+
```json
31+
PUT /_cluster/settings
32+
{
33+
"persistent": {
34+
"cluster": {
35+
"remote": {
36+
"alias-for-my-remote-cluster": { // Remote cluster alias
37+
"mode":"proxy",
38+
"proxy_address": "a542184a7a7d45b88b83f95392f450ab.192.168.44.10.ip.es.io:9400",
39+
"server_name": "a542184a7a7d45b88b83f95392f450ab.192.168.44.10.ip.es.io"
40+
}
41+
}
42+
}
43+
}
44+
}
45+
```
46+
47+
For a full list of available client connection settings in proxy mode, refer to the [remote cluster settings reference](elasticsearch://reference/elasticsearch/configuration-reference/remote-clusters.md#remote-cluster-proxy-settings).

0 commit comments

Comments
 (0)