Skip to content

Commit bc8a1e6

Browse files
authored
Merge branch 'main' into kunisen-docpr-jira-iam1778
2 parents 6eccbe6 + 8ee590d commit bc8a1e6

File tree

53 files changed

+761
-331
lines changed

Some content is hidden

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

53 files changed

+761
-331
lines changed

.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

deploy-manage/deploy/cloud-enterprise/configure-host-rhel.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,30 +100,26 @@ Make sure to use a supported combination of Linux distribution and container eng
100100

101101
* For Podman 5
102102

103-
* Install version `5.2.2-13.*` using dnf.
103+
* Install the latest available version of Podman `5.2.2` using dnf.
104104

105105
:::{note}
106-
As mentioned in [Migrating to Podman 5](migrate-to-podman-5.md) it is recommended to install Podman `5.2.2-13` since this is the latest supported version.
107-
108-
If you decide to install a previous Podman 5 version, make sure to replace `5.2.2-13` with the desired version in the commands below.
109-
110-
The version lock is still required for previous versions, to prevent automatic in-place updates that may be affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473).
106+
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this bug, use a later build of `5.2.2`, such as `5.2.2-16` or newer. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information.
111107
:::
112108

113109
```sh
114-
sudo dnf install podman-5.2.2-13.* podman-remote-5.2.2-13.*
110+
sudo dnf install podman-5.2.2 podman-remote-5.2.2
115111
```
116-
* To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2-13.*`.
112+
* To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2`.
117113

118114
```sh
119115
## Install versionlock
120116
sudo dnf install 'dnf-command(versionlock)'
121117
122118
## Lock major version
123-
sudo dnf versionlock add --raw 'podman-5.2.2-13.*'
124-
sudo dnf versionlock add --raw 'podman-remote-5.2.2-13.*'
119+
sudo dnf versionlock add --raw 'podman-5.2.2'
120+
sudo dnf versionlock add --raw 'podman-remote-5.2.2'
125121
126-
## Verify that podman-5.2.2-13.* and podman-remote-5.2.2-13.* appear in the output
122+
## Verify that podman-5.2.2 and podman-remote-5.2.2 appear in the output
127123
sudo dnf versionlock list
128124
```
129125

deploy-manage/deploy/cloud-enterprise/migrate-ece-to-podman-hosts.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,30 +129,27 @@ Using Docker or Podman as container runtime is a configuration local to the host
129129

130130
* For Podman 5
131131

132-
* Install version `5.2.2-13.*` using dnf.
132+
* Install the latest available version of Podman `5.2.2` using dnf.
133133

134134
:::{note}
135-
As mentioned in [Migrating to Podman 5](migrate-to-podman-5.md) it is recommended to install Podman `5.2.2-13` since this is the latest supported version.
136-
137-
If you decide to install a previous Podman 5 version, make sure to replace `5.2.2-13` with the desired version in the commands below.
138-
139-
The version lock is still required for previous versions, to prevent automatic in-place updates that may be affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473).
135+
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this bug, use a later build of `5.2.2`, such as `5.2.2-16` or newer. Refer to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for more information.
140136
:::
141137

