Skip to content

Commit 35af928

Browse files
authored
Merge branch 'main' into autoops-serverless-docs
2 parents 492db63 + 10c6017 commit 35af928

File tree

95 files changed

+2159
-449
lines changed

Some content is hidden

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

95 files changed

+2159
-449
lines changed

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/monitor/autoops/ec-autoops-regions.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,27 @@ AutoOps for {{ECH}} is currently available in the following regions for AWS:
2929

3030
| Region | Name |
3131
| --- | --- | --- | --- |
32-
| us-east-1 | N. Virginia |
33-
| us-east-2 | Ohio |
34-
| us-west-1 | N. California |
35-
| us-west-2 | Oregon |
36-
| ca-central-1 | Canada |
37-
| eu-west-1 | Ireland |
38-
| eu-west-2 | London |
39-
| eu-west-3 | Paris |
40-
| eu-north-1 | Stockholm |
41-
| eu-central-1 | Frankfurt |
42-
| eu-central-2 | Zurich |
43-
| eu-south-1 | Milan |
44-
| me-south-1 | Bahrain |
45-
| ap-east-1 | Hong Kong |
46-
| ap-northeast-1 | Tokyo |
47-
| ap-northeast-2 | Seoul |
48-
| ap-southeast-1 | Singapore |
49-
| ap-southeast-2 | Sydney |
50-
| ap-south-1 | Mumbai |
51-
| sa-east-1 | Sao Paulo |
52-
| af-south-1 | Cape Town |
32+
| us-east-1 | US East (N. Virginia) |
33+
| us-east-2 | US East (Ohio) |
34+
| us-west-1 | US West (N. California) |
35+
| us-west-2 | US West (Oregon) |
36+
| ca-central-1 | Canada (Central) |
37+
| eu-west-1 | Europe (Ireland) |
38+
| eu-west-2 | Europe (London) |
39+
| eu-west-3 | Europe (Paris) |
40+
| eu-north-1 | Europe (Stockholm) |
41+
| eu-central-1 | Europe (Frankfurt) |
42+
| eu-central-2 | Europe (Zurich) |
43+
| eu-south-1 | Europe (Milan) |
44+
| me-south-1 | Middle East (Bahrain) |
45+
| ap-east-1 | Asia Pacific (Hong Kong) |
46+
| ap-northeast-1 | Asia Pacific (Tokyo) |
47+
| ap-northeast-2 | Asia Pacific (Seoul) |
48+
| ap-southeast-1 | Asia Pacific (Singapore) |
49+
| ap-southeast-2 | Asia Pacific (Sydney) |
50+
| ap-south-1 | Asia Pacific (Mumbai) |
51+
| sa-east-1 | South America (Sao Paulo) |
52+
| af-south-1 | Africa (Cape Town) |
5353

5454
Regions for Azure and GCP are coming soon.
5555

@@ -59,10 +59,10 @@ AutoOps for serverless projects is currently available in the following regions
5959

6060
| Region | Name |
6161
| --- | --- | --- | --- |
62-
| us-east-1 | N. Virginia |
63-
| eu-west-1 | Ireland |
64-
| ap-southeast-1 | Singapore |
65-
| us-west-2 | Oregon |
62+
| us-east-1 | US East (N. Virginia) |
63+
| eu-west-1 | Europe (Ireland) |
64+
| ap-southeast-1 | Asia Pacific (Singapore) |
65+
| us-west-2 | US West (Oregon) |
6666

6767
The only exception is the **Search AI Lake** view, which is available in all CSP regions across AWS, Azure, and GCP.
6868

