Skip to content

Commit 67ddd9c

Browse files
authored
Merge branch 'main' into bootstrap-entitlements-for-testing
2 parents b5d3088 + 126e8cc commit 67ddd9c

File tree

163 files changed

+4007
-2278
lines changed

Some content is hidden

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

163 files changed

+4007
-2278
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/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/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.

docs/reference/query-languages/esql/_snippets/lists/processing-commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* [`GROK`](../../commands/processing-commands.md#esql-grok)
77
* [`KEEP`](../../commands/processing-commands.md#esql-keep)
88
* [`LIMIT`](../../commands/processing-commands.md#esql-limit)
9-
* [preview] [`LOOKUP JOIN`](../../commands/processing-commands.md#esql-lookup-join)
9+
* [`LOOKUP JOIN`](../../commands/processing-commands.md#esql-lookup-join)
1010
* [preview] [`MV_EXPAND`](../../commands/processing-commands.md#esql-mv_expand)
1111
* [`RENAME`](../../commands/processing-commands.md#esql-rename)
1212
* [preview] [`SAMPLE`](../../commands/processing-commands.md#esql-sample)

docs/reference/query-languages/esql/esql-metadata-fields.md

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,40 @@ mapped_pages:
66

77
# {{esql}} metadata fields [esql-metadata-fields]
88

9+
{{esql}} can access [metadata fields](/reference/elasticsearch/mapping-reference/document-metadata-fields.md).
910

10-
{{esql}} can access [metadata fields](/reference/elasticsearch/mapping-reference/document-metadata-fields.md). The currently supported ones are:
11-
12-
* [`_index`](/reference/elasticsearch/mapping-reference/mapping-index-field.md): the index to which the document belongs. The field is of the type [keyword](/reference/elasticsearch/mapping-reference/keyword.md).
13-
* [`_id`](/reference/elasticsearch/mapping-reference/mapping-id-field.md): the source document’s ID. The field is of the type [keyword](/reference/elasticsearch/mapping-reference/keyword.md).
14-
* `_version`: the source document’s version. The field is of the type [long](/reference/elasticsearch/mapping-reference/number.md).
15-
* [`_ignored`](/reference/elasticsearch/mapping-reference/mapping-ignored-field.md): the ignored source document fields. The field is of the type [keyword](/reference/elasticsearch/mapping-reference/keyword.md).
16-
* `_score`: when enabled, the final score assigned to each row matching an ES|QL query. Scoring will be updated when using [full text search functions](/reference/query-languages/esql/functions-operators/search-functions.md).
17-
18-
To enable the access to these fields, the [`FROM`](/reference/query-languages/esql/commands/source-commands.md#esql-from) source command needs to be provided with a dedicated directive:
11+
To access these fields, use the `METADATA` directive with the [`FROM`](/reference/query-languages/esql/commands/source-commands.md#esql-from) source command. For example:
1912

2013
```esql
2114
FROM index METADATA _index, _id
2215
```
2316

24-
Metadata fields are only available if the source of the data is an index. Consequently, `FROM` is the only source commands that supports the `METADATA` directive.
17+
## Available metadata fields
18+
19+
The following metadata fields are available in {{esql}}:
20+
21+
| Metadata field | Type | Description |
22+
|---------------|------|-------------|
23+
| [`_id`](/reference/elasticsearch/mapping-reference/mapping-id-field.md) | [keyword](/reference/elasticsearch/mapping-reference/keyword.md) | Unique document ID. |
24+
| [`_ignored`](/reference/elasticsearch/mapping-reference/mapping-ignored-field.md) | [keyword](/reference/elasticsearch/mapping-reference/keyword.md) | Names every field in a document that was ignored when the document was indexed. |
25+
| [`_index`](/reference/elasticsearch/mapping-reference/mapping-index-field.md) | [keyword](/reference/elasticsearch/mapping-reference/keyword.md) | Index name. |
26+
| `_index_mode` | [keyword](/reference/elasticsearch/mapping-reference/keyword.md) | [Index mode](/reference/elasticsearch/index-settings/index-modules.md#index-mode-setting). For example: `standard`, `lookup`, or `logsdb`. |
27+
| `_score` | [`float`](/reference/elasticsearch/mapping-reference/number.md) | Query relevance score (when enabled). Scores are updated when using [full text search functions](/reference/query-languages/esql/functions-operators/search-functions.md). |
28+
| [`_source`](/reference/elasticsearch/mapping-reference/mapping-source-field.md) | Special `_source` type | Original JSON document body passed at index time (or a reconstructed version if [synthetic `_source`](/reference/elasticsearch/mapping-reference/mapping-source-field.md#synthetic-source) is enabled). |
29+
| `_version` | [`long`](/reference/elasticsearch/mapping-reference/number.md) | Document version number |
30+
31+
## Usage and limitations
32+
33+
- Metadata fields are only available when the data source is an index
34+
- The `_source` type is not supported by functions
35+
- Only the `FROM` command supports the `METADATA` directive
36+
- Once enabled, metadata fields work like regular index fields
37+
38+
## Examples
2539

26-
Once enabled, these fields will be available to subsequent processing commands, just like other index fields:
40+
### Basic metadata usage
41+
42+
Once enabled, metadata fields are available to subsequent processing commands, just like other index fields:
2743

2844
```esql
2945
FROM ul_logs, apps METADATA _index, _version
@@ -40,6 +56,8 @@ FROM ul_logs, apps METADATA _index, _version
4056
| 14 | apps | 1 | apps_14 |
4157
| 14 | ul_logs | 1 | ul_logs_14 |
4258

59+
### Metadata fields and aggregations
60+
4361
Similar to index fields, once an aggregation is performed, a metadata field will no longer be accessible to subsequent commands, unless used as a grouping field:
4462

4563
```esql
@@ -51,3 +69,15 @@ FROM employees METADATA _index, _id
5169
| --- | --- |
5270
| 10100 | employees |
5371

72+
### Sort results by search score
73+
74+
```esql
75+
FROM products METADATA _score
76+
| WHERE MATCH(description, "wireless headphones")
77+
| SORT _score DESC
78+
| KEEP name, description, _score
79+
```
80+
81+
:::{tip}
82+
Refer to [{{esql}} for search](docs-content://solutions/search/esql-for-search.md#esql-for-search-scoring) for more information on relevance scoring and how to use `_score` in your queries.
83+
:::

0 commit comments

Comments
 (0)