From e7bf2c40673590f791be66d0496ccea4f341417b Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:04:35 -0500 Subject: [PATCH 1/9] Update applies_to to mention serverless --- docs/reference/elasticsearch/rest-apis/retrievers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers.md b/docs/reference/elasticsearch/rest-apis/retrievers.md index d19386f179fc5..c55b2fe14dcf6 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers.md @@ -69,6 +69,7 @@ When a retriever is specified as part of a search, the following elements are no ## Multi-field query format [multi-field-query-format] ```yaml {applies_to} stack: ga 9.1 +serverless: ga ``` The [`linear`](retrievers/linear-retriever.md) and [`rrf`](retrievers/rrf-retriever.md) retrievers support a multi-field query format that provides a simplified way to define searches across multiple fields without explicitly specifying inner retrievers. From 369cc7703a867b542268115eb91f899c8404b360 Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:08:23 -0500 Subject: [PATCH 2/9] Update linear retriever documentation for serverless support --- .../elasticsearch/rest-apis/retrievers/linear-retriever.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md index 36da0f5104df4..d2d05a2bb91ee 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md @@ -16,19 +16,19 @@ Either `query` or `retrievers` must be specified. Combining `query` and `retrievers` is not supported. :::: -`query` {applies_to}`stack: ga 9.1` +`query` {applies_to}`stack: ga 9.1, serverless: ga` : (Optional, String) The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`stack: ga 9.1` +`fields` {applies_to}`stack: ga 9.1, serverless: ga` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format). Fields can include boost values using the `^` notation (e.g., `"field^2"`). If not specified, uses the index's default fields from the `index.query.default_field` index setting, which is `*` by default. -`normalizer` {applies_to}`stack: ga 9.1` +`normalizer` {applies_to}`stack: ga 9.1, serverless: ga` : (Optional, String) The top-level normalizer to use when combining results. From abdaee18634dae0b9696e13b114982462e222807 Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:09:22 -0500 Subject: [PATCH 3/9] Update rrf retriever docs to indicate serverless support --- .../elasticsearch/rest-apis/retrievers/rrf-retriever.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md index cccab00166c82..5119a3a4f8132 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md @@ -17,12 +17,12 @@ Either `query` or `retrievers` must be specified. Combining `query` and `retrievers` is not supported. :::: -`query` {applies_to}`stack: ga 9.1` +`query` {applies_to}`stack: ga 9.1, serverless: ga` : (Optional, String) The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`stack: ga 9.1` +`fields` {applies_to}`stack: ga 9.1, serverless: ga` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format). From 11550cb67dac4e24c7f83af7ad6dffb0cd604e4d Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:13:37 -0500 Subject: [PATCH 4/9] Fix formatting for query and fields parameters --- .../elasticsearch/rest-apis/retrievers/rrf-retriever.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md index 5119a3a4f8132..b72c548fb2f68 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md @@ -17,12 +17,12 @@ Either `query` or `retrievers` must be specified. Combining `query` and `retrievers` is not supported. :::: -`query` {applies_to}`stack: ga 9.1, serverless: ga` +`query` {applies_to}`stack: ga 9.1 serverless: ga` : (Optional, String) The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`stack: ga 9.1, serverless: ga` +`fields` {applies_to}`stack: ga 9.1 serverless: ga` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format). From 2499cca09fe23386c63b1cd814648e93be330b95 Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:26:02 -0500 Subject: [PATCH 5/9] Update applies_to formatting in rrf-retriever.md --- .../elasticsearch/rest-apis/retrievers/rrf-retriever.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md index b72c548fb2f68..a83b40f9bb2ec 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md @@ -17,12 +17,12 @@ Either `query` or `retrievers` must be specified. Combining `query` and `retrievers` is not supported. :::: -`query` {applies_to}`stack: ga 9.1 serverless: ga` +`query` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` : (Optional, String) The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`stack: ga 9.1 serverless: ga` +`fields` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format). From f6185b94be88344d2ce5cac8336f084adc362305 Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:29:34 -0500 Subject: [PATCH 6/9] Update linear retriever applies_to tags --- .../rest-apis/retrievers/linear-retriever.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md index d2d05a2bb91ee..0be14ce94feaa 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md @@ -16,19 +16,19 @@ Either `query` or `retrievers` must be specified. Combining `query` and `retrievers` is not supported. :::: -`query` {applies_to}`stack: ga 9.1, serverless: ga` +`query` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` : (Optional, String) The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`stack: ga 9.1, serverless: ga` +`fields` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format). Fields can include boost values using the `^` notation (e.g., `"field^2"`). If not specified, uses the index's default fields from the `index.query.default_field` index setting, which is `*` by default. -`normalizer` {applies_to}`stack: ga 9.1, serverless: ga` +`normalizer` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` : (Optional, String) The top-level normalizer to use when combining results. @@ -37,7 +37,7 @@ Combining `query` and `retrievers` is not supported. When used with the [multi-field query format](../retrievers.md#multi-field-query-format) (`query` parameter), normalizes scores per [field grouping](../retrievers.md#multi-field-field-grouping). - Otherwise this serves as the default normalizer for any sub-retriever that doesn't specify its own normalizer. Per-retriever normalizers always take precedence over the top-level normalizer. {applies_to}`stack: ga 9.2` + Otherwise this serves as the default normalizer for any sub-retriever that doesn't specify its own normalizer. Per-retriever normalizers always take precedence over the top-level normalizer. {applies_to}`stack: ga 9.2` {applies_to}`serverless: ga` ::::{warning} Avoid using `none` as that will disable normalization and may bias the result set towards lexical matches. From 80c3698ac476635dcaef4c71d4cdd84d992a291c Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:34:18 -0500 Subject: [PATCH 7/9] Update applies_to tags in linear retriever documentation --- .../rest-apis/retrievers/linear-retriever.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md index 0be14ce94feaa..4db41cd463f62 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md @@ -16,19 +16,19 @@ Either `query` or `retrievers` must be specified. Combining `query` and `retrievers` is not supported. :::: -`query` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` +`query` {applies_to}`serverless: ga` {applies_to}`stack: ga 9.1` : (Optional, String) The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` +`fields` {applies_to}`serverless: ga` {applies_to}`stack: ga 9.1` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format). Fields can include boost values using the `^` notation (e.g., `"field^2"`). If not specified, uses the index's default fields from the `index.query.default_field` index setting, which is `*` by default. -`normalizer` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` +`normalizer` {applies_to}`serverless: ga` {applies_to}`stack: ga 9.1` : (Optional, String) The top-level normalizer to use when combining results. @@ -37,7 +37,7 @@ Combining `query` and `retrievers` is not supported. When used with the [multi-field query format](../retrievers.md#multi-field-query-format) (`query` parameter), normalizes scores per [field grouping](../retrievers.md#multi-field-field-grouping). - Otherwise this serves as the default normalizer for any sub-retriever that doesn't specify its own normalizer. Per-retriever normalizers always take precedence over the top-level normalizer. {applies_to}`stack: ga 9.2` {applies_to}`serverless: ga` + Otherwise this serves as the default normalizer for any sub-retriever that doesn't specify its own normalizer. Per-retriever normalizers always take precedence over the top-level normalizer. {applies_to}`serverless: ga` {applies_to}`stack: ga 9.2` ::::{warning} Avoid using `none` as that will disable normalization and may bias the result set towards lexical matches. From b1936b1764c258f74bf39d69b698175455d1871c Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:34:56 -0500 Subject: [PATCH 8/9] Update rrf query and fields applies_to tags --- .../elasticsearch/rest-apis/retrievers/rrf-retriever.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md index a83b40f9bb2ec..e1d6927a6af22 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/rrf-retriever.md @@ -17,12 +17,12 @@ Either `query` or `retrievers` must be specified. Combining `query` and `retrievers` is not supported. :::: -`query` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` +`query` {applies_to}`serverless: ga` {applies_to}`stack: ga 9.1` : (Optional, String) The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` +`fields` {applies_to}`serverless: ga` {applies_to}`stack: ga 9.1` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format). From 582a10faff0ffcd0f7e385bfcf0205bfb088e749 Mon Sep 17 00:00:00 2001 From: Mike Pellegrini Date: Tue, 4 Nov 2025 13:35:51 -0500 Subject: [PATCH 9/9] Whitespace --- .../elasticsearch/rest-apis/retrievers/linear-retriever.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md index 4db41cd463f62..95985c5015acf 100644 --- a/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md +++ b/docs/reference/elasticsearch/rest-apis/retrievers/linear-retriever.md @@ -21,7 +21,7 @@ Combining `query` and `retrievers` is not supported. The query to use when using the [multi-field query format](../retrievers.md#multi-field-query-format). -`fields` {applies_to}`serverless: ga` {applies_to}`stack: ga 9.1` +`fields` {applies_to}`serverless: ga` {applies_to}`stack: ga 9.1` : (Optional, array of strings) The fields to query when using the [multi-field query format](../retrievers.md#multi-field-query-format).