Skip to content

Commit fe45164

Browse files
authored
Merge branch 'main' into data-lifecycle-tags
2 parents fdfe0e6 + d92b0a8 commit fe45164

File tree

3 files changed

+12
-75
lines changed

3 files changed

+12
-75
lines changed

deploy-manage/deploy/elastic-cloud/create-an-organization.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ A deployment lets you explore Elastic solutions for Search, Observability, and S
4141

4242
For more information, check the [{{ech}} documentation](cloud-hosted.md).
4343

44-
**One serverless project**
44+
**Three {{serverless-short}} project**
4545

46-
Serverless projects package {{stack}} features by type of solution:
46+
{{serverless-short}} projects package {{stack}} features by type of solution:
4747

4848
* [{{es}}](../../../solutions/search.md)
4949
* [Observability](../../../solutions/observability.md)
@@ -56,7 +56,7 @@ For more information, check the [{{serverless-short}} documentation](serverless.
5656

5757
### Trial limitations [general-sign-up-trial-what-limits-are-in-place-during-a-trial]
5858

59-
During the free 14 day trial, Elastic provides access to one hosted deployment and one serverless project. If all you want to do is try out Elastic, the trial includes more than enough to get you started. During the trial period, some limitations apply.
59+
During the free 14 day trial, Elastic provides access to one hosted deployment and three {{serverless-short}} projects. If all you want to do is try out Elastic, the trial includes more than enough to get you started. During the trial period, some limitations apply.
6060

6161
**Hosted deployments**
6262

@@ -70,10 +70,10 @@ For more information, check the [{{ech}} documentation](cloud-hosted.md).
7070

7171
**Serverless projects**
7272

73-
* You can have one active serverless project at a time.
73+
* You can have three active {{serverless-short}} projects at a time.
7474
* Search Power is limited to 100. This setting only exists in {{es-serverless}} projects
7575
* Search Boost Window is limited to 7 days. This setting only exists in {{es-serverless}} projects
76-
* Scaling is limited for serverless projects in trials. Failures might occur if the workload requires memory or compute beyond what the above search power and search boost window setting limits can provide.
76+
* Scaling is limited for {{serverless-short}} projects in trials. Failures might occur if the workload requires memory or compute beyond what the above search power and search boost window setting limits can provide.
7777
* We monitor token usage per account for the Elastic Managed LLM. If an account uses over one million tokens in 24 hours, we will inform you and then disable access to the LLM. This is in accordance with our fair use policy for trials.
7878

7979
**Remove limitations**
@@ -95,7 +95,7 @@ Start by checking out some common approaches for [moving data into {{ecloud}}](/
9595

9696
### Maintain access to your trial projects and data [general-sign-up-trial-what-happens-at-the-end-of-the-trial]
9797

98-
When your trial expires, the deployment and project that you created during the trial period are suspended until you subscribe to [{{ecloud}}](/deploy-manage/cloud-organization/billing/add-billing-details.md). When you subscribe, you are able to resume your deployment and serverless project, and regain access to the ingested data. After your trial expires, you have 30 days to subscribe. After 30 days, your deployment, serverless project, and ingested data are permanently deleted.
98+
When your trial expires, the deployment and projects that you created during the trial period are suspended until you subscribe to [{{ecloud}}](/deploy-manage/cloud-organization/billing/add-billing-details.md). When you subscribe, you are able to resume your deployment and {{serverless-short}} projects, and regain access to the ingested data. After your trial expires, you have 30 days to subscribe. After 30 days, your deployment, {{serverless-short}} projects, and ingested data are permanently deleted.
9999

100100
If you’re interested in learning more ways to subscribe to {{ecloud}}, don’t hesitate to [contact us](https://www.elastic.co/contact).
101101

solutions/observability/llm-performance-matrix.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Models from third-party LLM providers.
3737
| Google Gemini | **Gemini 2.5 Flash** | Excellent | Good | Excellent | Excellent | Excellent | Great | Good | Excellent |
3838
| Google Gemini | **Gemini 2.5 Pro** | Excellent | Great | Excellent | Excellent | Excellent | Great | Good | Excellent |
3939
| OpenAI | **GPT-4.1** | Excellent | Excellent | Excellent | Excellent | Excellent | Great | Good | Excellent |
40+
| OpenAI | **GPT-5** | Excellent | Excellent | Excellent | Excellent | Excellent | Excellent | Good | Excellent |
4041

4142

4243
## Open-source models [_open_source_models]

solutions/search/agent-builder/kibana-api.md

Lines changed: 5 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -677,38 +677,15 @@ curl -X DELETE "https://${KIBANA_URL}/api/agent_builder/conversations/{conversat
677677

678678
::::
679679

680-
### MCP server API
680+
### Get A2A agent card configuration
681681

682-
Refer to [](mcp-server.md) for more information.
683-
684-
Communicate with the MCP server using JSON-RPC 2.0.
685-
686-
```bash
687-
curl -X POST "https://${KIBANA_URL}/api/agent_builder/mcp" \
688-
-H "Authorization: ApiKey ${API_KEY}" \
689-
-H "Content-Type: application/json" \
690-
-H "Accept: application/json" \
691-
-H "kbn-xsrf: true" \
692-
-d '{
693-
"jsonrpc": "2.0",
694-
"id": 1,
695-
"method": "tools/list"
696-
}'
697-
```
698-
If you're using Spaces, you need to prefix `/api/agent_builder` with `/s/<space_name>`. Refer to [Working with Spaces](#working-with-spaces).
699-
700-
:::{note}
701-
This endpoint uses the JSON-RPC protocol. The MCP server is used by AI clients like Claude Desktop, Cursor, and VS Code extensions to access your Elastic tools. Use this {{kib}} API endpoint for testing MCP connectivity or debugging protocol communication. This endpoint requires JSON-RPC formatting and does not work from the Dev Tools Console.
682+
:::{important}
683+
You shouldn't use the REST APIs to interact with the A2A endpoint, apart from getting the A2A agent card configuration.
684+
Refer to [](a2a-server.md) for more information about using the A2A protocol.
702685
:::
703686

704-
### A2A protocol
705-
706-
Refer to [](a2a-server.md) for more information.
707-
708687
**Example:** Get A2A agent card configuration
709688

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).
711-
712689
::::{tab-set}
713690
:group: api-examples
714691

@@ -732,47 +709,6 @@ curl -X GET "https://${KIBANA_URL}/api/agent_builder/a2a/{agentId}.json" \
732709
::::
733710

734711

735-
% TODO: Execute A2A agent task section - commented out until ready
736-
% Execute A2A agent task
737-
% ::::{tab-set}
738-
% :group: api-examples
739-
%
740-
% :::{tab-item} Console
741-
% :sync: console
742-
% :::{note}
743-
% This endpoint uses the JSON-RPC protocol, which cannot be executed in the Dev Tools Console.
744-
% Use curl or another HTTP client.
745-
% :::
746-
%
747-
% :::{tab-item} curl
748-
% :sync: curl
749-
% ```bash
750-
% curl -X POST "https://${KIBANA_URL}/api/agent_builder/a2a/{agentId}" \
751-
% -H "Authorization: ApiKey ${API_KEY}" \
752-
% -H "kbn-xsrf: true" \
753-
% -H "Content-Type: application/json" \
754-
% -d '{
755-
% "jsonrpc": "2.0",
756-
% "method": "complete",
757-
% "params": {
758-
% "messages": [
759-
% {
760-
% "role": "user",
761-
% "content": "Hello from A2A protocol"
762-
% }
763-
% ]
764-
% },
765-
% "id": "task-123"
766-
% }'
767-
% ```
768-
% :::
769-
%
770-
% ::::
771-
772-
773-
774-
775-
776712
## API reference
777713

778-
For the full API documentation, refer to the [{{kib}} API reference](https://www.elastic.co/docs/api/doc/kibana/group/endpoint-agent-builder).
714+
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)