Skip to content

Commit e305e4f

Browse files
committed
Merge remote-tracking branch 'origin/main' into eck_gdch
2 parents cdb0a9a + b53de2e commit e305e4f

File tree

15 files changed

+73
-49
lines changed

15 files changed

+73
-49
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/agent-builder-agents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ For an overview, refer to [Agents API](kibana-api.md#agents).
121121

122122
### Serverless API reference
123123

124-
For the complete API reference, refer to the [Kibana serverless API reference](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-agents).
124+
For the complete API reference, refer to the [Kibana API reference](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-agents).

solutions/search/agent-builder/chat.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ For a quick overview of the REST API for conversations, refer to [Chat and conve
6868

6969
### Serverless API reference
7070

71-
For the complete API reference, refer to the [Kibana serverless API reference](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-conversations).
72-
73-
71+
For the complete API reference, refer to the [Kibana API reference](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-conversations).
7472

7573

7674

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/kibana-api.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ applies_to:
1010

1111
# Work with {{agent-builder}} using the APIs
1212

13-
This page provides a quick overview of the main {{kib}} API endpoints for {{agent-builder}}. For complete details including all available parameters, request/response schemas, and error handling, refer to the [{{kib}} serverless API reference](https://www.elastic.co/docs/api/doc/serverless/group/endpoint-agent-builder).
13+
This page provides a quick overview of the main {{kib}} API endpoints for {{agent-builder}}. For complete details including all available parameters, request/response schemas, and error handling, refer to the [{{kib}} API reference](https://www.elastic.co/docs/api/doc/kibana/group/endpoint-agent-builder).
1414

1515
These APIs allow you to programmatically work with the {{agent-builder}} abstractions.
1616

@@ -63,7 +63,7 @@ Dev Tools [Console](/explore-analyze/query-filter/tools/console.md) automaticall
6363

6464
**Example:** List all tools
6565

66-
This example uses the [list tools API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-tools).
66+
This example uses the [list tools API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-tools).
6767

6868
::::{tab-set}
6969
:group: api-examples
@@ -89,7 +89,7 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/tools" \
8989

9090
**Example:** Create a tool
9191

92-
This example uses the [create a tool API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-post-agent-builder-tools).
92+
This example uses the [create a tool API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-post-agent-builder-tools).
9393

9494
::::{tab-set}
9595
:group: api-examples
@@ -155,7 +155,7 @@ curl -X POST "https://${KIBANA_URL}/api/agent_builder/tools" \
155155

156156
**Example:** Get a tool by ID
157157

158-
This example uses the [get a tool by ID API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-tools-id).
158+
This example uses the [get a tool by ID API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-tools-id).
159159

160160
::::{tab-set}
161161
:group: api-examples
@@ -181,7 +181,7 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/tools/{id}" \
181181

182182
**Example:** Delete a tool by ID
183183

184-
This example uses the [delete a tool by ID API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-delete-agent-builder-tools-id).
184+
This example uses the [delete a tool by ID API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-delete-agent-builder-tools-id).
185185

186186
::::{tab-set}
187187
:group: api-examples
@@ -208,7 +208,7 @@ curl -X DELETE "https://${KIBANA_URL}/api/agent_builder/tools/{id}" \
208208

209209
**Example:** Update a tool by ID
210210

211-
This example uses the [update a tool API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-put-agent-builder-tools-toolid).
211+
This example uses the [update a tool API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-put-agent-builder-tools-toolid).
212212

213213
::::{tab-set}
214214
:group: api-examples
@@ -270,7 +270,7 @@ curl -X PUT "https://${KIBANA_URL}/api/agent_builder/tools/{toolId}" \
270270

271271
**Example:** Run a tool
272272

273-
This example uses the [execute a tool API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-post-agent-builder-tools-execute).
273+
This example uses the [execute a tool API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-post-agent-builder-tools-execute).
274274

275275
::::{tab-set}
276276
:group: api-examples
@@ -312,7 +312,7 @@ curl -X POST "https://${KIBANA_URL}/api/agent_builder/tools/_execute" \
312312
313313
**Example:** List all agents
314314
315-
This example uses the [list agents API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-agents).
315+
This example uses the [list agents API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-agents).
316316
317317
::::{tab-set}
318318
:group: api-examples
@@ -338,7 +338,7 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/agents" \
338338
339339
**Example:** Create an agent
340340
341-
This example uses the [create an agent API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-post-agent-builder-agents).
341+
This example uses the [create an agent API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-post-agent-builder-agents).
342342
343343
::::{tab-set}
344344
:group: api-examples
@@ -408,7 +408,7 @@ curl -X POST "https://${KIBANA_URL}/api/agent_builder/agents" \
408408

409409
**Example:** Get an agent by ID
410410

411-
This example uses the [get an agent by ID API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-agents-id).
411+
This example uses the [get an agent by ID API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-agents-id).
412412

413413
::::{tab-set}
414414
:group: api-examples
@@ -434,7 +434,7 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/agents/{id}" \
434434

435435
**Example:** Update an agent by ID
436436

437-
This example uses the [update an agent API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-put-agent-builder-agents-id).
437+
This example uses the [update an agent API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-put-agent-builder-agents-id).
438438

439439
::::{tab-set}
440440
:group: api-examples
@@ -498,7 +498,7 @@ curl -X PUT "https://${KIBANA_URL}/api/agent_builder/agents/{id}" \
498498

499499
**Example:** Delete an agent by ID
500500

501-
This example uses the [delete an agent by ID API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-delete-agent-builder-agents-id).
501+
This example uses the [delete an agent by ID API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-delete-agent-builder-agents-id).
502502

503503
::::{tab-set}
504504
:group: api-examples
@@ -527,7 +527,7 @@ curl -X DELETE "https://${KIBANA_URL}/api/agent_builder/agents/{id}" \
527527

528528
**Example:** Chat with an agent
529529

530-
This example uses the [send chat message API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-post-agent-builder-converse).
530+
This example uses the [send chat message API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-post-agent-builder-converse).
531531

532532
::::{tab-set}
533533
:group: api-examples
@@ -562,7 +562,7 @@ curl -X POST "https://${KIBANA_URL}/api/agent_builder/converse" \
562562

563563
**Example:** Chat with an agent and stream events
564564

565-
This example uses the [send chat message (streaming) API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-post-agent-builder-converse-async).
565+
This example uses the [send chat message (streaming) API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-post-agent-builder-converse-async).
566566

567567
::::{tab-set}
568568
:group: api-examples
@@ -600,7 +600,7 @@ curl -X POST "https://${KIBANA_URL}/api/agent_builder/converse/async" \
600600

601601
**Example:** List conversations
602602

603-
This example uses the [list conversations API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-conversations).
603+
This example uses the [list conversations API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-conversations).
604604

605605
::::{tab-set}
606606
:group: api-examples
@@ -626,7 +626,7 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/conversations" \
626626

627627
**Example:** Get conversation by ID
628628

629-
This example uses the [get conversation by ID API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-conversations-conversation-id).
629+
This example uses the [get conversation by ID API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-conversations-conversation-id).
630630

631631
::::{tab-set}
632632
:group: api-examples
@@ -652,7 +652,7 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/conversations/{conversation
652652

653653
**Example:** Delete conversation by ID
654654

655-
This example uses the [delete conversation by ID API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-delete-agent-builder-conversations-conversation-id).
655+
This example uses the [delete conversation by ID API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-delete-agent-builder-conversations-conversation-id).
656656

657657
::::{tab-set}
658658
:group: api-examples
@@ -707,7 +707,7 @@ Refer to [](a2a-server.md) for more information.
707707

708708
**Example:** Get A2A agent card configuration
709709

710-
This example uses the [get A2A agent card API](https://www.elastic.co/docs/api/doc/serverless/operation/operation-get-agent-builder-a2a-agentid-json).
710+
This example uses the [get A2A agent card API](https://www.elastic.co/docs/api/doc/kibana/operation/operation-get-agent-builder-a2a-agentid-json).
711711

712712
::::{tab-set}
713713
:group: api-examples
@@ -775,4 +775,4 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/a2a/{agentId}.json" \
775775

776776
## API reference
777777

778-
For the full API documentation, refer to the [{{kib}} serverless API reference](https://www.elastic.co/docs/api/doc/serverless/group/endpoint-agent-builder).
778+
For the full API documentation, refer to the [{{kib}} API reference](https://www.elastic.co/docs/api/doc/kibana/group/endpoint-agent-builder).

0 commit comments

Comments
 (0)