diff --git a/redirects.yml b/redirects.yml index 860c320fe6..eb05d0aea7 100644 --- a/redirects.yml +++ b/redirects.yml @@ -343,6 +343,7 @@ redirects: 'release-notes/fleet-elastic-agent/breaking-changes.md': 'fleet-server://release-notes/breaking-changes.md' 'release-notes/fleet-elastic-agent/deprecations.md': 'fleet-server://release-notes/deprecations.md' 'release-notes/fleet-elastic-agent/known-issues.md': 'fleet-server://release-notes/known-issues.md' + # Redirects `path_prefix` 'release-notes/fleet/index.md': 'fleet-server://release-notes/index.md' 'release-notes/fleet/breaking-changes.md': 'fleet-server://release-notes/breaking-changes.md' @@ -351,4 +352,7 @@ redirects: # Related to https://github.com/elastic/docs-content/issues/2985 - 'troubleshoot/observability/apm-agent-swift/apm-ios-agent.md': 'troubleshoot/ingest/opentelemetry/edot-sdks/ios/index.md' \ No newline at end of file + 'troubleshoot/observability/apm-agent-swift/apm-ios-agent.md': 'troubleshoot/ingest/opentelemetry/edot-sdks/ios/index.md' + +# Related to https://github.com/elastic/docs-content/pull/2843 + 'solutions/search/serverless-elasticsearch-get-started.md': 'solutions/search/get-started.md' diff --git a/solutions/images/serverless-get-started-create-an-index.png b/solutions/images/serverless-get-started-create-an-index.png deleted file mode 100644 index fa46a1dde1..0000000000 Binary files a/solutions/images/serverless-get-started-create-an-index.png and /dev/null differ diff --git a/solutions/images/serverless-getting-started-page.png b/solutions/images/serverless-getting-started-page.png deleted file mode 100644 index 7589d7276b..0000000000 Binary files a/solutions/images/serverless-getting-started-page.png and /dev/null differ diff --git a/solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md b/solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md index 5e1d750f52..06bfa33279 100644 --- a/solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md +++ b/solutions/observability/get-started/opentelemetry/use-cases/kubernetes/prerequisites-compatibility.md @@ -17,7 +17,7 @@ products: Before setting up observability for Kubernetes, make sure you have the following: -- 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. +- 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. - 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. diff --git a/solutions/search.md b/solutions/search.md index 54d1ee3db9..9fb8c7a4a6 100644 --- a/solutions/search.md +++ b/solutions/search.md @@ -30,4 +30,23 @@ Here are a few common real-world applications: | **Chatbots/RAG** | Enable natural conversations, provide context, maintain knowledge | Vector search, ML models, knowledge base integration | | **Geospatial search** | Process location queries, sort by proximity, filter by area | Geo-mapping, spatial indexing, distance calculations | +## {{es-serverless}} [elasticsearch-serverless] +```{applies_to} +serverless: + elasticsearch: ga +``` +{{es-serverless}} is one of the three available project types on [{{serverless-full}}](/deploy-manage/deploy.md). + +This project type enables you to use the core functionality of {{es}}: searching, indexing, storing, and analyzing data of all shapes and sizes. + +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. +This automation allows you to focus on building your search applications and solutions. + +::::{tip} +Not sure whether {{es}} on {{serverless-full}} is the right deployment choice for you? + +Check out the following resources to help you decide: +- [What’s different?](/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md): Understand the differences between {{serverless-full}} and other deployment types. +- [Billing](/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md): Learn about the billing model for {{es}} on {{serverless-full}}. +:::: \ No newline at end of file diff --git a/solutions/search/get-started.md b/solutions/search/get-started.md index f1eb1c1f00..f3f88ade53 100644 --- a/solutions/search/get-started.md +++ b/solutions/search/get-started.md @@ -25,7 +25,7 @@ If you're looking for an introduction to the {{stack}} or the {{es}} product, go :::::{step} Choose your deployment type Elastic provides several self-managed and Elastic-managed options. -For simplicity and speed, try out [{{es-serverless}}](/solutions/search/serverless-elasticsearch-get-started.md): +For simplicity and speed, try out [{{es-serverless}}](/solutions/search.md#elasticsearch-serverless): ::::{dropdown} Create an {{es-serverless}} project :::{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 For a broader overview of ingestion options, go to [](/manage-data/ingest.md). 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). -::::: +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. +::::: :::::{{step}} Build your search queries Your next steps will be to choose a method to write queries and interact with {{es}}. diff --git a/solutions/search/get-started/keyword-search-python.md b/solutions/search/get-started/keyword-search-python.md index 562c1d8922..2e5cb9c7cf 100644 --- a/solutions/search/get-started/keyword-search-python.md +++ b/solutions/search/get-started/keyword-search-python.md @@ -29,6 +29,9 @@ To follow the steps, you must have a recent version of a Python interpreter. Choose the {{es}} project type and provide a name. You can optionally edit the project settings, such as the [region](/deploy-manage/deploy/elastic-cloud/regions.md). + +To add the sample data in subsequent steps, you must have a `developer` or `admin` predefined role or an equivalent custom role. +To learn about role-based access control, go to [](/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md). :::: ::::{step} Create an index diff --git a/solutions/search/get-started/semantic-search.md b/solutions/search/get-started/semantic-search.md index a9d3b83a35..9bddbb5074 100644 --- a/solutions/search/get-started/semantic-search.md +++ b/solutions/search/get-started/semantic-search.md @@ -22,7 +22,7 @@ By playing with a simple use case, you'll take the first steps toward understand ## Prerequisites -- 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. +- 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. - 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. To learn about role-based access control, check out [](/deploy-manage/users-roles/cluster-or-deployment-auth/user-roles.md). diff --git a/solutions/search/ingest-for-search.md b/solutions/search/ingest-for-search.md index 2844504155..0406f0b0e9 100644 --- a/solutions/search/ingest-for-search.md +++ b/solutions/search/ingest-for-search.md @@ -11,7 +11,6 @@ products: - id: elasticsearch - id: cloud-serverless --- - # Ingest for search use cases $$$elasticsearch-ingest-time-series-data$$$ @@ -45,8 +44,8 @@ You can use these specialized tools to add general content to {{es}} indices. | Method | Description | Notes | |--------|-------------|-------| -| [**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 | -| [**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| +| [**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 | +| [**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| | [**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 | ### Process data at ingest time diff --git a/solutions/search/serverless-elasticsearch-get-started.md b/solutions/search/serverless-elasticsearch-get-started.md deleted file mode 100644 index 7f5f166344..0000000000 --- a/solutions/search/serverless-elasticsearch-get-started.md +++ /dev/null @@ -1,119 +0,0 @@ ---- -navigation_title: Get started on Serverless -mapped_pages: - - https://www.elastic.co/guide/en/serverless/current/elasticsearch-connecting-to-es-serverless-endpoint.html -applies_to: - serverless: -products: - - id: cloud-serverless ---- - -# Get started with {{es}} Serverless [elasticsearch-get-started] - -::::{tip} -Not sure whether {{es}} on {{serverless-full}} is the right deployment choice for you? - -Check out the following resources to help you decide: -- [What’s different?](/deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md): Understand the differences between {{serverless-full}} and other deployment types. -- [Billing](/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md): Learn about the billing model for {{es}} on {{serverless-full}}. -:::: - -## What is {{es-serverless}}? [what-is-elasticsearch-serverless] - - -{{es-serverless}} is one of the three available project types on [{{serverless-full}}](/deploy-manage/deploy.md). - -This project type enables you to use the core functionality of {{es}}: searching, indexing, storing, and analyzing data of all shapes and sizes. - -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. - -This automation allows you to focus on building your search applications and solutions. - -On this page, you will learn how to: - -* [Create an {{es-serverless}} project](#elasticsearch-get-started-create-project). -* Get started with {{es}}: - - * [Option 1: Guided index flow](#elasticsearch-follow-guided-index-flow): Follow the step-by-step tutorial provided in the UI to create an index and ingest data. - * [Option 2: In-product Getting Started guide](#elasticsearch-follow-in-product-getting-started): Use the Getting Started page’s instructions to ingest data and perform your first search. - * [Option 3: Explore on your own](#elasticsearch-explore-on-your-own): If you’re already familiar with {{es}}, retrieve your connection details, select an ingest method that suits your needs, and start searching. - - -## Create an {{es-serverless}} project [elasticsearch-get-started-create-project] - -Use your {{ecloud}} account to create a fully-managed {{es}} project: - -1. Navigate to [cloud.elastic.co](https://cloud.elastic.co?page=docs&placement=docs-body) and create a new account or log in to your existing account. -1. Within **Serverless Projects**, choose **Create project**. -1. Choose the {{es}} project type. -1. Provide a name for the project and optionally edit the project settings, such as the cloud platform [region](../../deploy-manage/deploy/elastic-cloud/regions.md). Select **Create project** to continue. -1. Once the project is ready, select **Continue**. - -::::{tip} -Learn how billing works for your project in [Elasticsearch billing dimensions](../../deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md). - -:::: - - -Now your project is ready to start creating indices, adding data, and performing searches. You can choose one of the following options to proceed. - - -## Option 1: Follow the guided index flow [elasticsearch-follow-guided-index-flow] - -Once your project is set up, you’ll be directed to a page where you can create your first index. An index is where documents are stored and organized, making it possible to search and retrieve data. - -1. Enter a name for your index. -2. Click **Create my index**. You can also create the index by clicking on **Code** to view and run code through the command line. - - :::{image} /solutions/images/serverless-get-started-create-an-index.png - :alt: Create an index. - ::: - -3. You’ll be directed to the **Index Management** page. Here, copy and save the following: - - * Elasticsearch URL - * API key - - -::::{note} -You won’t be able to view this API key again. If needed you'll need to generate a new one. -:::: - - -The UI provides ready-to-use code examples for ingesting data via the REST API. Choose your preferred tool for making these requests: - -* [Console](/explore-analyze/query-filter/tools/console.md) in your project’s UI -* Python -* JavaScript -* cURL - - -## Option 2: Follow the Getting Started guide [elasticsearch-follow-in-product-getting-started] - -To get started using the in-product tutorial, navigate to the **Getting Started** page and follow the on-screen steps. - -:::{image} /solutions/images/serverless-getting-started-page.png -:alt: Getting Started page. -::: - - -## Option 3: Explore on your own [elasticsearch-explore-on-your-own] - -If you’re already familiar with Elasticsearch, you can jump right into setting up a connection and ingesting data as per your needs. - -1. Retrieve your [connection details](search-connection-details.md). -2. Ingest your data. Elasticsearch provides several methods for ingesting data: - - * [{{es}} API](ingest-for-search.md) - * [Connector clients](elasticsearch://reference/search-connectors/index.md) - * [File Uploader](/manage-data/ingest/upload-data-files.md) - * [{{beats}}](beats://reference/index.md) - * [{{ls}}](logstash://reference/index.md) - * [Elastic Open Web Crawler](https://github.com/elastic/crawler) - - - -## Next steps [elasticsearch-next-steps] - -* Once you’ve added data to your {{es-serverless}} project, you can use [Playground](rag/playground.md) to test and tweak {{es}} queries and chat with your data, using GenAI. -* You can also try our hands-on [quickstart guides](/solutions/search/get-started/quickstarts.md) in the core {{es}} documentation. diff --git a/solutions/toc.yml b/solutions/toc.yml index c0464bb763..c3988f88d2 100644 --- a/solutions/toc.yml +++ b/solutions/toc.yml @@ -5,7 +5,6 @@ toc: children: - file: search/get-started.md children: - - file: search/serverless-elasticsearch-get-started.md - file: search/search-connection-details.md - file: search/get-started/quickstarts.md children: