Skip to content

Commit 9b36f55

Browse files
Mikep86Mikep86
committed
Merge branch 'main' into inference_metadata_fields
2 parents 1e76873 + 836e555 commit 9b36f55

File tree

198 files changed

+2497
-1178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+2497
-1178
lines changed

‎.buildkite/pipelines/periodic-packaging.template.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,14 @@ steps:
88
matrix:
99
setup:
1010
image:
11-
- debian-11
1211
- debian-12
1312
- opensuse-leap-15
14-
- oraclelinux-7
1513
- oraclelinux-8
16-
- sles-12
1714
- sles-15
18-
- ubuntu-1804
1915
- ubuntu-2004
2016
- ubuntu-2204
2117
- rocky-8
2218
- rocky-9
23-
- rhel-7
2419
- rhel-8
2520
- rhel-9
2621
- almalinux-8

‎.buildkite/pipelines/periodic-platform-support.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8
@@ -90,7 +85,6 @@ steps:
9085
setup:
9186
image:
9287
- amazonlinux-2023
93-
- amazonlinux-2
9488
agents:
9589
provider: aws
9690
imagePrefix: elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/pull-request/packaging-tests-unix.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ steps:
1010
matrix:
1111
setup:
1212
image:
13-
- debian-11
1413
- debian-12
1514
- opensuse-leap-15
16-
- oraclelinux-7
1715
- oraclelinux-8
18-
- sles-12
1916
- sles-15
20-
- ubuntu-1804
2117
- ubuntu-2004
2218
- ubuntu-2204
2319
- rocky-8
2420
- rocky-9
25-
- rhel-7
2621
- rhel-8
2722
- rhel-9
2823
- almalinux-8

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* This class models the different Docker base images that are used to build Docker distributions of Elasticsearch.
1414
*/
1515
public enum DockerBase {
16-
// "latest" here is intentional, since the image name specifies "8"
17-
DEFAULT("docker.elastic.co/ubi8/ubi-minimal:latest", "", "microdnf"),
16+
// "latest" here is intentional, since the image name specifies "9"
17+
DEFAULT("docker.elastic.co/ubi9/ubi-minimal:latest", "", "microdnf"),
1818

1919
// The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
2020
IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum"),

‎distribution/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ tasks.register("generateDependenciesReport", ConcatFilesTask) {
7070
// Explicitly add the dependency on the RHEL UBI Docker base image
7171
String[] rhelUbiFields = [
7272
'Red Hat Universal Base Image minimal',
73-
'8',
74-
'https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8',
73+
'9',
74+
'https://catalog.redhat.com/software/containers/ubi9-minimal/61832888c0d15aff4912fe0d',
7575
'Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf',
76-
'https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz'
76+
'https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz'
7777
]
7878
additionalLines << rhelUbiFields.join(',')
7979
}

‎docs/changelog/118104.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
pr: 118104
2+
summary: Remove old `_knn_search` tech preview API in v9
3+
area: Vector Search
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: Remove old `_knn_search` tech preview API in v9
8+
area: REST API
9+
details: The original, tech-preview api for vector search, `_knn_search`, has been removed in v9. For all vector search
10+
operations, you should utilize the `_search` endpoint.
11+
impact: The `_knn_search` API is now inaccessible without providing a compatible-with flag for v8.
12+
notable: false

‎docs/changelog/118114.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 118114
2+
summary: Enable physical plan verification
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/118207.yaml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/reference/inference/service-openai.asciidoc‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ https://platform.openai.com/api-keys[API keys section].
7676
include::inference-shared.asciidoc[tag=api-key-admonition]
7777
--
7878

79+
`dimensions`:::
80+
(Optional, integer)
81+
The number of dimensions the resulting output embeddings should have.
82+
Only supported in `text-embedding-3` and later models.
83+
If not set the OpenAI defined default for the model is used.
84+
7985
`model_id`:::
8086
(Required, string)
8187
The name of the model to use for the {infer} task.
@@ -134,8 +140,8 @@ Specifies the user issuing the request, which can be used for abuse detection.
134140
[[inference-example-openai]]
135141
==== OpenAI service example
136142

137-
The following example shows how to create an {infer} endpoint called
138-
`openai-embeddings` to perform a `text_embedding` task type.
143+
The following example shows how to create an {infer} endpoint called `openai-embeddings` to perform a `text_embedding` task type.
144+
The embeddings created by requests to this endpoint will have 128 dimensions.
139145

140146
[source,console]
141147
------------------------------------------------------------
@@ -144,14 +150,14 @@ PUT _inference/text_embedding/openai-embeddings
144150
"service": "openai",
145151
"service_settings": {
146152
"api_key": "<api_key>",
147-
"model_id": "text-embedding-ada-002"
153+
"model_id": "text-embedding-3-small",
154+
"dimensions": 128
148155
}
149156
}
150157
------------------------------------------------------------
151158
// TEST[skip:TBD]
152159

153-
The next example shows how to create an {infer} endpoint called
154-
`openai-completion` to perform a `completion` task type.
160+
The next example shows how to create an {infer} endpoint called `openai-completion` to perform a `completion` task type.
155161

156162
[source,console]
157163
------------------------------------------------------------

0 commit comments

Comments
 (0)