142138
```sh
143-
sudo dnf install podman-5.2.2-13.* podman-remote-5.2.2-13.*
139+
sudo dnf install podman-5.2.2 podman-remote-5.2.2
144140
```
145-
* To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2-13.*`.
141+
142+
* To prevent automatic Podman updates to unsupported versions, configure the Podman version to be locked at version `5.2.2`.
146143

147144
```sh
148145
## Install versionlock
149146
sudo dnf install 'dnf-command(versionlock)'
150147
151148
## Lock major version
152-
sudo dnf versionlock add --raw 'podman-5.2.2-13.*'
153-
sudo dnf versionlock add --raw 'podman-remote-5.2.2-13.*'
149+
sudo dnf versionlock add --raw 'podman-5.2.2'
150+
sudo dnf versionlock add --raw 'podman-remote-5.2.2'
154151
155-
## Verify that podman-5.2.2-13.* and podman-remote-5.2.2-13.* appear in the output
152+
## Verify that podman-5.2.2 and podman-remote-5.2.2 appear in the output
156153
sudo dnf versionlock list
157154
```
158155

deploy-manage/deploy/cloud-enterprise/migrate-to-podman-5.md

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,27 @@ applies_to:
55
---
66
# Migrating to Podman 5
77

8-
Following are the supported upgrade paths for Podman 5 in {{ece}}.
8+
This guide describes the supported ways to upgrade or migrate your {{ece}} (ECE) hosts to Podman 5. There are two primary methods:
99

10-
| **From ↓** ... **To →** | Podman 5.2.2-9 | Podman 5.2.2-11 | Podman 5.2.2-13 | Podman 5.2.3 |
11-
|-----------------------------------------|----------------|-----------------|-----------------|--------------|
12-
| **<vanilla Linux installation> (grow)** | ✓ ^*^ | ✓ ^*^ || X |
13-
| **Docker (grow-and-shrink)** | ✓ ^*^ | ✓ ^*^ || X |
14-
| **Podman 4.9.4 (grow-and-shrink)** | ✓ ^*^ | ✓ ^*^ || X |
15-
| **Podman 4.9.4 (in-place)** || X | X | X |
16-
| **Podman 5.2.2-9 (in-place)** | - | X | X | X |
10+
* **In-place upgrade**: Update Podman directly on existing ECE hosts without replacing them. In-place upgrades to Podman 5 are only supported from existing Podman-based hosts.
1711

12+
* **Grow-and-shrink upgrade**: [Add new hosts](./install-ece-on-additional-hosts.md) running the desired Podman version to your ECE installation, then [remove the old ones](/deploy-manage/uninstall/uninstall-elastic-cloud-enterprise.md). This method is safer and preferred, as it avoids potential risks associated with upgrading the container engine or the operating system in place.
1813

14+
ECE only supports Podman 5 in version `5.2.2`, regardless of your upgrade method. Later versions such as `5.2.3` and above are not supported. Refer always to the official [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) for details on supported versions.
1915

16+
:::{important}
17+
Podman versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473). To avoid this issue, use a later build such as `5.2.2-16` or newer.
18+
:::
2019

21-
^*^ *Supported but not recommended given that a newer version (Podman `5.2.2-13`) is available.*
20+
The following table summarizes the supported upgrade paths to Podman 5 in ECE.
2221

23-
Podman `5.2.2-13` is only supported when conducting a **fresh {{ece}} installation** or performing a **grow-and-shrink update** from Docker or Podman 4.
22+
| **From ↓** ... **To →** | Podman 5.2.2-latest | Podman 5.2.3 |
23+
|-----------------------------------------|-----------------|--------------|
24+
| **<vanilla Linux installation> (grow)** || X |
25+
| **Docker (grow-and-shrink)** || X |
26+
| **Podman 4.9.4 (grow-and-shrink)** || X |
27+
| **Podman 4.9.4 (in-place)** || X |
28+
| **Podman 5.2.2 (grow-and-shrink)** || X |
29+
| **Podman 5.2.2 (in-place)** || X |
2430

25-
For **in-place updates**, it is recommended to use Podman `5.2.2-9`, since upgrades to versions `5.2.2-11` and `5.2.2-13` are affected by a known [memory leak issue](https://github.com/containers/podman/issues/25473).
26-
When performing an in-place update, make sure to configure the Podman version to be locked at version `5.2.2-9.*`, by following the instructions below.
27-
28-
```sh
29-
## Install versionlock
30-
sudo dnf install 'dnf-command(versionlock)'
31-
32-
## Lock major version
33-
sudo dnf versionlock add --raw 'podman-5.2.2-9.*'
34-
sudo dnf versionlock add --raw 'podman-remote-5.2.2-9.*'
35-
36-
## Verify that podman-5.2.2-9.* and podman-remote-5.2.2-9.* appear in the output
37-
sudo dnf versionlock list
38-
```
39-
40-
Podman versions `5.2.3` and higher are not supported.
31+
As shown in the table above, [migrations from Docker](./migrate-ece-to-podman-hosts.md) are only supported using the grow-and-shrink method.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ Choose the type of project that matches your needs and we’ll help you get star
2020
| --- | --- |
2121
| | |
2222
| ![elasticsearch](../../images/64x64_Color_elasticsearch-logo-color-64px.png "elasticsearch =50%") | **Elasticsearch**<br> Build custom search applications with {{es}}.<br><br>[**View guide →**](/solutions/search/serverless-elasticsearch-get-started.md)<br> |
23-
| ![observability](../../images/64x64_Color_observability-logo-color-64px.png "observability =50%") | **Observability**<br> Monitor applications and systems with Elastic Observability.<br><br>[**View guide →**](/solutions/observability/get-started/create-an-observability-project.md)<br> |
23+
| ![observability](../../images/64x64_Color_observability-logo-color-64px.png "observability =50%") | **Observability**<br> Monitor applications and systems with Elastic Observability.<br><br>[**View guide →**](/solutions/observability/get-started.md)<br> |
2424
| ![security](../../images/64x64_Color_security-logo-color-64px.png "security =50%") | **Security**<br> Detect, investigate, and respond to threats with Elastic Security.<br><br>[**View guide →**](/solutions/security/get-started/create-security-project.md)<br> |
2525
| | |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ There are differences between {{es-serverless}} and {{ech}}, for a list of diffe
2828
Elastic provides three serverless solutions available on {{ecloud}}. Follow these guides to get started with your serverless project:
2929

3030
* **[{{es-serverless}}](../../../solutions/search/serverless-elasticsearch-get-started.md)**: Build powerful applications and search experiences using a rich ecosystem of vector search capabilities, APIs, and libraries.
31-
* **[{{obs-serverless}}](../../../solutions/observability/get-started/create-an-observability-project.md)**: Monitor your own platforms and services using powerful machine learning and analytics tools with your logs, metrics, traces, and APM data.
31+
* **[{{obs-serverless}}](../../../solutions/observability/get-started.md)**: Monitor your own platforms and services using powerful machine learning and analytics tools with your logs, metrics, traces, and APM data.
3232
* **[{{sec-serverless}}](../../../solutions/security/get-started/create-security-project.md)**: Detect, investigate, and respond to threats with SIEM, endpoint protection, and AI-powered analytics capabilities.
3333

3434
Afterwards, you can:

explore-analyze/query-filter/languages/esql-cross-clusters.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,38 @@ FROM my-index-000001,cluster*:my-index-*,cluster_three:-my-index-000001
469469
```
470470

