Skip to content

Commit 8327fe3

Browse files
authored
Merge branch 'main' into 190/manage-existing-indices
2 parents 95dd69e + 1bc324d commit 8327fe3

File tree

28 files changed

+1046
-436
lines changed

28 files changed

+1046
-436
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
.artifacts
33
.DS_store
44

5+
# Jetbrains files
6+
.idea
7+
*.iml
8+
59
# Add LLM/AI related files
610
AGENTS.md
711
.github/copilot-instructions.md

deploy-manage/toc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,8 @@ toc:
609609
- file: users-roles/cluster-or-deployment-auth/granting-privileges-for-data-streams-aliases.md
610610
- file: users-roles/cluster-or-deployment-auth/kibana-role-management.md
611611
- file: users-roles/cluster-or-deployment-auth/role-restriction.md
612-
- file: users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md
612+
- title: "Elasticsearch privileges"
613+
crosslink: elasticsearch://reference/elasticsearch/security-privileges.md
613614
- file: users-roles/cluster-or-deployment-auth/kibana-privileges.md
614615
- file: users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md
615616
children:

deploy-manage/tools/snapshot-and-restore/s3-repository.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ The following list contains the available S3 client settings. Those that must be
125125
`max_retries`
126126
: The number of retries to use when an S3 request fails. The default value is `3`.
127127

