Skip to content

Commit 98f626b

Browse files
authored
Merge branch 'main' into leemthompo-patch-1
2 parents 36f4e20 + 05b5b11 commit 98f626b

File tree

25 files changed

+187
-151
lines changed

25 files changed

+187
-151
lines changed

deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For detailed {{es-serverless}} project rates, see the [{{es-serverless}} pricing
4040
You can control costs using the following strategies:
4141

4242
* **Search Power setting:** [Search Power](../../deploy/elastic-cloud/project-settings.md#elasticsearch-manage-project-search-power-settings) controls the speed of searches against your data. With Search Power, you can improve search performance by adding more resources for querying, or you can reduce provisioned resources to cut costs.
43-
* **Time series data retention:** By limiting the number of days of [time series data](../../../solutions/search/ingest-for-search.md#elasticsearch-ingest-time-series-data) that are available for caching, you can reduce the number of search VCUs required.
43+
* **Search boost window**: By limiting the number of days of [time series data](../../../solutions/search/ingest-for-search.md#elasticsearch-ingest-time-series-data) that are available for caching, you can reduce the number of search VCUs required.
4444
* **Machine learning trained model autoscaling:** Configure your trained model deployment to allow it to scale down to zero allocations when there are no active inference requests:
4545

4646
* When starting or updating a trained model deployment, [Enable adaptive resources](../../autoscaling/trained-model-autoscaling.md#enabling-autoscaling-in-kibana-adaptive-resources) and set the VCU usage level to **Low**.

deploy-manage/deploy/self-managed/_snippets/check-es-running.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
You can test that your {{es}} node is running by sending an HTTPS request to port `9200` on `localhost`:
22

33
```sh subs=true
4-
curl --cacert {{es-conf}}{{slash}}certs{{slash}}http_ca.crt {{escape}} <1>
4+
curl --cacert {{es-conf}}{{slash}}certs{{slash}}http_ca.crt <1>
55
-u elastic:$ELASTIC_PASSWORD https://localhost:9200 <2>
66
```
77
1. `--cacert`: Path to the generated `http_ca.crt` certificate for the HTTP layer.
@@ -29,4 +29,4 @@ The call returns a response like this:
2929
},
3030
"tagline" : "You Know, for Search"
3131
}
32-
```
32+
```
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
We recommend storing the `elastic` password as an environment variable in your shell. For example:
22

33
```sh subs=true
4-
{{export}}ELASTIC_PASSWORD="your_password"
4+
{{export}} ELASTIC_PASSWORD="your_password"
55
```
66

77
If you have password-protected the {{es}} keystore, you will be prompted to enter the keystore’s password. See [Secure settings](/deploy-manage/security/secure-settings.md) for more details.
88

9-
To learn how to reset this password, refer to [](/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md).
9+
To learn how to reset this password, refer to [](/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-sm.md).

deploy-manage/security/supported-ssltls-versions-by-jdk-version.md

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,16 @@ Check your security provider’s release notes for information on TLS support.
2424
: SSL v3 is supported on all {{es}} [compatible JDKs](../deploy/self-managed/installing-elasticsearch.md#jvm-version) but is disabled by default. See [Enabling additional SSL/TLS versions on your JDK](#jdk-enable-tls-protocol).
2525

2626
`TLSv1`
27-
: TLS v1.0 is supported on all {{es}} [compatible JDKs](../deploy/self-managed/installing-elasticsearch.md#jvm-version). Some newer JDKs, including the JDK bundled with {{es}}, disable TLS v1.0 by default. See [Enabling additional SSL/TLS versions on your JDK](#jdk-enable-tls-protocol).
27+
: TLS v1.0 is supported on all {{es}} [compatible JDKs](../deploy/self-managed/installing-elasticsearch.md#jvm-version) but is disabled by default. See [Enabling additional SSL/TLS versions on your JDK](#jdk-enable-tls-protocol).
2828

2929
`TLSv1.1`
30-
: TLS v1.1 is supported on all {{es}} [compatible JDKs](../deploy/self-managed/installing-elasticsearch.md#jvm-version). Some newer JDKs, including the JDK bundled with {{es}}, disable TLS v1.1 by default. See [Enabling additional SSL/TLS versions on your JDK](#jdk-enable-tls-protocol).
30+
: TLS v1.1 is supported on all {{es}} [compatible JDKs](../deploy/self-managed/installing-elasticsearch.md#jvm-version) but is disabled by default. See [Enabling additional SSL/TLS versions on your JDK](#jdk-enable-tls-protocol).
3131

3232
`TLSv1.2`
3333
: TLS v1.2 is supported on all {{es}} [compatible JDKs](../deploy/self-managed/installing-elasticsearch.md#jvm-version). It is enabled by default on all JDKs that are supported by {{es}}, including the bundled JDK.
3434

3535
`TLSv1.3`
36-
: TLS v1.3 is supported on JDK11 and later, and JDK8 builds newer than 8u261 (including the most recent release of each JDK8 distribution that {{es}} supports). TLS v1.3 is supported and enabled by default on the JDK that is bundled with {{es}}.
37-
38-
::::{note}
39-
Although {{es}} supports running on older JDK8 builds without TLS v1.3, we recommend upgrading to a JDK version that includes TLS v1.3 for better support and updates.
40-
::::
36+
: TLS v1.3 is supported on all {{es}} [compatible JDKs](../deploy/self-managed/installing-elasticsearch.md#jvm-version). It is enabled by default on all JDKs that are supported by {{es}}, including the bundled JDK.
4137

4238

4339
## Enabling additional SSL/TLS versions on your JDK [jdk-enable-tls-protocol]
@@ -59,10 +55,6 @@ For the {{es}} **bundled JDK**, the configuration file is in a sub directory of
5955
* Windows: `$ES_HOME/jdk/conf/security/java.security`
6056
* macOS:`$ES_HOME/jdk.app/Contents/Home/conf/security/java.security`
6157

62-
For **JDK8**, the configuration file is within the `jre/lib/security` directory of the Java installation. If `$JAVA_HOME` points to the home directory of the JDK that you use to run {{es}}, then the configuration file will be in:
63-
64-
* `$JAVA_HOME/jre/lib/security/java.security`
65-
6658
For **JDK11 or later**, the configuration file is within the `conf/security` directory of the Java installation. If `$JAVA_HOME` points to the home directory of the JDK that you use to run {{es}}, then the configuration file will be in:
6759

6860
* `$JAVA_HOME/conf/security/java.security`
@@ -72,11 +64,12 @@ For **JDK11 or later**, the configuration file is within the `conf/security` dir
7264

7365
Within the JDK configuration file is a line that starts with `jdk.tls.disabledAlgorithms=`. This setting controls which protocols and algorithms are *disabled* in your JDK. The value of that setting will typically span multiple lines.
7466

75-
For example, in OpenJDK 16 the setting is:
67+
For example, in OpenJDK 21 the setting is:
7668

7769
```text
78-
jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1, RC4, DES, MD5withRSA, \
79-
DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL
70+
jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1, DTLSv1.0, RC4, DES, \
71+
MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
72+
ECDH
8073
```
8174

8275
Create a new file in your in your {{es}} configuration directory named `es.java.security`. Copy the `jdk.tls.disabledAlgorithms` setting from the JDK’s default configuration file into `es.java.security`. You do not need to copy any other settings.
@@ -86,11 +79,12 @@ Create a new file in your in your {{es}} configuration directory named `es.java.
8679

8780
Edit the `es.java.security` file in your {{es}} configuration directory, and modify the `jdk.tls.disabledAlgorithms` setting so that any SSL or TLS versions that you wish to use are no longer listed.
8881

89-
For example, to enable TLSv1.1 on OpenJDK 16 (which uses the `jdk.tls.disabledAlgorithms` settings shown previously), the `es.java.security` file would contain the previously disabled TLS algorithms *except* `TLSv1.1`:
82+
For example, to enable TLSv1.1 on OpenJDK 21 (which uses the `jdk.tls.disabledAlgorithms` settings shown previously), the `es.java.security` file would contain the previously disabled TLS algorithms *except* `TLSv1.1`:
9083

9184
```text
92-
jdk.tls.disabledAlgorithms=SSLv3, TLSv1, RC4, DES, MD5withRSA, \
93-
DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL
85+
jdk.tls.disabledAlgorithms=SSLv3, TLSv1, DTLSv1.0, RC4, DES, \
86+
MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
87+
ECDH
9488
```
9589

9690

deploy-manage/tools/snapshot-and-restore/read-only-url-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PUT _snapshot/my_read_only_url_repository
4242
: (Optional, Boolean) If `true`, metadata files, such as index mappings and settings, are compressed in snapshots. Data files are not compressed. Defaults to `true`.
4343

4444
`max_number_of_snapshots`
45-
: (Optional, integer) Maximum number of snapshots the repository can contain. Defaults to `Integer.MAX_VALUE`, which is `2^31-1` or `2147483647`.
45+
: (Optional, integer) Maximum number of snapshots the repository can contain. Defaults to `Integer.MAX_VALUE`, which is `2`^`31`^`-1` or `2147483647`.
4646

4747
`max_restore_bytes_per_sec`
4848
: (Optional, [byte value](elasticsearch://reference/elasticsearch/rest-apis/api-conventions.md#byte-units)) Maximum snapshot restore rate per node. Defaults to unlimited. Note that restores are also throttled through [recovery settings](elasticsearch://reference/elasticsearch/configuration-reference/index-recovery-settings.md).

deploy-manage/tools/snapshot-and-restore/shared-file-system-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ PUT _snapshot/my_fs_backup
148148
: (Required, string) Location of the shared filesystem used to store and retrieve snapshots. This location must be registered in the `path.repo` setting on all master and data nodes in the cluster. Unlike `path.repo`, this setting supports only a single file path.
149149

150150
`max_number_of_snapshots`
151-
: (Optional, integer) Maximum number of snapshots the repository can contain. Defaults to `Integer.MAX_VALUE`, which is `2^31-1` or `2147483647`.
151+
: (Optional, integer) Maximum number of snapshots the repository can contain. Defaults to `Integer.MAX_VALUE`, which is `2`^`31`^`-1` or `2147483647`.
152152

153153
`max_restore_bytes_per_sec`
154154
: (Optional, [byte value](elasticsearch://reference/elasticsearch/rest-apis/api-conventions.md#byte-units)) Maximum snapshot restore rate per node. Defaults to unlimited. Note that restores are also throttled through [recovery settings](elasticsearch://reference/elasticsearch/configuration-reference/index-recovery-settings.md).

deploy-manage/tools/snapshot-and-restore/source-only-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ PUT _snapshot/my_src_only_repository
5353

5454

5555
`max_number_of_snapshots`
56-
: (Optional, integer) Maximum number of snapshots the repository can contain. Defaults to `Integer.MAX_VALUE`, which is `2^31-1` or `2147483647`.
56+
: (Optional, integer) Maximum number of snapshots the repository can contain. Defaults to `Integer.MAX_VALUE`, which is `2`^`31`^`-1` or `2147483647`.
5757

5858
`max_restore_bytes_per_sec`
5959
: (Optional, [byte value](elasticsearch://reference/elasticsearch/rest-apis/api-conventions.md#byte-units)) Maximum snapshot restore rate per node. Defaults to unlimited. Note that restores are also throttled through [recovery settings](elasticsearch://reference/elasticsearch/configuration-reference/index-recovery-settings.md).

deploy-manage/upgrade/orchestrator/upgrade-cloud-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Periodically, you might need to upgrade an {{ece}} installation as new versions
2020
Before initiating the ECE upgrade process, review the [Support matrix](https://www.elastic.co/support/matrix#elastic-cloud-enterprise) to ensure the operating system (OS), Docker, or Podman versions you're running are compatible with the ECE version you’re upgrading to. We recommend that Docker, Podman, and the operating system are at the target version before starting the ECE upgrade.
2121

2222
:::{note}
23-
During the upgrade window, there might be a short time period when you run a combination of versions that is not explicitly supported. For example, if you are on ECE 3.5 with Docker version 20.10 on Ubuntu 20.04 and plan to upgrade to ECE 3.7 on the same OS, you will need to upgrade Docker to version 24.0 first. In this case, and only during your upgrade window, we will support the mixed OS and container engine versions. In general, this won’t be a problem. However, should anything become a blocker for the upgrade, [reach out to support for help](/troubleshoot/index.md#contact-us).
23+
During the upgrade window, there might be a short period of time during which you run a combination of versions that is not explicitly supported. For example, if you are on ECE 3.5 with Docker version 18.09 on SLES 12 and plan to upgrade to ECE 3.8 on the same OS, you will need to upgrade Docker to version 24.0 or 25.0 first. In this case, and only during your upgrade window, we will support the mixed OS and container engine versions. In general, this won’t be a problem. However, should anything become a blocker for the upgrade, [reach out to support for help](/troubleshoot/index.md#contact-us).
2424
:::
2525

2626
## The upgrade version matrix [ece-upgrade-version-matrix]

explore-analyze/query-filter/aggregations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,4 @@ For faster responses, {{es}} caches the results of frequently run aggregations i
294294

295295
## Limits for `long` values [limits-for-long-values]
296296

297-
When running aggregations, {{es}} uses [`double`](elasticsearch://reference/elasticsearch/mapping-reference/number.md) values to hold and represent numeric data. As a result, aggregations on [`long`](elasticsearch://reference/elasticsearch/mapping-reference/number.md) numbers greater than `253` are approximate.
297+
When running aggregations, {{es}} uses [`double`](elasticsearch://reference/elasticsearch/mapping-reference/number.md) values to hold and represent numeric data. As a result, aggregations on [`long`](elasticsearch://reference/elasticsearch/mapping-reference/number.md) numbers greater than `2`^`53`^ are approximate.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
applies_to:
33
stack: ga
4-
serverless: ga
5-
navigation_title: "Using {{esql}} across clusters"
4+
serverless: unavailable
5+
navigation_title: "Query across clusters"
66
mapped_pages:
77
- https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-cross-clusters.html
88
---
99

1010

1111

12-
# Using ES|QL across clusters [esql-cross-clusters]
12+
# Use ES|QL across clusters [esql-cross-clusters]
1313

1414

1515
::::{warning}

0 commit comments

Comments
 (0)