deploy-manage/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ toc:
812812
- file: upgrade/prepare-to-upgrade/upgrade-assistant.md
813813
- file: upgrade/deployment-or-cluster.md
814814
children:
815-
- hidden: upgrade/deployment-or-cluster/upgrade-717.md
815+
- file: upgrade/deployment-or-cluster/upgrade-717.md
816816
- file: upgrade/deployment-or-cluster/upgrade-on-ech.md
817817
- file: upgrade/deployment-or-cluster/upgrade-on-ece.md
818818
- file: upgrade/deployment-or-cluster/upgrade-on-eck.md
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
* To use {{kib}}'s **Snapshot and Restore** feature, you must have the following permissions:
2+
3+
* [Cluster privileges](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-cluster): `monitor`, `manage_slm`, `cluster:admin/snapshot`, and `cluster:admin/repository`
4+
* [Index privilege](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-indices): `monitor` privilege on all the indices
5+
6+
* To register a snapshot repository or restore a snapshot, the cluster’s global metadata must be writeable. Ensure there aren’t any [cluster blocks](elasticsearch://reference/elasticsearch/configuration-reference/miscellaneous-cluster-settings.md#cluster-read-only) that prevent write access. The restore operation ignores index blocks.

deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@ From within {{ech}}, you can restore a snapshot from a different deployment in t
2626

2727
## Prerequisites for {{ech}}
2828

29-
To use Kibana's Snapshot and Restore feature, you must have the following permissions:
30-
31-
- Cluster privileges: `monitor`, `manage_slm`, `cluster:admin/snapshot`, and `cluster:admin/repository`
32-
- Index privilege: `all` on the monitor index
33-
34-
To register a snapshot repository, the cluster’s global metadata must be writable. Ensure there aren’t any cluster blocks that prevent write access.
29+
:::{include} _snippets/restore-snapshot-common-prerequisites.md
30+
:::
3531

3632
## Considerations
3733

deploy-manage/tools/snapshot-and-restore/restore-snapshot.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ In this guide, you’ll learn how to:
2727
This guide also provides tips for [restoring to another cluster](#restore-different-cluster) and [troubleshooting common restore errors](#troubleshoot-restore).
2828

2929
## Prerequisites
30-
- To use Kibana’s Snapshot and Restore feature, you must have the following permissions:
31-
- [Cluster privileges](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-cluster): `monitor`, `manage_slm`, `cluster:admin/snapshot`, and `cluster:admin/repository`
32-
- [Index privilege](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-indices): `all` on the monitor index
30+
:::{include} _snippets/restore-snapshot-common-prerequisites.md
31+
:::
32+
3333
- You can only restore a snapshot to a running cluster with an elected [master node](/deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md#master-node-role). The snapshot’s repository must be registered and available to the cluster.
3434
- The snapshot and cluster versions must be compatible. See [Snapshot compatibility](/deploy-manage/tools/snapshot-and-restore.md#snapshot-compatibility).
35-
- To restore a snapshot, the cluster’s global metadata must be writable. Ensure there aren’t any cluster blocks that prevent writes. The restore operation ignores index blocks.
3635
- Before you restore a data stream, ensure the cluster contains a [matching index template](/manage-data/use-case-use-elasticsearch-to-manage-time-series-data.md#create-ts-index-template) with data stream enabled. To check, use [Kibana’s Index Management](/manage-data/data-store/index-basics.md#index-management-manage-index-templates) feature or the get index template API:
3736

3837
```console

deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ products:
1313

1414
# Searchable snapshots [searchable-snapshots]
1515
::::{important}
16-
Searchable snapshots is a feature that requires an Enteprise license.
16+
Searchable snapshots is a feature that requires an Enterprise license.
1717
::::
1818

1919
{{search-snaps-cap}} let you use [snapshots](../snapshot-and-restore.md) to search infrequently accessed and read-only data in a very cost-effective fashion. The [cold](../../../manage-data/lifecycle/data-tiers.md#cold-tier) and [frozen](../../../manage-data/lifecycle/data-tiers.md#frozen-tier) data tiers use {{search-snaps}} to reduce your storage and operating costs.

deploy-manage/tools/snapshot-and-restore/self-managed.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@ In this guide, you’ll learn how to:
2121

2222
## Prerequisites [snapshot-repo-prereqs]
2323

24-
* To use {{kib}}'s **Snapshot and Restore** feature, you must have the following permissions:
25-
26-
* [Cluster privileges](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-cluster): `monitor`, `manage_slm`, `cluster:admin/snapshot`, and `cluster:admin/repository`
27-
* [Index privilege](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-indices): `all` on the `monitor` index
28-
29-
* To register a snapshot repository, the cluster’s global metadata must be writeable. Ensure there aren’t any [cluster blocks](elasticsearch://reference/elasticsearch/configuration-reference/miscellaneous-cluster-settings.md#cluster-read-only) that prevent write access.
24+
:::{include} _snippets/restore-snapshot-common-prerequisites.md
25+
:::
3026

3127
## Considerations [snapshot-repo-considerations]
3228

deploy-manage/upgrade.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ Upgrading your Elastic cluster or deployment involves several stages, including
4848

4949
- [Upgrade ingest components](./upgrade/ingest-components.md): Covers supporting components such as {{beats}}, {{agent}}, {{ls}}, and APM Server.
5050

51+
:::{note}
52+
If you’re still running {{stack}} version 7.17 or earlier, refer to the [Upgrade from 7.17 guide](/deploy-manage/upgrade/deployment-or-cluster/upgrade-717.md) for detailed guidance on planning and executing the upgrade to the latest {{version.stack}} release.
53+
:::
54+
5155
Additionally, if you're using a self-managed orchestration platform such as {{ece}} or {{eck}}, refer to [Upgrade your ECE or ECK orchestrator](/deploy-manage/upgrade/orchestrator.md) to keep the orchestrator up to date.
5256

5357
## Availability during upgrades
@@ -97,3 +101,12 @@ If you're upgrading to the current {{version.stack}} release from an earlier 8.x
97101
For flexible upgrade scheduling, 8.19 {{agent}}, {{beats}}, and {{ls}} are compatible with all 9.x versions of {{es}}.
98102

99103
By default, 8.x {{es}} clients are compatible with 9.x and use [REST API compatibility](elasticsearch://reference/elasticsearch/rest-apis/compatibility.md) to maintain compatibility with the 9.x cluster.
104+
105+
### Upgrade paths from 7.17 [upgrade-paths-7.x]
106+
107+
Upgrading from {{stack}} version 7.17 to the latest {{version.stack}} release involves two major upgrades:
108+
109+
- From 7.17 to 8.19
110+
- From 8.19 to {{version.stack}}
111+
112+
For detailed guidance on planning and executing these upgrades, refer to the [Upgrade from 7.17 guide](/deploy-manage/upgrade/deployment-or-cluster/upgrade-717.md).

0 commit comments

Comments
 (0)