128+
`connection_max_idle_time`
129+
: ([time value](elasticsearch://reference/elasticsearch/rest-apis/api-conventions.md#time-units)) The timeout after which {{es}} will close an idle connection. The default value is 60 seconds.
130+
128131
`path_style_access`
129132
: Whether to force the use of the path style access pattern. If `true`, the path style access pattern will be used. If `false`, the access pattern will be automatically determined by the AWS Java SDK (See [AWS documentation](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/s3/AmazonS3Builder.html#setPathStyleAccessEnabled-java.lang.Boolean-) for details). Defaults to `false`.
130133

deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md

Lines changed: 0 additions & 416 deletions
This file was deleted.

docset.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,6 @@ subs:
294294
ece-apis: https://www.elastic.co/docs/api/doc/cloud-enterprise/
295295
intake-apis: https://www.elastic.co/docs/api/doc/observability-serverless/
296296
models-app: "Trained Models"
297-
kube-stack-version: 0.6.3
297+
agent-builder: "Elastic Agent Builder"
298+
kube-stack-version: 0.6.3
299+

explore-analyze/elastic-inference/inference-api.md

Lines changed: 110 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -107,37 +107,132 @@ By default, documents are split into sentences and grouped in sections up to 250
107107

108108
Several strategies are available for chunking:
109109

110-
`sentence`
111-
: The `sentence` strategy splits the input text at sentence boundaries. Each chunk contains one or more complete sentences ensuring that the integrity of sentence-level context is preserved, except when a sentence causes a chunk to exceed a word count of `max_chunk_size`, in which case it will be split across chunks. The `sentence_overlap` option defines the number of sentences from the previous chunk to include in the current chunk which is either `0` or `1`.
110+
#### `sentence`
112111

113-
`word`
114-
: The `word` strategy splits the input text on individual words up to the `max_chunk_size` limit. The `overlap` option is the number of words from the previous chunk to include in the current chunk.
112+
The `sentence` strategy splits the input text at sentence boundaries. Each chunk contains one or more complete sentences ensuring that the integrity of sentence-level context is preserved, except when a sentence causes a chunk to exceed a word count of `max_chunk_size`, in which case it will be split across chunks. The `sentence_overlap` option defines the number of sentences from the previous chunk to include in the current chunk which is either `0` or `1`.
115113

116-
`recursive`{applies_to}`stack: ga 9.1`
117-
: The `recursive` strategy splits the input text based on a configurable list of separator patterns (for example, newlines or Markdown headers). The chunker applies these separators in order, recursively splitting any chunk that exceeds the `max_chunk_size` word limit. If no separator produces a small enough chunk, the strategy falls back to sentence-level splitting.
114+
The following example creates an {{infer}} endpoint with the `elasticsearch` service that deploys the ELSER model and configures the chunking behavior with the `sentence` strategy.
118115

119-
`none` {applies_to}`stack: ga 9.1`
120-
121-
: The `none` strategy disables chunking and processes the entire input text as a single block, without any splitting or overlap. When using this strategy, you can instead [pre-chunk](https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/semantic-text#auto-text-chunking) the input by providing an array of strings, where each element acts as a separate chunk to be sent directly to the inference service without further chunking.
116+
```console
117+
PUT _inference/sparse_embedding/sentence_chunks
118+
{
119+
"service": "elasticsearch",
120+
"service_settings": {
121+
"model_id": ".elser_model_2",
122+
"num_allocations": 1,
123+
"num_threads": 1
124+
},
125+
"chunking_settings": {
126+
"strategy": "sentence",
127+
"max_chunk_size": 100,
128+
"sentence_overlap": 0
129+
}
130+
}
131+
```
122132

123133
The default chunking strategy is `sentence`.
124134

125-
#### Example of configuring the chunking behavior
135+
#### `word`
136+
137+
The `word` strategy splits the input text on individual words up to the `max_chunk_size` limit. The `overlap` option is the number of words from the previous chunk to include in the current chunk.
126138

127-
The following example creates an {{infer}} endpoint with the `elasticsearch` service that deploys the ELSER model by default and configures the chunking behavior.
139+
The following example creates an {{infer}} endpoint with the `elasticsearch` service that deploys the ELSER model and configures the chunking behavior with the `word` strategy, setting a maximum of 120 words per chunk and an overlap of 40 words between chunks.
128140

129141
```console
130-
PUT _inference/sparse_embedding/small_chunk_size
142+
PUT _inference/sparse_embedding/word_chunks
131143
{
132144
"service": "elasticsearch",
133145
"service_settings": {
146+
"model_id": ".elser_model_2",
134147
"num_allocations": 1,
135148
"num_threads": 1
136149
},
137150
"chunking_settings": {
138-
"strategy": "sentence",
139-
"max_chunk_size": 100,
140-
"sentence_overlap": 0
151+
"strategy": "word",
152+
"max_chunk_size": 120,
153+
"overlap": 40
154+
}
155+
}
156+
```
157+
158+
#### `recursive`
159+
160+
```{applies_to}
161+
stack: ga 9.1`
162+
```
163+
164+
The `recursive` strategy splits the input text based on a configurable list of separator patterns (for example, newlines or Markdown headers). The chunker applies these separators in order, recursively splitting any chunk that exceeds the `max_chunk_size` word limit. If no separator produces a small enough chunk, the strategy falls back to sentence-level splitting.
165+
166+
##### Markdown separator group
167+
168+
The following example creates an {{infer}} endpoint with the `elasticsearch` service that deploys the ELSER model and configures chunking with the `recursive` strategy using the markdown separator group and a maximum of 200 words per chunk.
169+
170+
```console
171+
PUT _inference/sparse_embedding/recursive_markdown_chunks
172+
{
173+
"service": "elasticsearch",
174+
"service_settings": {
175+
"model_id": ".elser_model_2",
176+
"num_allocations": 1,
177+
"num_threads": 1
178+
},
179+
"chunking_settings": {
180+
"strategy": "recursive",
181+
"max_chunk_size": 200,
182+
"separator_group": "markdown"
183+
}
184+
}
185+
```
186+
187+
##### Custom separator group
188+
189+
The following example creates an {{infer}} endpoint with the `elasticsearch` service that deploys the ELSER model and configures chunking with the `recursive` strategy. It uses a custom list of separators to split plaintext into chunks of up to 180 words.
190+
191+
192+
```console
193+
PUT _inference/sparse_embedding/recursive_custom_chunks
194+
{
195+
"service": "elasticsearch",
196+
"service_settings": {
197+
"model_id": ".elser_model_2",
198+
"num_allocations": 1,
199+
"num_threads": 1
200+
},
201+
"chunking_settings": {
202+
"strategy": "recursive",
203+
"max_chunk_size": 180,
204+
"separators": [
205+
"^(#{1,6})\\s",
206+
"\\n\\n",
207+
"\\n[-*]\\s",
208+
"\\n\\d+\\.\\s",
209+
"\\n"
210+
]
211+
}
212+
}
213+
```
214+
215+
#### `none`
216+
217+
```{applies_to}
218+
stack: ga 9.1`
219+
```
220+
221+
The `none` strategy disables chunking and processes the entire input text as a single block, without any splitting or overlap. When using this strategy, you can instead [pre-chunk](https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/semantic-text#auto-text-chunking) the input by providing an array of strings, where each element acts as a separate chunk to be sent directly to the inference service without further chunking.
222+
223+
The following example creates an {{infer}} endpoint with the `elasticsearch` service that deploys the ELSER model and disables chunking by setting the strategy to `none`.
224+
225+
```console
226+
PUT _inference/sparse_embedding/none_chunking
227+
{
228+
"service": "elasticsearch",
229+
"service_settings": {
230+
"model_id": ".elser_model_2",
231+
"num_allocations": 1,
232+
"num_threads": 1
233+
},
234+
"chunking_settings": {
235+
"strategy": "none"
141236
}
142237
}
143238
```

manage-data/data-store/data-streams/quickstart-tsds.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ A _time series_ is a sequence of data points collected at regular time intervals
1818
* Access to [{{dev-tools-app}} Console](/explore-analyze/query-filter/tools/console.md) in {{kib}}, or another way to make {{es}} API requests
1919

2020
* Cluster and index permissions:
21-
* [Cluster privilege](/deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md#privileges-list-cluster): `manage_index_templates`
22-
* [Index privileges](/deploy-manage/users-roles/cluster-or-deployment-auth/elasticsearch-privileges.md#privileges-list-indices): `create_doc` and `create_index`
21+
* [Cluster privilege](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-cluster): `manage_index_templates`
22+
* [Index privileges](elasticsearch://reference/elasticsearch/security-privileges.md#privileges-list-indices): `create_doc` and `create_index`
2323

2424
* Familiarity with [time series data stream concepts](time-series-data-stream-tsds.md) and [{{es}} index and search basics](/solutions/search/get-started.md)
2525

release-notes/elastic-observability/index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ To check for security updates, go to [Security announcements for the Elastic sta
2121
% ### Fixes [elastic-observability-next-fixes]
2222
% *
2323

24+
## 9.1.4 [elastic-observability-9.1.4-release-notes]
25+
26+
### Enhancements [elastic-observability-9.1.4-enhancements]
27+
28+
* Save button is disabled in user-specific system prompt flyout when there's no input [#231562]({{kib-pull}}2301562).
29+
30+
2431
## 9.1.3 [elastic-observability-9.1.3-release-notes]
2532

2633
### Fixes [elastic-observability-9.1.3-fixes]

release-notes/elastic-security/index.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ To check for security updates, go to [Security announcements for the Elastic sta
2727

2828
% *
2929

30+
## 9.1.4 [elastic-security-9.1.4-release-notes]
31+
32+
### Features and enhancements [elastic-security-9.1.4-features-enhancements]
33+
* Adds more Linux diagnostic process `ptrace` events.
34+
35+
### Fixes [elastic-security-9.1.4-fixes]
36+
* Fixes a bug where the toggle column functionality only functioned on the **Alerts** page [#234278]({{kib-pull}}234278).
37+
* Fixes a bug where Linux capabilities were included in {{elastic-endpoint}} network events despite being disabled.
38+
* Makes the delivery of {{elastic-endpoint}} command line commands more robust. In rare cases, commands could previously fail due to interprocess communication issues.
39+
3040
## 9.1.3 [elastic-security-9.1.3-release-notes]
3141

3242
### Fixes [elastic-security-9.1.3-fixes]

release-notes/intro/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ navigation_title: Release notes
1212

1313
Stay up to date with the latest changes, fixes, known issues, and deprecations in Elastic products.
1414

15-
Release notes cover the all the latest Elastic product changes, including the following:
15+
Release notes cover all the latest Elastic product changes, including the following:
1616
* {{stack}} {{version.stack.base}} and later, including the most recent {{version.stack}} release
1717
* {{serverless-full}}, including updates to {{es}}, and {{observability}} and {{elastic-sec}} solutions
1818

0 commit comments

Comments
 (0)