Skip to content

Commit 67fc2d0

Browse files
authored
Merge branch 'main' into llm-note-partition
2 parents b6f58de + 3c9faab commit 67fc2d0

38 files changed

+2485
-594
lines changed

deploy-manage/_snippets/field-doc-sec-limitations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ When a user’s role enables document or [field level security](/deploy-manage/u
4040

4141
* The request cache is disabled for search requests if either of the following are true:
4242

43-
* The role query that defines document level security is [templated](/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md#templating-role-query) using a [stored script](/explore-analyze/scripting/modules-scripting-using.md#script-stored-scripts).
43+
* The role query that defines document level security is [templated](/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md#templating-role-query) using a [stored script](/explore-analyze/scripting/modules-scripting-store-and-retrieve.md).
4444
* The target indices are a mix of local and remote indices.

deploy-manage/monitor/autoops/cc-connect-self-managed-to-autoops.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ If you don’t have an existing {{ecloud}} account:
7070
:sync: existing
7171

7272
If you already have an {{ecloud}} account:
73-
1. Log in to [{{ecloud}}](https://cloud.elastic.co?page=docs&placement=docs-body).
73+
1. Log in to [{{ecloud}}](https://cloud.elastic.co/login?redirectTo=%2Fconnect-cluster-services).
74+
- The link provided should take you directly to the **Connect your self-managed cluster** page
7475
2. On your home page, in the **Connected clusters** section, select **Connect self-managed cluster**.
7576
3. On the **Connect your self-managed cluster** page, in the **AutoOps** section, select **Connect**.
7677
4. Go through the installation wizard as detailed in the following sections.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ By default, a snapshot of a cluster contains the cluster state, all regular data
9191
- [Legacy index templates](https://www.elastic.co/guide/en/elasticsearch/reference/8.18/indices-templates-v1.html)
9292
- [Ingest pipelines](/manage-data/ingest/transform-enrich/ingest-pipelines.md)
9393
- [ILM policies](/manage-data/lifecycle/index-lifecycle-management.md)
94-
- [Stored scripts](/explore-analyze/scripting/modules-scripting-using.md#script-stored-scripts)
94+
- [Stored scripts](/explore-analyze/scripting/modules-scripting-store-and-retrieve.md)
9595
- For snapshots taken after 7.12.0, [feature states](#feature-state)
9696

9797
You can also take snapshots of only specific data streams or indices in the cluster. A snapshot that includes a data stream or index automatically includes its aliases. When you restore a snapshot, you can choose whether to restore these aliases.

explore-analyze/alerts-cases/watcher/how-watcher-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Deactivating a watch also enables you to keep it around for future use without d
184184

185185
You can use scripts and templates when defining a watch. Scripts and templates can reference elements in the watch execution context, including the watch payload. The execution context defines variables you can use in a script and parameter placeholders in a template.
186186

187-
{{watcher}} uses the Elasticsearch script infrastructure, which supports [inline](#inline-templates-scripts) and [stored](#stored-templates-scripts). Scripts and templates are compiled and cached by Elasticsearch to optimize recurring execution. Autoloading is also supported. For more information, see [Scripting](../../scripting.md) and [*How to write scripts*](../../scripting/modules-scripting-using.md).
187+
{{watcher}} uses the Elasticsearch script infrastructure, which supports [inline](#inline-templates-scripts) and [stored](#stored-templates-scripts). Scripts and templates are compiled and cached by Elasticsearch to optimize recurring execution. Autoloading is also supported. For more information, see [Scripting](../../scripting.md) and [*How to write Painless scripts*](../../scripting/modules-scripting-using.md).
188188

189189

190190
### Watch execution context [watch-execution-context]
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
navigation_title: ML-nodes vs EIS
3+
applies_to:
4+
stack: ga
5+
serverless: ga
6+
deployment:
7+
self: unavailable
8+
---
9+
10+
# Using ML-nodes or Elastic {{infer-cap}} Service (EIS) [ml-nodes-vs-eis]
11+
12+
## When to use EIS?
13+
14+
The Elastic Inference Service (EIS) requires zero setup or management. It's always-on, has excellent ingest throughput, and uses simple token-based billing.
15+
16+
Use EIS if you're getting started with [semantic search](/solutions/search/semantic-search.md) or [hybrid search](/solutions/search/hybrid-search.md) and want a smooth experience. Under the hood, EIS uses GPUs for ML {{infer}}, which are more efficient and allow a faster, more cost-effective experience for most usecases.
17+
18+
## When to use {{ml}} nodes?
19+
20+
ML nodes are a more configurable solution than EIS where you can set up specific nodes using CPUs to execute [ML {{infer}}](/explore-analyze/elastic-inference/inference-api.md). {{ml-cap}} nodes tend to give more fine-grained control.
21+
22+
Use ML nodes if you want to decide how your models run, you want to run custom models, or you have a self-managed setup.
23+
24+
## How do I switch from using ML nodes to EIS on an existing index?
25+
26+
```{applies_to}
27+
stack: ga 9.3
28+
serverless: ga
29+
```
30+
31+
```console
32+
PUT /my-ml-node-index/_mapping
33+
{
34+
"properties": {
35+
"text": {
36+
"type": "semantic_text",
37+
"inference_id": ".elser-2-elastic"
38+
}
39+
}
40+
}
41+
```
42+
43+
You can also switch an EIS-based index to use ML nodes:
44+
45+
```console
46+
PUT /my-eis-index/_mapping
47+
{
48+
"properties": {
49+
"text": {
50+
"type": "semantic_text",
51+
"inference_id": ".elser-2-elasticsearch"
52+
}
53+
}
54+
}
55+
```

explore-analyze/scripting/common-script-uses.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,19 @@ products:
88
- id: elasticsearch
99
---
1010

11-
# Common scripting use cases [common-script-uses]
11+
# Painless script tutorials [common-script-uses]
1212

13-
You can write a script to do almost anything, and sometimes, that’s the trouble. It’s challenging to know what’s possible with scripts, so the following examples address common uses cases where scripts are really helpful.
14-
15-
* [Field extraction](scripting-field-extraction.md)
13+
You can write a script to do almost anything, and sometimes, that’s the challenge. It’s difficult to know what’s possible with scripts, so these tutorials address common use cases where scripts are particularly helpful.
1614

15+
Painless scripting becomes powerful when applied to real-world scenarios. These tutorials walk you through essential patterns and operations, providing working examples you can modify for your specific use cases.
1716

17+
* [Accessing document fields and special variables](/explore-analyze/scripting/modules-scripting-fields.md)
18+
* [Accessing fields in a document](/explore-analyze/scripting/script-fields-api.md)
19+
* [Converting data types](/explore-analyze/scripting/modules-scripting-type-casting-tutorial.md)
20+
* [Dissecting data](/explore-analyze/scripting/dissect.md)
21+
* [Extracting fields](/explore-analyze/scripting/scripting-field-extraction.md)
22+
* [Grokking grok](/explore-analyze/scripting/grok.md)
23+
* [Scripts, caching, and search speed](/explore-analyze/scripting/scripts-search-speed.md)
24+
* [Updating documents](/explore-analyze/scripting/modules-scripting-document-update-tutorial.md)
25+
* [Using Painless regular expressions](/explore-analyze/scripting/modules-scripting-regular-expressions-tutorial.md)
26+
* [Working with dates](/explore-analyze/scripting/modules-scripting-datetime-tutorial.md)

0 commit comments

Comments
 (0)