Skip to content

Commit 423acbb

Browse files
authored
Merge branch 'main' into 2850-security-advancedsetting-enableGraphVisualization
2 parents 33fc113 + 24e0dfb commit 423acbb

File tree

12 files changed

+44
-132
lines changed

12 files changed

+44
-132
lines changed

redirects.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ redirects:
343343
'release-notes/fleet-elastic-agent/breaking-changes.md': 'fleet-server://release-notes/breaking-changes.md'
344344
'release-notes/fleet-elastic-agent/deprecations.md': 'fleet-server://release-notes/deprecations.md'
345345
'release-notes/fleet-elastic-agent/known-issues.md': 'fleet-server://release-notes/known-issues.md'
346+
346347
# Redirects `path_prefix`
347348
'release-notes/fleet/index.md': 'fleet-server://release-notes/index.md'
348349
'release-notes/fleet/breaking-changes.md': 'fleet-server://release-notes/breaking-changes.md'
@@ -351,4 +352,7 @@ redirects:
351352

352353
# Related to https://github.com/elastic/docs-content/issues/2985
353354

354-
'troubleshoot/observability/apm-agent-swift/apm-ios-agent.md': 'troubleshoot/ingest/opentelemetry/edot-sdks/ios/index.md'
355+
'troubleshoot/observability/apm-agent-swift/apm-ios-agent.md': 'troubleshoot/ingest/opentelemetry/edot-sdks/ios/index.md'
356+
357+
# Related to https://github.com/elastic/docs-content/pull/2843
358+
'solutions/search/serverless-elasticsearch-get-started.md': 'solutions/search/get-started.md'
-86.2 KB
Binary file not shown.
-191 KB
Binary file not shown.

solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ products:
1717

1818
Before setting up observability for Kubernetes, make sure you have the following:
1919

