Skip to content

Commit ee17dde

Browse files
original-brownbearoriginal-brownbear
committed
Merge remote-tracking branch 'elastic/main' into on-week-fast-indexing
2 parents 5777c6f + bdaaa9b commit ee17dde

File tree

360 files changed

+6168
-5255
lines changed

Some content is hidden

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

360 files changed

+6168
-5255
lines changed

‎.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ CHANGELOG.asciidoc merge=union
33
# These files contain expected text output, and should not be changed on
44
# Windows
55
build-tools-internal/src/test/resources/org/elasticsearch/gradle/internal/release/*.asciidoc text eol=lf
6+
7+
x-pack/plugin/esql/src/main/antlr/*.tokens linguist-generated=true
8+
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/*.interp linguist-generated=true
9+
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer*.java linguist-generated=true
10+
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser*.java linguist-generated=true

‎docs/changelog/108867.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 108867
2+
summary: Fix for raw mapping merge of fields named "properties"
3+
area: Mapping
4+
type: bug
5+
issues:
6+
- 108866

‎docs/changelog/109097.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 109097
2+
summary: "[Connector API] Fix bug with with wrong target index for access control\
3+
\ sync"
4+
area: Application
5+
type: bug
6+
issues: []

‎docs/reference/connector/apis/cancel-connector-sync-job-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ beta::[]
88

99
Cancels a connector sync job.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[cancel-connector-sync-job-api-request]]
1214
==== {api-request-title}
1315
`PUT _connector/_sync_job/<connector_sync_job_id>/_cancel`

‎docs/reference/connector/apis/check-in-connector-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ preview::[]
88

99
Updates the `last_seen` field of a connector with current timestamp.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[check-in-connector-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/connector/apis/check-in-connector-sync-job-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ preview::[]
88

99
Checks in a connector sync job (updates `last_seen` to the current time).
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[check-in-connector-sync-job-api-request]]
1214
==== {api-request-title}
1315
`PUT _connector/_sync_job/<connector_sync_job_id>/_check_in/`

‎docs/reference/connector/apis/connector-apis.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
beta::[]
55

6-
The connector and sync jobs APIs provide a convenient way to create and manage Elastic {enterprise-search-ref}/connectors.html[connectors^] and sync jobs in an internal index.
6+
The connector and sync jobs APIs provide a convenient way to create and manage Elastic {enterprise-search-ref}/connectors.html[connectors^] and sync jobs in an internal index. To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
77

88
Connectors are {es} integrations that bring content from third-party data sources, which can be deployed on {ecloud} or hosted on your own infrastructure:
99

‎docs/reference/connector/apis/create-connector-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Connectors are {es} integrations that bring content from third-party data source
1414

1515
Find a list of all supported service types in the {enterprise-search-ref}/connectors.html[connectors documentation^].
1616

17+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
18+
1719
[source,console]
1820
--------------------------------------------------
1921
PUT _connector/my-connector

‎docs/reference/connector/apis/create-connector-sync-job-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ beta::[]
99

1010
Creates a connector sync job.
1111

12+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
13+
1214
[source, console]
1315
--------------------------------------------------
1416
POST _connector/_sync_job

‎docs/reference/connector/apis/delete-connector-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ This is a destructive action that is not recoverable.
1111

1212
Note: this action doesn't delete any API key, ingest pipeline or data index associated with the connector. These need to be removed manually.
1313

14+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
15+
1416
[[delete-connector-api-request]]
1517
==== {api-request-title}
1618

‎docs/reference/connector/apis/delete-connector-sync-job-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ beta::[]
99
Removes a connector sync job and its associated data.
1010
This is a destructive action that is not recoverable.
1111

12+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
13+
1214
[[delete-connector-sync-job-api-request]]
1315
==== {api-request-title}
1416

‎docs/reference/connector/apis/get-connector-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ beta::[]
88

99
Retrieves the details about a connector.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[get-connector-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/connector/apis/get-connector-sync-job-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ beta::[]
88

99
Retrieves the details about a connector sync job.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[get-connector-sync-job-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/connector/apis/list-connector-sync-jobs-api.asciidoc

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ beta::[]
99

1010
Returns information about all stored connector sync jobs ordered by their creation date in ascending order.
1111

12+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
1213

1314
[[list-connector-sync-jobs-api-request]]
1415
==== {api-request-title}

‎docs/reference/connector/apis/list-connectors-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ beta::[]
99

1010
Returns information about all created connectors.
1111

12+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
13+
1214

1315
[[list-connector-api-request]]
1416
==== {api-request-title}

‎docs/reference/connector/apis/set-connector-sync-job-error-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ preview::[]
88

99
Sets a connector sync job error.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[set-connector-sync-job-error-api-request]]
1214
==== {api-request-title}
1315
`PUT _connector/_sync_job/<connector_sync_job_id>/_error`

‎docs/reference/connector/apis/set-connector-sync-job-stats-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ preview::[]
88

99
Sets connector sync job stats.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[set-connector-sync-job-stats-api-request]]
1214
==== {api-request-title}
1315
`PUT _connector/_sync_job/<connector_sync_job_id>/_stats`

‎docs/reference/connector/apis/update-connector-api-key-id-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ The Connector Secret ID is only required for native connectors.
1515
Connector clients do not use this field.
1616
See the documentation for {enterprise-search-ref}/native-connectors.html#native-connectors-manage-API-keys-programmatically[managing native connector API keys programmatically^] for more details.
1717

18+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
19+
1820
[[update-connector-api-key-id-api-request]]
1921
==== {api-request-title}
2022

‎docs/reference/connector/apis/update-connector-configuration-api.asciidoc

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ beta::[]
88

99
Updates a connector's `configuration`, allowing for config value updates within a registered configuration schema.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
1112

1213
[[update-connector-configuration-api-request]]
1314
==== {api-request-title}

‎docs/reference/connector/apis/update-connector-error-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ preview::[]
88

99
Updates the `error` field of a connector.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[update-connector-error-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/connector/apis/update-connector-filtering-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Updates the draft `filtering` configuration of a connector and marks the draft v
1010

1111
The filtering property is used to configure sync rules (both basic and advanced) for a connector. Learn more in the {enterprise-search-ref}/sync-rules.html[sync rules documentation].
1212

13+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
14+
1315
[[update-connector-filtering-api-request]]
1416
==== {api-request-title}
1517

‎docs/reference/connector/apis/update-connector-index-name-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ beta::[]
88

99
Updates the `index_name` field of a connector, specifying the index where the data ingested by the connector is stored.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[update-connector-index-name-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/connector/apis/update-connector-last-sync-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Updates the fields related to the last sync of a connector.
1010

1111
This action is used for analytics and monitoring.
1212

13+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
14+
1315
[[update-connector-last-sync-api-request]]
1416
==== {api-request-title}
1517

‎docs/reference/connector/apis/update-connector-name-description-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ beta::[]
99

1010
Updates the `name` and `description` fields of a connector.
1111

12+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
13+
1214
[[update-connector-name-description-api-request]]
1315
==== {api-request-title}
1416

‎docs/reference/connector/apis/update-connector-pipeline-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Updates the `pipeline` configuration of a connector.
1010

1111
When you create a new connector, the configuration of an <<ingest-pipeline-search-details-generic-reference, ingest pipeline>> is populated with default settings.
1212

13+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
14+
1315
[[update-connector-pipeline-api-request]]
1416
==== {api-request-title}
1517

‎docs/reference/connector/apis/update-connector-scheduling-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ beta::[]
88

99
Updates the `scheduling` configuration of a connector.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[update-connector-scheduling-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/connector/apis/update-connector-service-type-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ beta::[]
88

99
Updates the `service_type` of a connector.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[update-connector-service-type-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/connector/apis/update-connector-status-api.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ preview::[]
88

99
Updates the `status` of a connector.
1010

11+
To get started with Connector APIs, check out the {enterprise-search-ref}/connectors-tutorial-api.html[tutorial^].
12+
1113
[[update-connector-status-api-request]]
1214
==== {api-request-title}
1315

‎docs/reference/rest-api/security/get-builtin-privileges.asciidoc

+7-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ version of {es}.
4545
<<privileges-list-indices,index privileges>> that are understood by this version
4646
of {es}.
4747

48+
`remote_cluster`:: (array of string) The list of
49+
<<roles-remote-cluster-priv, remote_cluster>> privileges that are understood by this version
50+
of {es}.
4851

4952
[[security-api-get-builtin-privileges-example]]
5053
==== {api-examples-title}
@@ -56,7 +59,7 @@ The following example retrieves the names of all builtin privileges:
5659
GET /_security/privilege/_builtin
5760
--------------------------------------------------
5861

59-
A successful call returns an object with "cluster" and "index" fields.
62+
A successful call returns an object with "cluster", "index", and "remote_cluster" fields.
6063

6164
[source,console-result]
6265
--------------------------------------------------
@@ -145,6 +148,9 @@ A successful call returns an object with "cluster" and "index" fields.
145148
"read_cross_cluster",
146149
"view_index_metadata",
147150
"write"
151+
],
152+
"remote_cluster" : [
153+
"monitor_enrich"
148154
]
149155
}
150156
--------------------------------------------------

‎docs/reference/security/authorization/managing-roles.asciidoc

+36-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ A role is defined by the following JSON structure:
1212
"global": { ... }, <3>
1313
"indices": [ ... ], <4>
1414
"applications": [ ... ], <5>
15-
"remote_indices": [ ... ] <6>
15+
"remote_indices": [ ... ], <6>
16+
"remote_cluster": [ ... ] <7>
1617
}
1718
-----
1819
// NOTCONSOLE
@@ -35,6 +36,10 @@ A role is defined by the following JSON structure:
3536
<<remote-clusters-api-key,remote clusters configured with the API key based model>>.
3637
This field is optional (missing `remote_indices` privileges effectively mean
3738
no index level permissions for any API key based remote clusters).
39+
<7> A list of cluster permissions entries for
40+
<<remote-clusters-api-key,remote clusters configured with the API key based model>>.
41+
This field is optional (missing `remote_cluster` privileges effectively means
42+
no additional cluster permissions for any API key based remote clusters).
3843

3944
[[valid-role-name]]
4045
NOTE: Role names must be at least 1 and no more than 507 characters. They can
@@ -209,6 +214,36 @@ The following describes the structure of a remote indices permissions entry:
209214
restricted indices, you must set this field to `true` (default is `false`), and then the
210215
`names` field will cover the restricted indices as well.
211216

217+
[[roles-remote-cluster-priv]]
218+
==== Remote cluster privileges
219+
220+
For <<remote-clusters-api-key,remote clusters configured with the API key based model>>, remote cluster privileges
221+
can be used to specify additional cluster privileges for matching remote clusters.
222+
223+
NOTE: Remote cluster privileges are only effective for remote clusters configured with the API key based model.
224+
They have no effect on remote clusters configured with the certificate based model.
225+
226+
The following describes the structure of a remote cluster permissions entry:
227+
228+
[source,js]
229+
-------
230+
{
231+
"clusters": [ ... ], <1>
232+
"privileges": [ ... ] <2>
233+
}
234+
-------
235+
// NOTCONSOLE
236+
<1> A list of remote cluster aliases. It supports literal strings as well as
237+
<<api-multi-index,wildcards>> and <<regexp-syntax,regular expressions>>.
238+
This field is required.
239+
<2> The cluster level privileges for the remote cluster. The allowed values here are a subset of the
240+
<<privileges-list-cluster,cluster privileges>>. This field is required.
241+
242+
The `monitor_enrich` privilege for remote clusters was introduced in version
243+
8.15.0. Currently, this is the only privilege available for remote clusters and
244+
is required to enable users to use the `ENRICH` keyword in ES|QL queries across
245+
clusters.
246+
212247
==== Example
213248

214249
The following snippet shows an example definition of a `clicks_admin` role:

‎docs/reference/troubleshooting/common-issues/red-yellow-cluster-status.asciidoc

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
[[red-yellow-cluster-status]]
2-
=== Red or yellow cluster status
3-
4-
A red or yellow cluster status indicates one or more shards are missing or
5-
unallocated. These unassigned shards increase your risk of data loss and can
6-
degrade cluster performance.
2+
=== Red or yellow cluster health status
3+
4+
A red or yellow cluster health status indicates one or more shards are not assigned to
5+
a node.
6+
7+
* **Red health status**: The cluster has some unassigned primary shards, which
8+
means that some operations such as searches and indexing may fail.
9+
* **Yellow health status**: The cluster has no unassigned primary shards but some
10+
unassigned replica shards. This increases your risk of data loss and can degrade
11+
cluster performance.
12+
13+
When your cluster has a red or yellow health status, it will continue to process
14+
searches and indexing where possible, but may delay certain management and
15+
cleanup activities until the cluster returns to green health status. For instance,
16+
some <<index-lifecycle-management,{ilm-init}>> actions require the index on which they
17+
operate to have a green health status.
18+
19+
In many cases, your cluster will recover to green health status automatically.
20+
If the cluster doesn't automatically recover, then you must <<fix-red-yellow-cluster-status,manually address>>
21+
the remaining problems so management and cleanup activities can proceed.
722

823
[discrete]
924
[[diagnose-cluster-status]]

‎muted-tests.yml

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ tests:
3535
- class: "org.elasticsearch.upgrades.MlTrainedModelsUpgradeIT"
3636
issue: "https://github.com/elastic/elasticsearch/issues/108993"
3737
method: "testTrainedModelInference"
38+
- class: "org.elasticsearch.datastreams.DataStreamsClientYamlTestSuiteIT"
39+
issue: "https://github.com/elastic/elasticsearch/issues/109154"
40+
method: "test {p0=data_stream/200_rollover_failure_store/Lazily roll over a data\
41+
\ stream's failure store after an ingest failure}"
3842
# Examples:
3943
#
4044
# Mute a single test case in a YAML test suite:

‎rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_nodes.json

+10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
]
1919
}
2020
]
21+
},
22+
"params":{
23+
"master_timeout": {
24+
"type": "time",
25+
"description": "Timeout for connection to master node"
26+
},
27+
"timeout": {
28+
"type": "time",
29+
"description": "Timeout for acknowledgements from all nodes"
30+
}
2131
}
2232
}
2333
}

0 commit comments

Comments
 (0)