Skip to content

Commit 9d1da5d

Browse files
authored
Merge branch 'main' into 326-internal
2 parents 55bf5e2 + a71af9f commit 9d1da5d

39 files changed

+1548
-230
lines changed

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

@@ -68,9 +68,9 @@ AutoOps for serverless projects is currently available in the following regions
6868

6969
| Region | Name |
7070
| --- | --- | --- | --- |
71-
| us-east-1 | N. Virginia |
72-
| eu-west-1 | Ireland |
73-
| ap-southeast-1 | Singapore |
74-
| us-west-2 | Oregon |
71+
| us-east-1 | US East (N. Virginia) |
72+
| eu-west-1 | Europe (Ireland) |
73+
| ap-southeast-1 | Asia Pacific (Singapore) |
74+
| us-west-2 | US West (Oregon) |
7575

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

deploy-manage/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ toc:
807807
- file: upgrade/prepare-to-upgrade/upgrade-assistant.md
808808
- file: upgrade/deployment-or-cluster.md
809809
children:
810-
- hidden: upgrade/deployment-or-cluster/upgrade-717.md
810+
- file: upgrade/deployment-or-cluster/upgrade-717.md
811811
- file: upgrade/deployment-or-cluster/upgrade-on-ech.md
812812
- file: upgrade/deployment-or-cluster/upgrade-on-ece.md
813813
- file: upgrade/deployment-or-cluster/upgrade-on-eck.md

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).

deploy-manage/upgrade/deployment-or-cluster.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ This section contains the upgrade instructions for {{es}} clusters and {{kib}} i
2929

3030
Before proceeding with the upgrade, review the [Plan your upgrade](/deploy-manage/upgrade/plan-upgrade.md) guidance to understand compatibility and timing considerations, and follow the steps in [Prepare to upgrade](/deploy-manage/upgrade/prepare-to-upgrade.md) to get your environment ready for the upgrade.
3131

32+
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.
33+
3234
## Out-of-order releases [out-of-order-releases]
3335

3436
Elastic maintains several minor versions of {{es}} at the same time. This means releases do not always happen in order of their version numbers. You can only upgrade to {{version.stack}} if the version you are currently running meets both of these conditions:
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
After completing the upgrade, verify that your system is fully operational. Check that data ingestion and search are working as expected, clients and integrations can connect, and {{kib}} is accessible.
2+
3+
Confirm that the cluster is healthy and reports the expected version. You can use the following APIs to validate the cluster status after the upgrade:
4+
5+
* Check cluster health
6+
```console
7+
GET _cluster/health?pretty
8+
```
9+
Ensure the status is green, or yellow if that is expected for your configuration (for example, in single-node clusters).
10+
11+
* Check nodes and version
12+
```console
13+
GET _cat/nodes?v&h=name,node.role,master,ip,version
14+
```
15+
Verify that all nodes report the upgraded version in the version column.

0 commit comments

Comments
 (0)