20-
- Elastic Stack (self-managed or [Elastic Cloud](https://www.elastic.co/cloud)) version 8.16.0 or higher, or an [{{es}} serverless](/solutions/search/serverless-elasticsearch-get-started.md) project.
20+
- Elastic Stack (self-managed or [Elastic Cloud](https://www.elastic.co/cloud)) version 8.16.0 or higher, or an [{{es-serverless}}](/solutions/search.md#elasticsearch-serverless) project.
2121

2222
- A Kubernetes version supported by the OpenTelemetry Operator. Refer to the operator's [compatibility matrix](https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/compatibility.md#compatibility-matrix) for more details.
2323

solutions/search.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,23 @@ Here are a few common real-world applications:
3030
| **Chatbots/RAG** | Enable natural conversations, provide context, maintain knowledge | Vector search, ML models, knowledge base integration |
3131
| **Geospatial search** | Process location queries, sort by proximity, filter by area | Geo-mapping, spatial indexing, distance calculations |
3232

33+
## {{es-serverless}} [elasticsearch-serverless]
34+
```{applies_to}
35+
serverless:
36+
elasticsearch: ga
37+
```
3338

39+
{{es-serverless}} is one of the three available project types on [{{serverless-full}}](/deploy-manage/deploy.md).
40+
41+
This project type enables you to use the core functionality of {{es}}: searching, indexing, storing, and analyzing data of all shapes and sizes.
42+
43+
When using {{es}} on {{serverless-full}} you don’t need to worry about managing the infrastructure that keeps {{es}} distributed and available: nodes, shards, and replicas. These resources are completely automated on the serverless platform, which is designed to scale up and down with your workload.
44+
This automation allows you to focus on building your search applications and solutions.
45+
46+
::::{tip}
47+
Not sure whether {{es}} on {{serverless-full}} is the right deployment choice for you?
48+
49+
Check out the following resources to help you decide:
50+
- [What’s different?](/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md): Understand the differences between {{serverless-full}} and other deployment types.
51+
- [Billing](/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md): Learn about the billing model for {{es}} on {{serverless-full}}.
52+
::::

solutions/search/agent-builder/mcp-server.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,26 @@ The MCP server is available at:
2929
Most MCP clients (such as Claude Desktop, Cursor, VS Code, etc.) have similar configuration patterns. To connect to your Elastic instance, you'll need to provide your Kibana URL and API key in the client's configuration file, typically in the following format:
3030

3131
```json
32+
3233
{
3334
"mcpServers": {
3435
"elastic-agent-builder": {
3536
"command": "npx",
36-
"args": ["@elastic/agent-builder-mcp"],
37+
"args": [
38+
"mcp-remote",
39+
"<YOUR_KIBANA_URL>/api/agent_builder/mcp",
40+
"--header",
41+
"Authorization:${AUTH_HEADER}"
42+
],
3743
"env": {
38-
"KIBANA_URL": "<YOUR_KIBANA_URL>",
39-
"API_KEY": "<YOUR_API_KEY>"
44+
"AUTH_HEADER": "ApiKey <YOUR_API_KEY>"
4045
}
4146
}
42-
}
4347
}
4448
```
4549

4650
:::{note}
4751
Replace `<YOUR_KIBANA_URL>` with your actual Kibana URL and `<YOUR_API_KEY>` with your API key. For information on generating API keys, see [API keys](https://www.elastic.co/docs/solutions/search/search-connection-details).
52+
53+
Tools will be executed with the scope assigned to the API key. Make sure your API key has the appropriate permissions to only access the indices and data that you want to expose via the MCP server.
4854
:::

solutions/search/get-started.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ If you're looking for an introduction to the {{stack}} or the {{es}} product, go
2525
:::::{step} Choose your deployment type
2626

2727
Elastic provides several self-managed and Elastic-managed options.
28-
For simplicity and speed, try out [{{es-serverless}}](/solutions/search/serverless-elasticsearch-get-started.md):
28+
For simplicity and speed, try out [{{es-serverless}}](/solutions/search.md#elasticsearch-serverless):
2929

3030
::::{dropdown} Create an {{es-serverless}} project
3131
:::{include} /deploy-manage/deploy/_snippets/create-serverless-project-intro.md
@@ -64,8 +64,9 @@ To learn about adding data for other search goals, go to [](/solutions/search/in
6464
For a broader overview of ingestion options, go to [](/manage-data/ingest.md).
6565

6666
If you're not ready to add your own data, you can use [sample data](/manage-data/ingest/sample-data.md) or create small data sets when you follow the instructions in the [quickstarts](/solutions/search/get-started/quickstarts.md).
67-
:::::
6867

68+
The {{es}} home page in the UI also provides workflow guides for creating indices and ready-to-use code examples for ingesting data by using REST APIs.
69+
:::::
6970
:::::{{step}} Build your search queries
7071

7172
Your next steps will be to choose a method to write queries and interact with {{es}}.

solutions/search/get-started/keyword-search-python.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ To follow the steps, you must have a recent version of a Python interpreter.
2929

3030
Choose the {{es}} project type and provide a name.
3131
You can optionally edit the project settings, such as the [region](/deploy-manage/deploy/elastic-cloud/regions.md).
32+
33+
To add the sample data in subsequent steps, you must have a `developer` or `admin` predefined role or an equivalent custom role.
34+
To learn about role-based access control, go to [](/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md).
3235
::::
3336
::::{step} Create an index
3437

solutions/search/get-started/semantic-search.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ By playing with a simple use case, you'll take the first steps toward understand
2222

2323
## Prerequisites
2424

25-
- If you're using [{{es-serverless}}](/solutions/search/serverless-elasticsearch-get-started.md), you must have a `developer` or `admin` predefined role or an equivalent custom role to add the sample data.
25+
- If you're using {{es-serverless}}, you must have a `developer` or `admin` predefined role or an equivalent custom role to add the sample data.
2626
- If you're using [{{ech}}](/deploy-manage/deploy/elastic-cloud/cloud-hosted.md) or [running {{es}} locally](/deploy-manage/deploy/self-managed/local-development-installation-quickstart.md), start {{es}} and {{kib}}. To add the sample data, log in with a user that has the `superuser` built-in role.
2727

2828
To learn about role-based access control, check out [](/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md).

solutions/search/ingest-for-search.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ products:
1111
- id: elasticsearch
1212
- id: cloud-serverless
1313
---
14-
1514
# Ingest for search use cases
1615

1716
$$$elasticsearch-ingest-time-series-data$$$
@@ -45,8 +44,8 @@ You can use these specialized tools to add general content to {{es}} indices.
4544

4645
| Method | Description | Notes |
4746
|--------|-------------|-------|
48-
| [**Web crawler**](https://github.com/elastic/crawler) | Programmatically discover and index content from websites and knowledge bases | Crawl public-facing web content or internal sites accessible via HTTP proxy |
49-
| [**Content connectors**](https://github.com/elastic/connectors) | Third-party integrations to popular content sources like databases, cloud storage, and business applications | Choose from a range of Elastic-built connectors or build your own in Python using the Elastic connector framework|
47+
| [**Elastic Open Web Crawler**](https://github.com/elastic/crawler) | Programmatically discover and index content from websites and knowledge bases | Crawl public-facing web content or internal sites accessible via HTTP proxy |
48+
| [**Content connectors**](elasticsearch://reference/search-connectors/index.md) | Third-party integrations to popular content sources like databases, cloud storage, and business applications | Choose from a range of Elastic-built connectors or build your own in Python using the Elastic connector framework|
5049
| [**File upload**](/manage-data/ingest/upload-data-files.md)| One-off manual uploads through the UI | Useful for testing or very small-scale use cases, but not recommended for production workflows |
5150

5251
### Process data at ingest time

0 commit comments

Comments
 (0)