Skip to content

Commit 2630b79

Browse files
committed
Merge remote-tracking branch 'origin/main' into remote_clusters_snippets2
2 parents 2b4b25c + 47e8150 commit 2630b79

File tree

11 files changed

+50
-24
lines changed

11 files changed

+50
-24
lines changed

deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Subscribe to {{ecloud}} directly from the Google Cloud Platform (GCP). You then
1616

1717
Some differences exist when you subscribe to {{ecloud}} through the GCP Marketplace:
1818

19-
* New customers {{ecloud}} obtain a 7-day trial period. During this period, you can use a single deployment and three projects of {{ecloud}}. After this period, usage-based billing starts, unless you delete your cloud resources. Note that once customers unsubscribe from the GCP offer, their trial will end immediately. Even if they resubscribe, they will not be able to resume the trial.
19+
* New {{ecloud}} customers obtain a 7-day trial period. During this period, you can use a single deployment and three projects of {{ecloud}}. After this period, usage-based billing starts, unless you delete your cloud resources. Note that once customers unsubscribe from the GCP offer, their trial will end immediately. Even if they resubscribe, they will not be able to resume the trial.
2020
* Pricing for an {{ecloud}} subscription through the GCP Marketplace follows the pricing outlined on the [{{ecloud}}](https://console.cloud.google.com/marketplace/product/endpoints/elasticsearch-service.gcpmarketplace.elastic.co) page in the GCP Marketplace. Pricing is based the {{ecloud}} [billing dimensions](../../cloud-organization/billing.md#pricing-model).
2121
* To access your billing information at any time go to **Account & Billing**. You can also go to **Account & Billing** and then **Usage** to view your usage hours and units per hour.
2222

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
| Region | Name |
22
| --- | --- |
3-
| us-east-2 | Ohio |
4-
| eu-west-1 | Ireland |
5-
| ap-northeast-1 | Tokyo |
3+
| us-east-2 | US East (Ohio) |
4+
| eu-west-1 | EU (Ireland) |
5+
| ap-northeast-1 | Asia Pacific (Tokyo) |
66

7-
More regions are coming soon.
7+
More regions are coming soon.

explore-analyze/dashboards/create-dashboard-of-panels-with-ecommerce-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ When you’re done, you’ll have a complete overview of the sample web logs dat
2121

2222
## Add the data and create the dashboard [add-the-data-and-create-the-dashboard-advanced]
2323

24-
Add the sample eCommerce data, and create and set up the dashboard.
24+
Add the sample eCommerce data, and set up the dashboard.
2525

2626
1. [Install the eCommerce sample data set](../index.md#gs-get-data-into-kibana).
2727
2. Go to **Dashboards**.

explore-analyze/elastic-inference/eis.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ This is particularly relevant when using the [_bulk API](https://www.elastic.co/
5353

5454
## Pricing
5555

56-
All models on EIS incur a charge per million tokens. The pricing details are at our [Pricing page](https://www.elastic.co/pricing/serverless-search) for the Elastic Managed LLM and ELSER.
56+
All models on EIS incur a charge per million tokens. The pricing details are at our [Pricing page](https://www.elastic.co/pricing/serverless-search) for the Elastic Managed LLM and ELSER.
57+
58+
Note that this pricing models differs from the existing [Machine Learning Nodes](https://www.elastic.co/docs/explore-analyze/machine-learning/data-frame-analytics/ml-trained-models), which is billed via VCUs consumed.
5759

5860
## Rate Limits
5961

reference/fleet/elastic-agent-standalone-logging-config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ agent.logging.files:
2929
3030
You can specify the following settings in the Logging section of the `elastic-agent.yml` config file.
3131

32-
Some outputs will log raw events on errors like indexing errors in the Elasticsearch output, to prevent logging raw events (that may contain sensitive information) together with other log messages, a different log file, only for log entries containing raw events, is used. It will use the same level, selectors and all other configurations from the default logger, but it will have it’s own file configuration.
32+
Some outputs will log raw events on errors like indexing errors in the Elasticsearch output, to prevent logging raw events (that may contain sensitive information) together with other log messages, a different log file, only for log entries containing raw events, is used. It will use the same level, selectors and all other configurations from the default logger, but it will have its own file configuration.
3333

3434
Having a different log file for raw events also prevents event data from drowning out the regular log files. Use `agent.logging.event_data` to configure the events logger.
3535

release-notes/elastic-observability/known-issues.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,38 @@ After upgrading a cluster, Collector and Symbolizer endpoints may not be configu
156156
DELETE kbn:/api/fleet/package_policies/<elastic-universal-profiling-symbolizer-id>?force=true
157157
```
158158
159+
::::
160+
161+
:::{dropdown} Error when using the Opentelemetry onboarding flow using EDOT Collector
162+
Applies to: {{stack}} 9.1.6, 9.2.0
163+
164+
**Details**
165+
166+
Users trying to collect logs and host metrics using the Elastic distribution of the OTel collector will see error when using the OpenTelemetry quickstart onboarding flow:
167+
168+
```
169+
> sudo ./otelcol --config otel.yml
170+
171+
Starting in otel mode
172+
failed to get config: cannot unmarshal the configuration: decoding failed due to the following error(s):
173+
174+
'exporters' error reading configuration for "otlp/ingest": decoding failed due to the following error(s):
175+
176+
'sending_queue' decoding failed due to the following error(s):
177+
178+
'batch' decoding failed due to the following error(s):
179+
180+
'' has invalid keys: flush_interval
181+
182+
```
183+
184+
**Workaround**
185+
186+
To work around this issue, manually update the configuration of the generated `otel.yaml` file to replace incorrect key `flush_interval` with the correct key `flush_timeout`.
187+
188+
```yaml
189+
batch:
190+
flush_timeout: 1s
191+
```
159192
160193
::::

solutions/search/agent-builder/get-started.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,19 @@ You can set up a new [space](/deploy-manage/manage-spaces.md) to use the solutio
2626

2727
:::::{step} Enable {{agent-builder}}
2828

29-
30-
<!--
31-
32-
TODO: uncomment once default enabled is live on serverless
33-
3429
::::{applies-switch}
3530

3631
:::{applies-item} { "serverless": "preview", "elasticsearch" }
3732

3833
{{agent-builder}} is enabled by default in serverless {{es}} projects.
3934

40-
Find **Agents** in the navigation menu to begin using the feature, or search for **Agents** in the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
35+
Find **Agents** in the navigation menu to begin using the feature, or search for **Agents** in the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
4136

4237
:::
4338

4439
:::{applies-item} stack: preview 9.2
45-
-->
46-
You have to enable {{agent-builder}} to get started.
40+
41+
You have to enable {{agent-builder}} to get started on non-serverless deployments.
4742

4843
You can enable the features using the UI:
4944

solutions/search/agent-builder/models.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ applies_to:
1010

1111
# Using different models in {{agent-builder}}
1212

13-
:::{important}
14-
Due to phased rollout, the ability to use different models may not be immediately available in your project.
15-
:::
16-
1713
{{agent-builder}} uses large language models (LLMs) to power agent reasoning and decision-making. By default, agents use the Elastic Managed LLM, but you can configure other models through Kibana connectors.
1814

1915
## Default model configuration

solutions/security/ai/ai-assistant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ System Prompts and Quick Prompts can also be [configured](#configure-ai-assistan
125125
Be sure to specify which language you’d like AI Assistant to use when writing a query. For example: "Can you generate an Event Query Language query to find four failed logins followed by a successful login?"
126126

127127
::::{tip}
128-
AI Assistant can remember particular information you tell it to remember. For example, you could tell it: "When anwering any question about srv-win-s1-rsa or an alert that references it, mention that this host is in the New York data center". This will cause it to remember the detail you highlighted.
128+
AI Assistant can remember particular information you tell it to remember. For example, you could tell it: "When answering any question about srv-win-s1-rsa or an alert that references it, mention that this host is in the New York data center". This will cause it to remember the detail you highlighted.
129129
::::
130130

131131
## Share conversations

solutions/security/detect-and-alert/prebuilt-rules-update-modified-unmodified.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ This table describes statuses that might appear for rule fields being updated.
8282
| **Ready for update** | Displays when there are no conflicts to resolve.<br><br>Further action is not required for the field. It is ready to be updated.<br> |
8383
| **No update** | Displays when the field is not being updated by Elastic, but the current field value differs from the original one. This typically happens when the field's value was changed after the prebuilt rule was initially installed.<br><br>Further action is not required for the field. It is ready to be updated.<br><br> **Tip**: You can still change the final field update, if needed. To do so, make your changes in the **Final update** section and save them.<br><br> |
8484
| **Review required** | Displays when Elastic auto-resolves a conflict between the current field value and the value from the incoming Elastic update.<br><br>You must accept or edit the field's final update and save the changes. Refer to [Resolve and reduce update conflicts](/solutions/security/detect-and-alert/prebuilt-rules-update-modified-unmodified.md#resolve-reduce-rule-conflicts) to learn more about auto-resolved conflicts and how to reduce future conflicts.<br> |
85-
| **Action required** | Displays when Elastic could not auto-resolve the conflict between the current field value and the value from the incoming Elastic update.<br><br>You must manually set and save the field's final update. Refer to Refer to [Resolve and reduce update conflicts](/solutions/security/detect-and-alert/prebuilt-rules-update-modified-unmodified.md#resolve-reduce-rule-conflicts) to learn more about conflicts that need manual fixes and how to reduce future conflicts.<br> |
85+
| **Action required** | Displays when Elastic could not auto-resolve the conflict between the current field value and the value from the incoming Elastic update.<br><br>You must manually set and save the field's final update. Refer to [Resolve and reduce update conflicts](/solutions/security/detect-and-alert/prebuilt-rules-update-modified-unmodified.md#resolve-reduce-rule-conflicts) to learn more about conflicts that need manual fixes and how to reduce future conflicts.<br> |
8686

8787

8888
## Resolve and reduce update conflicts [resolve-reduce-rule-conflicts]
@@ -107,4 +107,4 @@ If Elastic can't resolve a conflict, you must manually fix it before updating th
107107

108108
3. Click **Save and accept** to apply your changes. The field's status changes to `Ready for update`.
109109

110-
After you've resolved the remaining conflicts, click **Update rule** to accept the changes and install the updated version.
110+
After you've resolved the remaining conflicts, click **Update rule** to accept the changes and install the updated version.

0 commit comments

Comments
 (0)