Skip to content

Commit 0317323

Browse files
valeriy42valeriy42
authored
Merge branch 'main' into enhancement/1532-unused-stats-remover
2 parents 18808b4 + cae06b8 commit 0317323

File tree

83 files changed

+2356
-216
lines changed

Some content is hidden

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

83 files changed

+2356
-216
lines changed

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a9e07d97c55f5b854b1c203509e57b6f466eb26318540b2e1b59734355f747b6 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a9e07d97c55f5b854b1c203509e57b6f466eb26318540b2e1b59734355f747b6
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:29150cd940cc7f69407d978d5a19c86f4d9e67cf44e4d6ded787a497e8f27c9a AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:55ee1dca9780931b0929d6eb734f455790c06ddbb59f55008e0cddebfbfd1e2e AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -79,7 +79,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
7979
# Add entrypoint
8080
################################################################################
8181

82-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:29150cd940cc7f69407d978d5a19c86f4d9e67cf44e4d6ded787a497e8f27c9a
82+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:55ee1dca9780931b0929d6eb734f455790c06ddbb59f55008e0cddebfbfd1e2e
8383

8484
RUN <%= retry.loop(package_manager,
8585
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎docs/changelog/127628.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127628
2+
summary: Ensure config reload on ..data symlink switch for CSI driver support
3+
area: Infra/Settings
4+
type: enhancement
5+
issues: []

‎docs/changelog/127966.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127966
2+
summary: "[ML] Add Rerank support to the Inference Plugin"
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/128298.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 128298
2+
summary: Better handling of node ids from shutdown metadata (avoid NPE on already removed nodes)
3+
area: Infra/Node Lifecycle
4+
type: bug
5+
issues:
6+
- 100201

‎docs/changelog/128314.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128314
2+
summary: Fix NPE in APMTracer through `RestController`
3+
area: Infra/REST API
4+
type: bug
5+
issues: []

‎docs/changelog/128327.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128327
2+
summary: Use internal user for internal inference action
3+
area: Machine Learning
4+
type: bug
5+
issues: []

‎docs/reference/elasticsearch/mapping-reference/object.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ JSON documents are hierarchical in nature: the document may contain inner object
1111

1212
```console
1313
PUT my-index-000001/_doc/1
14-
{ <1>
14+
{ // <1>
1515
"region": "US",
1616
"manager": { <2>
1717
"age": 30,

‎docs/reference/search-connectors/es-connectors-sharepoint-online.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To get started, first log in to SharePoint Online and access your administrative
4949

5050
Follow these steps:
5151

52-
* Sign in to [https://portal.azure.com/](https://portal.azure.com/) and click on **Azure Active Directory**.
52+
* Sign in to [https://portal.azure.com/](https://portal.azure.com/) and click on **Microsoft Entra ID** (formerly Azure Active Directory).
5353
* Locate **App Registrations** and Click **New Registration**.
5454
* Give your app a name - like "Search".
5555
* Leave the **Redirect URIs** blank for now.
@@ -133,9 +133,9 @@ Refer to the following documentation for setting [SharePoint permissions](https:
133133
134134
#### Granting `Sites.Selected` permissions [es-connectors-sharepoint-online-sites-selected-permissions-self-managed]
135135
136-
To configure `Sites.Selected` permissions, follow these steps in the Azure Active Directory portal. These permissions enable precise access control to specific SharePoint sites.
136+
To configure `Sites.Selected` permissions, follow these steps in the Microsoft Entra ID (formerly Azure Active Directory) portal. These permissions enable precise access control to specific SharePoint sites.
137137
138-
1. Sign in to the [Azure Active Directory portal](https://portal.azure.com/).
138+
1. Sign in to the [Microsoft Entra ID (formerly Azure Active Directory) portal](https://portal.azure.com/).
139139
2. Navigate to **App registrations** and locate the application created for the connector.
140140
3. Under **API permissions**, click **Add permission**.
141141
4. Select **Microsoft Graph** > **Application permissions**, then add `Sites.Selected`.
@@ -603,4 +603,4 @@ See [Troubleshooting](/reference/search-connectors/es-connectors-troubleshooting
603603

604604
### Security [es-connectors-sharepoint-online-client-security]
605605

606-
See [Security](/reference/search-connectors/es-connectors-security.md).
606+
See [Security](/reference/search-connectors/es-connectors-security.md).

‎docs/release-notes/breaking-changes.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ If you are migrating from a version prior to version 9.0, you must first upgrade
1212

1313
% ## Next version [elasticsearch-nextversion-breaking-changes]
1414

15+
```{applies_to}
16+
stack: coming 9.0.2
17+
```
18+
## 9.0.2 [elasticsearch-9.0.2-breaking-changes]
19+
20+
Snapshot/Restore:
21+
* Make S3 custom query parameter optional [#128043](https://github.com/elastic/elasticsearch/pull/128043)
22+
23+
24+
1525
## 9.0.1 [elasticsearch-9.0.1-breaking-changes]
1626

1727
No breaking changes in this version.

0 commit comments

Comments
 (0)