Skip to content

Commit

Permalink
Merge branch 'elastic:main' into fix-ltr-useless-field-value-extractor
Browse files Browse the repository at this point in the history
  • Loading branch information
afoucret authored Jul 2, 2024
2 parents d5d61c9 + 95da99e commit 9903709
Show file tree
Hide file tree
Showing 119 changed files with 1,547 additions and 1,074 deletions.
5 changes: 5 additions & 0 deletions docs/changelog/109948.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 109948
summary: Automatically adjust `ignore_malformed` only for the @timestamp
area: Mapping
type: bug
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/110268.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 110268
summary: Disallow index.time_series.end_time setting from being set or updated in normal indices
area: TSDB
type: bug
issues:
- 110265
5 changes: 5 additions & 0 deletions docs/changelog/110337.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 110337
summary: Support `ignore_above` on keyword dimensions
area: TSDB
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/110338.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 110338
summary: Add `semantic_text` field type and `semantic` query
area: Mapping
type: feature
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/110347.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 110347
summary: "ESQL: Renamed `TopList` to Top"
area: ES|QL
type: enhancement
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/110369.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 110369
summary: Run terms concurrently when cardinality is only lower than shard size
area: Aggregations
type: bug
issues:
- 105505
4 changes: 2 additions & 2 deletions docs/reference/esql/functions/aggregation-functions.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The <<esql-stats-by>> command supports these aggregate functions:
* <<esql-agg-percentile>>
* experimental:[] <<esql-agg-st-centroid>>
* <<esql-agg-sum>>
* <<esql-top_list>>
* <<esql-top>>
* <<esql-agg-values>>
// end::agg_list[]

Expand All @@ -32,5 +32,5 @@ include::min.asciidoc[]
include::percentile.asciidoc[]
include::st_centroid_agg.asciidoc[]
include::sum.asciidoc[]
include::layout/top_list.asciidoc[]
include::layout/top.asciidoc[]
include::values.asciidoc[]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions docs/reference/esql/functions/layout/top.asciidoc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions docs/reference/esql/functions/layout/top_list.asciidoc

This file was deleted.

1 change: 1 addition & 0 deletions docs/reference/esql/functions/signature/top.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion docs/reference/esql/functions/signature/top_list.svg

This file was deleted.

2 changes: 1 addition & 1 deletion docs/reference/inference/delete-inference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ experimental[]
Deletes an {infer} endpoint.

