Skip to content

Commit 2df1b6d

Browse files
committed
Merge branch 'main' into unmute-ccs-tests
# Conflicts: # muted-tests.yml
2 parents 4664e65 + aaaf069 commit 2df1b6d

File tree

176 files changed

+6046
-2463
lines changed

Some content is hidden

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

176 files changed

+6046
-2463
lines changed

docs/changelog/137599.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 137599
2+
summary: In-response-to in saml successful response
3+
area: Authentication
4+
type: enhancement
5+
issues:
6+
- 128179

docs/changelog/139071.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 139071
2+
summary: Change FUSE KEY BY to receive a list of `qualifiedName`
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/139087.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 139087
2+
summary: Disk bbq license enforcement
3+
area: Vector Search
4+
type: bug
5+
issues: []

docs/reference/elasticsearch/configuration-reference/security-settings.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,7 +1923,13 @@ PKCS#12 files are configured in the same way as Java keystore files:
19231923

19241924
## Transport TLS/SSL settings [transport-tls-ssl-settings]
19251925

1926-
You can configure the following TLS/SSL settings.
1926+
The settings in this section relate to node-to-node transport connections.
1927+
1928+
By default, {{es}} uses mutual TLS (mTLS) to secure node-to-node transport connections within a cluster. With mTLS, data is encrypted in transit and both nodes must present valid certificates when connecting. Each node requires that certificates be issued by a trusted certificate authority, ensuring that only authorized nodes can connect. [Learn about configuring node-to-node mTLS](docs-content://deploy-manage/security/secure-cluster-communications.md#encrypt-internode-communication).
1929+
1930+
::::{warning}
1931+
Transport connections between Elasticsearch nodes are security-critical and you must protect them carefully. Malicious actors who can observe or interfere with unencrypted node-to-node transport traffic can read or modify cluster data. A malicious actor who can establish a transport connection might be able to invoke system-internal APIs, including APIs that read or modify cluster data.
1932+
::::
19271933

19281934
`xpack.security.transport.ssl.enabled`
19291935
: ([Static](docs-content://deploy-manage/stack-settings.md#static-cluster-setting)) Used to enable or disable TLS/SSL on the transport networking layer, which nodes use to communicate with each other. The default is `false`.
@@ -1939,7 +1945,11 @@ You can configure the following TLS/SSL settings.
19391945

19401946

19411947
`xpack.security.transport.ssl.client_authentication`
1942-
: ([Static](docs-content://deploy-manage/stack-settings.md#static-cluster-setting)) Controls the server’s behavior in regard to requesting a certificate from client connections. Valid values are `required`, `optional`, and `none`. `required` forces a client to present a certificate, while `optional` requests a client certificate but the client is not required to present one. Defaults to `required`.
1948+
: ([Static](docs-content://deploy-manage/stack-settings.md#static-cluster-setting)) Controls the node's behavior in regard to requesting a certificate when accepting an inbound transport connections from another {{es}} node. Valid values are `required`, `optional`, and `none`. The default is `required` which means that the connecting node must present a valid client certificate during the connection process. May also be set to `optional` which means that a client certificate is requested but the connecting node may choose not to present one, or `none` which means that no client certificate is even requested during the connection process.
1949+
1950+
::::{warning}
1951+
Turning off mTLS by setting `xpack.security.transport.ssl.client_authentication` to `optional` or `none` allows anyone with network access to establish transport connections. Malicious actors can use these connections to invoke system-internal APIs that might read or modify cluster data. Use mTLS to protect your node-to-node transport connections unless you are absolutely certain that unauthorized network access to these nodes cannot occur.
1952+
::::
19431953

19441954
`xpack.security.transport.ssl.verification_mode`
19451955
: ([Static](docs-content://deploy-manage/stack-settings.md#static-cluster-setting)) Defines how to verify the certificates presented by another party in the TLS connection:

docs/reference/elasticsearch/rest-apis/retrievers/diversify-retriever.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ The ordering of results returned from the inner retriever is preserved.
5050

5151
Query vector. Must have the same number of dimensions as the vector field you are searching against.
5252
Must be either an array of floats or a hex-encoded byte vector.
53+
If you provide a `query_vector`, you cannot also provide a `query_vector_builder`.
54+
55+
`query_vector_builder`
56+
: (Optional, query vector builder object)
57+
58+
Defines a [model](docs-content://solutions/search/vector/knn.md#knn-semantic-search) to build a query vector.
59+
If you provide a `query_vector_builder`, you cannot also provide a `query_vector`.
60+
5361

5462
`lambda`
5563
: (Required for `mmr`, float)

docs/reference/query-languages/esql/_snippets/functions/parameters/absent_over_time.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/delta.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/deriv.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/idelta.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/parameters/increase.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)