Skip to content

Commit 402b118

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature/prevent-create-api-with-cloud-api-key
2 parents 39b2bb6 + bc515c4 commit 402b118

File tree

211 files changed

+7414
-2656
lines changed

Some content is hidden

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

211 files changed

+7414
-2656
lines changed

branches.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
{
55
"branch": "main"
66
},
7+
{
8+
"branch": "9.1"
9+
},
710
{
811
"branch": "9.0"
912
},

docs/changelog/129128.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129128
2+
summary: Add RemoveBlock API to allow `DELETE /{index}/_block/{block}`
3+
area: Indices APIs
4+
type: enhancement
5+
issues: []

docs/changelog/129738.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129738
2+
summary: Watch SSL files instead of directories
3+
area: TLS
4+
type: bug
5+
issues: []

docs/changelog/129884.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129884
2+
summary: Move to the Cohere V2 API for new inference endpoints
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

docs/changelog/129962.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129962
2+
summary: Simplified Linear & RRF Retrievers - Return error on empty fields param
3+
area: Search
4+
type: bug
5+
issues: []

docs/extend/creating-classic-plugins.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,12 @@ org.example.module: # or 'ALL-UNNAMED' if the plugin is non-modular
136136
Allows code to access the filesystem, to read or write paths as specified by the entitlement's fields. The filesystem of the OS hosting {{es}} may contain sensitive files, for example credentials. Some files are meant to be always accessible to {{es}}, but plugins can not access them directly: {{es}} enforces that certain files can only be read by its core code, while some other files can not be read or written at all. A plugin is always granted `read` access to the {{es}} config directory and `read_write` access to the temp directory; if the plugin requires to read, write or access additional files or directories, it must specify them via this entitlement.
137137