471471

472-
## Optional remote clusters [ccq-skip-unavailable-clusters]
472+
## Skipping problematic remote clusters [ccq-skip-unavailable-clusters]
473473

474+
{{ccs-cap}} for {{esql}} behavior when there are problems connecting to or running query on remote clusters differs between versions.
475+
476+
::::{tab-set}
477+
478+
:::{tab-item} 9.1
479+
Remote clusters are configured with the `skip_unavailable: true` setting by default. With this setting, clusters are marked as `skipped` or `partial` rather than causing queries to fail in the following scenarios:
480+
481+
* The remote cluster is disconnected from the querying cluster, either before or during the query execution.
482+
* The remote cluster does not have the requested index, or it is not accessible due to security settings.
483+
* An error happened while processing the query on the remote cluster.
484+
485+
The `partial` status means the remote query either has errors or was interrupted by an explicit user action, but some data may be returned.
486+
487+
Queries will still fail when `skip_unavailable` is set `true`, if none of the specified indices exist. For example, the
488+
following queries will fail:
489+
490+
```esql
491+
FROM cluster_one:missing-index | LIMIT 10
492+
FROM cluster_one:missing-index* | LIMIT 10
493+
FROM cluster_one:missing-index*,cluster_two:missing-index | LIMIT 10
494+
```
495+
:::
496+
497+
:::{tab-item} 9.0
474498
If a remote cluster disconnects from the querying cluster, {{ccs}} for {{esql}} will set it to `skipped`
475499
and continue the query with other clusters, unless the remote cluster's `skip_unavailable` setting is set to `false`,
476500
in which case the query will fail.
501+
:::
502+
503+
::::
477504

478505
## Query across clusters during an upgrade [ccq-during-upgrade]
479506

manage-data/ingest/ingest-reference-architectures/agent-to-es.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Info on {{es}}:
3535

3636
This basic architecture is a common approach for ingesting data for the [Elastic Observability](https://www.elastic.co/observability) and [Elastic Security](https://www.elastic.co/security) solutions:
3737

38-
* [Elastic Observability tutorials](/solutions/observability/get-started.md#_get_started_with_other_features)
38+
* [Elastic Observability tutorials](/solutions/observability/get-started.md)
3939
* [Ingest data to Elastic Security](../../../solutions/security/get-started/ingest-data-to-elastic-security.md)
4040

4141

redirects.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ redirects:
187187
'solutions/observability/apps/analyze-monitors.md': 'solutions/observability/uptime/analyze-monitors.md'
188188
'solutions/observability/apps/inspect-uptime-duration-anomalies.md': 'solutions/observability/uptime/inspect-duration-anomalies.md'
189189
'solutions/observability/apps/configure-settings.md': 'solutions/observability/uptime/configure-settings.md'
190-
'solutions/observability/apps/tutorial-monitor-java-application.md': 'solutions/observability/applications/tutorial-monitor-java-application.md'
190+
'solutions/observability/apps/tutorial-monitor-java-application.md': 'solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md'
191191
# we can't redirect to the search-ui book so this is the next best option
192192
'reference/search/index.md': 'reference/index.md'
193193

@@ -207,6 +207,8 @@ redirects:
207207
'troubleshoot/elasticsearch/elasticsearch-client-net-api/logging.md': 'troubleshoot/elasticsearch/clients.md'
208208
'troubleshoot/elasticsearch/elasticsearch-client-net-api/net.md': 'troubleshoot/elasticsearch/clients.md'
209209
'troubleshoot/elasticsearch/elasticsearch-client-ruby-api/ruby.md': 'troubleshoot/elasticsearch/clients.md'
210-
210+
'solutions/observability/get-started/add-data-from-splunk.md': 'solutions/observability/get-started/other-tutorials/add-data-from-splunk.md'
211+
'solutions/observability/get-started/create-an-observability-project.md': 'solutions/observability/get-started.md'
212+
'solutions/observability/get-started/get-started-with-dashboards.md': 'solutions/observability/get-started.md'
211213
# Related to https://github.com/elastic/docs-content/pull/1329
212214
'manage-data/ingest/transform-enrich/ingest-pipelines-serverless.md': 'manage-data/ingest/transform-enrich/ingest-pipelines.md'

0 commit comments

Comments
 (0)