IMPORTANT: The {infer} APIs enable you to use certain services, such as built-in
{ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Azure, Google AI Studio or
{ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Azure, Google AI Studio, Google Vertex AI or
Hugging Face. For built-in models and models uploaded though Eland, the {infer}
APIs offer an alternative way to use and manage trained models. However, if you
do not plan to use the {infer} APIs to use these models or if you want to use
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/inference/get-inference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ experimental[]
Retrieves {infer} endpoint information.

IMPORTANT: The {infer} APIs enable you to use certain services, such as built-in
{ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Azure, Google AI Studio or
{ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Azure, Google AI Studio, Google Vertex AI or
Hugging Face. For built-in models and models uploaded though Eland, the {infer}
APIs offer an alternative way to use and manage trained models. However, if you
do not plan to use the {infer} APIs to use these models or if you want to use
Expand Down
1 change: 1 addition & 0 deletions docs/reference/inference/inference-apis.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ include::service-cohere.asciidoc[]
include::service-elasticsearch.asciidoc[]
include::service-elser.asciidoc[]
include::service-google-ai-studio.asciidoc[]
include::service-google-vertex-ai.asciidoc[]
include::service-hugging-face.asciidoc[]
include::service-mistral.asciidoc[]
include::service-openai.asciidoc[]
2 changes: 1 addition & 1 deletion docs/reference/inference/post-inference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ experimental[]
Performs an inference task on an input text by using an {infer} endpoint.

IMPORTANT: The {infer} APIs enable you to use certain services, such as built-in
{ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Azure, Google AI Studio or
{ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Azure, Google AI Studio, Google Vertex AI or
Hugging Face. For built-in models and models uploaded though Eland, the {infer}
APIs offer an alternative way to use and manage trained models. However, if you
do not plan to use the {infer} APIs to use these models or if you want to use
Expand Down
5 changes: 3 additions & 2 deletions docs/reference/inference/put-inference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ experimental[]

Creates an {infer} endpoint to perform an {infer} task.

IMPORTANT: The {infer} APIs enable you to use certain services, such as built-in {ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Mistral, Azure OpenAI, Google AI Studio or Hugging Face.
IMPORTANT: The {infer} APIs enable you to use certain services, such as built-in
{ml} models (ELSER, E5), models uploaded through Eland, Cohere, OpenAI, Mistral, Azure OpenAI, Google AI Studio, Google Vertex AI or Hugging Face.
For built-in models and models uploaded though Eland, the {infer} APIs offer an alternative way to use and manage trained models.
However, if you do not plan to use the {infer} APIs to use these models or if you want to use non-NLP models, use the <<ml-df-trained-models-apis>>.

Expand All @@ -29,7 +30,6 @@ However, if you do not plan to use the {infer} APIs to use these models or if yo
[[put-inference-api-desc]]
==== {api-description-title}


The create {infer} API enables you to create an {infer} endpoint and configure a {ml} model to perform a specific {infer} task.

The following services are available through the {infer} API, click the links to review the configuration details of the services:
Expand All @@ -40,6 +40,7 @@ The following services are available through the {infer} API, click the links to
* <<infer-service-elasticsearch,Elasticsearch>> (for built-in models and models uploaded through Eland)
* <<infer-service-elser,ELSER>>
* <<infer-service-google-ai-studio,Google AI Studio>>
* <<infer-service-google-vertex-ai,Google Vertex AI>>
* <<infer-service-hugging-face,Hugging Face>>
* <<infer-service-mistral,Mistral>>
* <<infer-service-openai,OpenAI>>
111 changes: 111 additions & 0 deletions docs/reference/inference/service-google-vertex-ai.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
[[infer-service-google-vertex-ai]]
=== Google Vertex AI {infer} service

Creates an {infer} endpoint to perform an {infer} task with the `googlevertexai` service.


[discrete]
[[infer-service-google-vertex-ai-api-request]]
==== {api-request-title}

`PUT /_inference/<task_type>/<inference_id>`

[discrete]
[[infer-service-google-vertex-ai-path-params]]
==== {api-path-parms-title}

`<inference_id>`::
(Required, string)
include::inference-shared.asciidoc[tag=inference-id]

`<task_type>`::
(Required, string)
include::inference-shared.asciidoc[tag=task-type]
+
--
Available task types:

* `text_embedding`.
--

[discrete]
[[infer-service-google-vertex-ai-api-request-body]]
==== {api-request-body-title}

`service`::
(Required, string)
The type of service supported for the specified task type. In this case,
`googlevertexai`.

`service_settings`::
(Required, object)
include::inference-shared.asciidoc[tag=service-settings]
+
--
These settings are specific to the `googlevertexai` service.
--

`service_account_json`:::
(Required, string)
A valid service account in json format for the Google Vertex AI API.

`model_id`:::
(Required, string)
The name of the model to use for the {infer} task.
You can find the supported models at https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/text-embeddings-api[Text embeddings API].

`location`:::
(Required, string)
The name of the location to use for the {infer} task.
You find the supported locations at https://cloud.google.com/vertex-ai/generative-ai/docs/learn/locations[Generative AI on Vertex AI locations].

`project_id`:::
(Required, string)
The name of the project to use for the {infer} task.

`rate_limit`:::
(Optional, object)
By default, the `googlevertexai` service sets the number of requests allowed per minute to `30.000`.
This helps to minimize the number of rate limit errors returned from Google Vertex AI.
To modify this, set the `requests_per_minute` setting of this object in your service settings:
+
--
include::inference-shared.asciidoc[tag=request-per-minute-example]

More information about the rate limits for Google Vertex AI can be found in the https://cloud.google.com/vertex-ai/docs/quotas[Google Vertex AI Quotas docs].
--

`task_settings`::
(Optional, object)
include::inference-shared.asciidoc[tag=task-settings]
+
.`task_settings` for the `text_embedding` task type
[%collapsible%closed]
=====
`auto_truncate`:::
(optional, boolean)
For `googlevertexai` service only.
Specifies if the API truncates inputs longer than the maximum token length automatically.
=====

[discrete]
[[inference-example-google-vertex-ai]]
==== Google Vertex AI service example

The following example shows how to create an {infer} endpoint called
`google_vertex_ai_embeddings` to perform a `text_embedding` task type.

[source,console]
------------------------------------------------------------
PUT _inference/text_embedding/google_vertex_ai_embeddings
{
"service": "googlevertexai",
"service_settings": {
"service_account_json": "<service_account_json>",
"model_id": "<model_id>",
"location": "<location>",
"project_id": "<project_id>"
}
}
------------------------------------------------------------
// TEST[skip:TBD]
4 changes: 2 additions & 2 deletions docs/reference/query-dsl/semantic-query.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ GET my-index-000001/_search
[[semantic-query-params]]
==== Top-level parameters for `semantic`

field::
`field`::
(Required, string)
The `semantic_text` field to perform the query on.

query::
`query`::
(Required, string)
The query text to be searched for on the field.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ A successful call returns an object with "cluster", "index", and "remote_cluster
"manage_autoscaling",
"manage_behavioral_analytics",
"manage_ccr",
"manage_connector",
"manage_data_frame_transforms",
"manage_data_stream_global_retention",
"manage_enrich",
Expand All @@ -102,6 +103,7 @@ A successful call returns an object with "cluster", "index", and "remote_cluster
"manage_user_profile",
"manage_watcher",
"monitor",
"monitor_connector",
"monitor_data_frame_transforms",
"monitor_data_stream_global_retention",
"monitor_enrich",
Expand Down
Loading

0 comments on commit 9903709

Please sign in to comment.