Skip to content

Commit 9b4b0ae

Browse files
authored
Merge branch 'main' into central-config-pg
2 parents 4d478b8 + 2ad7177 commit 9b4b0ae

File tree

48 files changed

+1043
-179
lines changed

Some content is hidden

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

48 files changed

+1043
-179
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: "Label new issues with needs-team"
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
7+
jobs:
8+
add-needs-triage-label:
9+
name: Add `needs-team` label
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Add the needs-team label
13+
uses: actions-ecosystem/action-add-labels@v1
14+
with:
15+
labels: |
16+
needs-team
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/add-to-board.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Triage & route issues
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
permissions:
8+
issues: write
9+
contents: read
10+
11+
jobs:
12+
route:
13+
runs-on: ubuntu-latest
14+
if: |
15+
github.event.label.name == 'team:DocsEng' ||
16+
github.event.label.name == 'team:Obs' ||
17+
github.event.label.name == 'team:Platform' ||
18+
github.event.label.name == 'team:Projects' ||
19+
github.event.label.name == 'team:Search' ||
20+
github.event.label.name == 'team:Security'
21+
env:
22+
PROJECT_ID_MAP: |
23+
{
24+
"team:DocsEng": "1625",
25+
"team:Obs": "649",
26+
"team:Platform": "1232",
27+
"team:Projects": "1415",
28+
"team:Search": "726",
29+
"team:Security": "1034"
30+
}
31+
steps:
32+
- name: Remove needs-team label
33+
uses: actions-ecosystem/action-remove-labels@v1
34+
with:
35+
labels: needs-team
36+
37+
- name: Add issue to the right project
38+
uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e
39+
with:
40+
project-url: https://github.com/orgs/elastic/projects/${{ fromJson(env.PROJECT_ID_MAP)[github.event.label.name] }}
41+
github-token: ${{ secrets.ADD_TO_BOARD_TOKEN }}
42+
labeled: ${{ github.event.label.name }}
43+
label-operator: OR

deploy-manage/autoscaling/autoscaling-in-eck.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ Configure autoscaling for {{es}} deployments in {{eck}}. Learn how to enable aut
2020

2121
ECK can leverage the [autoscaling API](https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-autoscaling) introduced in {{es}} 7.11 to adjust automatically the number of Pods and the allocated resources in a tier. Currently, autoscaling is supported for {{es}} [data tiers](/manage-data/lifecycle/data-tiers.md) and machine learning nodes.
2222

23+
### Supported Resources for Autoscaling per Elasticsearch Tier
24+
25+
| Tiers | Storage | Memory | CPU |
26+
| --- | ---| --- | --- |
27+
| Data Nodes (except Frozen) | Yes | Calculated proportionally to the required amount of storage | Calculated proportionally to the required amount of memory
28+
| Frozen Nodes | Yes | Yes | Calculated proportionally to the required amount of memory
29+
| Machine Learning | No | Yes | Calculated proportionally to the required amount of memory
30+
2331

2432
### Enable autoscaling [k8s-enable]
2533

@@ -345,4 +353,4 @@ spec:
345353
target:
346354
type: Utilization
347355
averageUtilization: 50
348-
```
356+
```

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/cloud-organization/service-status.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ applies_to:
1717

1818
{{ech}} deployments and Serverless projects run on different cloud platforms, such as Amazon Web Services (AWS), Google Cloud Platform (GCP), and Microsoft Azure. Like any service, it might undergo availability changes from time to time. When availability changes, Elastic makes sure to provide you with a current service status.
1919

20-
To check current and past service availability, go to to the [Cloud Status](https://cloud-status.elastic.co/) page. Services are separated into {{ech}} services and [Serverless services](https://status.elastic.co/?section=serverless).
20+
To check current and past service availability, go to to the [Cloud Status](https://status.elastic.co/) page. Services are separated into {{ech}} services and [Serverless services](https://status.elastic.co/?section=serverless).
2121

2222
## Subscribe to updates [ec_subscribe_to_updates]
2323

2424
Don’t want to check the service status page manually? You can get notified about changes to the service status automatically.
2525

2626
To receive service status updates:
2727

28-
1. Go to the [Cloud Status](https://cloud-status.elastic.co/) page and select **SUBSCRIBE TO UPDATES**.
28+
1. Go to the [Cloud Status](https://status.elastic.co/) page and select **SUBSCRIBE TO UPDATES**.
2929
2. Select one of the following methods to be notified of status updates:
3030

3131
* Email
@@ -38,7 +38,7 @@ After you subscribe to updates, you are notified whenever a service status updat
3838

3939
If you want to know about specific status updates, rather than all of them, you can adjust your preferences by using the following steps. These steps apply to both new signups and adjustments to an existing subscription.
4040

41-
Go to the [Cloud Status](https://cloud-status.elastic.co/) page and select **SUBSCRIBE TO UPDATES**. Enter your email address and click **SUBSCRIBE VIA EMAIL**. You will be brought to a page with a list of regions and components.
41+
Go to the [Cloud Status](https://status.elastic.co/) page and select **SUBSCRIBE TO UPDATES**. Enter your email address and click **SUBSCRIBE VIA EMAIL**. You will be brought to a page with a list of regions and components.
4242

4343
Here, you can customize your selections as needed, and then click **Save**.
4444

deploy-manage/deploy/cloud-enterprise/default-system-deployment-versions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Note that since version 2.7.0, system deployments are automatically upgraded whe
1414

1515
| {{ece}} version | Admin cluster | Logging & Metrics cluster | Security cluster |
1616
| --- | --- | --- | --- |
17+
| 4.0.0 | 8.18.0 | 8.18.0 | 8.18.0 |
18+
| 3.8.0 | 8.17.4 | 8.17.4 | 8.17.4 |
19+
| 3.7.3 | 7.17.24 | 7.17.24 | 8.15.2 |
20+
| 3.7.2 | 7.17.22 | 7.17.22 | 8.13.4 |
1721
| 3.7.1 | 7.17.20 | 7.17.20 | 8.13.2 |
1822
| 3.6.2 | 7.17.15 | 7.17.15 | 8.11.1 |
1923
| 3.6.1 | 7.17.13 | 7.17.13 | 8.9.2 |

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

0 commit comments

Comments
 (0)