138138
It is possible to specify 3 different types of file entitlement:
139-
- `path` to specify an absolute path
140-
- `relative_path` to specify a relative path. The path will be resolved via the `relative_to` field, which is used to qualify the relative path. It can be a specific {{es}} directory (`config` or `data`), or to the user home directory (`home`) (the home of the user running {{es}})
141-
- `relative_path` to specify a path resolved via the `relative_to` field, which can have the following values:
142-
- `config`: the {{es}} [config directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html#config-files-location)
143-
- `data`: the {{es}} [data directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/path-settings-overview.html)
144-
- `home`: the home directory of the user running {{es}}
145-
- `path_setting` to specify a path defined via an {{es}} setting. The path can be absolute or relative; in the latter case, the path will be resolved using the `basedir_if_relative` path (which can assume the same values as `relative_to`)
139+
1. `path` to specify an absolute path
140+
2. `relative_path` to specify a relative path. Use the `relative_to` field to qualify the relative path. `relative_to` accepts the following options:
141+
- `config`: the {{es}} [config directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html#config-files-location)
142+
- `data`: the {{es}} [data directory](https://www.elastic.co/guide/en/elasticsearch/reference/current/path-settings-overview.html)
143+
- `home`: the home directory of the user running {{es}}
144+
3. `path_setting` to specify a path defined via an {{es}} setting. The path can be absolute or relative; in the latter case, the path will be resolved using the `basedir_if_relative` path (which can assume the same values as `relative_to`)
146145

147146
Each of the 3 types has some additional fields:
148147
- `mode` (required): can be either `read` or `read_write`

docs/reference/elasticsearch/index-settings/index-block.md

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,106 @@ The API returns following response:
143143
}
144144
```
145145

146+
147+
## Remove index block API [remove-index-block]
148+
149+
Removes an index block from an index.
150+
151+
```console
152+
DELETE /my-index-000001/_block/write
153+
```
154+
155+
156+
### {{api-request-title}} [remove-index-block-api-request]
157+
158+
`DELETE /<index>/_block/<block>`
159+
160+
161+
### {{api-path-parms-title}} [remove-index-block-api-path-params]
162+
163+
`<index>`
164+
: (Optional, string) Comma-separated list or wildcard expression of index names used to limit the request.
165+
166+
By default, you must explicitly name the indices you are removing blocks from. To allow the removal of blocks from indices with `_all`, `*`, or other wildcard expressions, change the `action.destructive_requires_name` setting to `false`. You can update this setting in the `elasticsearch.yml` file or using the [cluster update settings](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings) API.
167+
168+
169+
`<block>`
170+
: (Required, string) Block type to remove from the index.
171+
172+
**Valid values**:
173+
174+
`metadata`
175+
: Remove metadata block, allowing metadata changes.
176+
177+
`read`
178+
: Remove read block, allowing read operations.
179+
180+
`read_only`
181+
: Remove read-only block, allowing write operations and metadata changes.
182+
183+
`write`
184+
: Remove write block, allowing write operations.
185+
186+
::::
187+
188+
189+
190+
### {{api-query-parms-title}} [remove-index-block-api-query-params]
191+
192+
`allow_no_indices`
193+
: (Optional, Boolean) If `false`, the request returns an error if any wildcard expression, [index alias](docs-content://manage-data/data-store/aliases.md), or `_all` value targets only missing or closed indices. This behavior applies even if the request targets other open indices. For example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.
194+
195+
Defaults to `true`.
196+
197+
198+
`expand_wildcards`
199+
: (Optional, string) Type of index that wildcard patterns can match. If the request can target data streams, this argument determines whether wildcard expressions match hidden data streams. Supports comma-separated values, such as `open,hidden`. Valid values are:
200+
201+
`all`
202+
: Match any data stream or index, including [hidden](/reference/elasticsearch/rest-apis/api-conventions.md#multi-hidden) ones.
203+
204+
`open`
205+
: Match open, non-hidden indices. Also matches any non-hidden data stream.
206+
207+
`closed`
208+
: Match closed, non-hidden indices. Also matches any non-hidden data stream. Data streams cannot be closed.
209+
210+
`hidden`
211+
: Match hidden data streams and hidden indices. Must be combined with `open`, `closed`, or both.
212+
213+
`none`
214+
: Wildcard patterns are not accepted.
215+
216+
Defaults to `open`.
217+
218+
219+
`ignore_unavailable`
220+
: (Optional, Boolean) If `false`, the request returns an error if it targets a missing or closed index. Defaults to `false`.
221+
222+
`master_timeout`
223+
: (Optional, [time units](/reference/elasticsearch/rest-apis/api-conventions.md#time-units)) Period to wait for the master node. If the master node is not available before the timeout expires, the request fails and returns an error. Defaults to `30s`. Can also be set to `-1` to indicate that the request should never timeout.
224+
225+
`timeout`
226+
: (Optional, [time units](/reference/elasticsearch/rest-apis/api-conventions.md#time-units)) Period to wait for a response from all relevant nodes in the cluster after updating the cluster metadata. If no response is received before the timeout expires, the cluster metadata update still applies but the response will indicate that it was not completely acknowledged. Defaults to `30s`. Can also be set to `-1` to indicate that the request should never timeout.
227+
228+
229+
### {{api-examples-title}} [remove-index-block-api-example]
230+
231+
The following example shows how to remove an index block:
232+
233+
```console
234+
DELETE /my-index-000001/_block/write
235+
```
236+
237+
The API returns following response:
238+
239+
```console-result
240+
{
241+
"acknowledged" : true,
242+
"indices" : [ {
243+
"name" : "my-index-000001",
244+
"unblocked" : true
245+
} ]
246+
}
247+
```
248+

docs/reference/query-languages/esql/_snippets/commands/layout/change_point.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
The `CHANGE_POINT` command requires a [platinum license](https://www.elastic.co/subscriptions).
55
:::
66

7-
::::{warning}
8-
This functionality is in technical preview and may be
9-
changed or removed in a future release. Elastic will work to fix any
10-
issues, but features in technical preview are not subject to the support
11-
SLA of official GA features.
12-
::::
7+
```yaml {applies_to}
8+
serverless: preview
9+
stack: preview 9.1.0
10+
```
1311
1412
`CHANGE_POINT` detects spikes, dips, and change points in a metric.
1513

docs/reference/query-languages/esql/_snippets/commands/layout/lookup-join.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
## `LOOKUP JOIN` [esql-lookup-join]
22

3-
::::{warning}
4-
This functionality is in technical preview and may be
5-
changed or removed in a future release. Elastic will work to fix any
6-
issues, but features in technical preview are not subject to the support
7-
SLA of official GA features.
8-
::::
3+
```yaml {applies_to}
4+
stack: preview 9.0.0, ga 9.1.0
5+
```
96
107
`LOOKUP JOIN` enables you to add data from another index, AKA a 'lookup'
118
index, to your {{esql}} query results, simplifying data enrichment

docs/reference/query-languages/esql/_snippets/commands/layout/sample.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
## `SAMPLE` [esql-sample]
22

33
```yaml {applies_to}
4-
stack: preview 9.1
4+
serverless: preview
5+
stack: preview 9.1.0
56
```
67
78
The `SAMPLE` command samples a fraction of the table rows.

0 commit comments

Comments
 (0)