Skip to content

Commit

Permalink
Merge branch 'main' into fix/113430-2
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Oct 25, 2024
2 parents ff3c94a + 6e0bdbe commit 2833f8c
Show file tree
Hide file tree
Showing 241 changed files with 3,988 additions and 3,065 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ gradle @elastic/es-delivery
build-conventions @elastic/es-delivery
build-tools @elastic/es-delivery
build-tools-internal @elastic/es-delivery
*.gradle @elastic/es-delivery
.buildkite @elastic/es-delivery
.ci @elastic/es-delivery
.idea @elastic/es-delivery
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ public enum DockerBase {
// The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum"),

// Base image with extras for Cloud
CLOUD("ubuntu:20.04", "-cloud", "apt-get"),

// Chainguard based wolfi image with latest jdk
// This is usually updated via renovatebot
// spotless:off
Expand Down
25 changes: 3 additions & 22 deletions distribution/docker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -288,20 +288,6 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base) {
}
}

if (base == DockerBase.CLOUD) {
// If we're performing a release build, but `build.id` hasn't been set, we can
// infer that we're not at the Docker building stage of the build, and therefore
// we should skip the beats part of the build.
String buildId = providers.systemProperty('build.id').getOrNull()
boolean includeBeats = VersionProperties.isElasticsearchSnapshot() == true || buildId != null || useDra

if (includeBeats) {
from configurations.getByName("filebeat_${architecture.classifier}")
from configurations.getByName("metricbeat_${architecture.classifier}")
}
// For some reason, the artifact name can differ depending on what repository we used.
rename ~/((?:file|metric)beat)-.*\.tar\.gz$/, "\$1-${VersionProperties.elasticsearch}.tar.gz"
}
Provider<DockerSupportService> serviceProvider = GradleUtils.getBuildService(
project.gradle.sharedServices,
DockerSupportPlugin.DOCKER_SUPPORT_SERVICE_NAME
Expand Down Expand Up @@ -381,7 +367,7 @@ private static List<String> generateTags(DockerBase base, Architecture architect
String image = "elasticsearch${base.suffix}"

String namespace = 'elasticsearch'
if (base == DockerBase.CLOUD || base == DockerBase.CLOUD_ESS) {
if (base == base == DockerBase.CLOUD_ESS) {
namespace += '-ci'
}

Expand Down Expand Up @@ -439,7 +425,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {

}

if (base != DockerBase.IRON_BANK && base != DockerBase.CLOUD && base != DockerBase.CLOUD_ESS) {
if (base != DockerBase.IRON_BANK && base != DockerBase.CLOUD_ESS) {
tasks.named("assemble").configure {
dependsOn(buildDockerImageTask)
}
Expand Down Expand Up @@ -548,21 +534,16 @@ subprojects { Project subProject ->
base = DockerBase.IRON_BANK
} else if (subProject.name.contains('cloud-ess-')) {
base = DockerBase.CLOUD_ESS
} else if (subProject.name.contains('cloud-')) {
base = DockerBase.CLOUD
} else if (subProject.name.contains('wolfi-ess')) {
base = DockerBase.WOLFI_ESS
} else if (subProject.name.contains('wolfi-')) {
base = DockerBase.WOLFI
}

final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
final String extension = base == DockerBase.UBI ? 'ubi.tar' :
(base == DockerBase.IRON_BANK ? 'ironbank.tar' :
(base == DockerBase.CLOUD ? 'cloud.tar' :
(base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' :
(base == DockerBase.WOLFI ? 'wolfi.tar' :
'docker.tar'))))
'docker.tar')))
final String artifactName = "elasticsearch${arch}${base.suffix}_test"

final String exportTaskName = taskName("export", architecture, base, 'DockerImage')
Expand Down
2 changes: 0 additions & 2 deletions distribution/docker/cloud-docker-aarch64-export/build.gradle

This file was deleted.

2 changes: 0 additions & 2 deletions distribution/docker/cloud-docker-export/build.gradle

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions distribution/docker/wolfi-ess-docker-export/build.gradle

This file was deleted.

19 changes: 19 additions & 0 deletions docs/changelog/113975.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
pr: 113975
summary: JDK locale database change
area: Mapping
type: breaking
issues: []
breaking:
title: JDK locale database change
area: Mapping
details: |
{es} 8.16 changes the version of the JDK that is included from version 22 to version 23. This changes the locale database that is used by Elasticsearch from the COMPAT database to the CLDR database. This change can cause significant differences to the textual date formats accepted by Elasticsearch, and to calculated week-dates.
If you run {es} 8.16 on JDK version 22 or below, it will use the COMPAT locale database to match the behavior of 8.15. However, starting with {es} 9.0, {es} will use the CLDR database regardless of JDK version it is run on.
impact: |
This affects you if you use custom date formats using textual or week-date field specifiers. If you use date fields or calculated week-dates that change between the COMPAT and CLDR databases, then this change will cause Elasticsearch to reject previously valid date fields as invalid data. You might need to modify your ingest or output integration code to account for the differences between these two JDK versions.
Starting in version 8.15.2, Elasticsearch will log deprecation warnings if you are using date format specifiers that might change on upgrading to JDK 23. These warnings are visible in Kibana.
For detailed guidance, refer to <<custom-date-format-locales,Differences in locale information between JDK versions>> and the https://ela.st/jdk-23-locales[Elastic blog].
notable: true
7 changes: 7 additions & 0 deletions docs/changelog/114334.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pr: 114334
summary: Don't return TEXT type for functions that take TEXT
area: ES|QL
type: bug
issues:
- 111537
- 114333
6 changes: 6 additions & 0 deletions docs/changelog/114665.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 114665
summary: Fixing remote ENRICH by pushing the Enrich inside `FragmentExec`
area: ES|QL
type: bug
issues:
- 105095
6 changes: 6 additions & 0 deletions docs/changelog/115117.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 115117
summary: Report JVM stats for all memory pools (97046)
area: Infra/Core
type: bug
issues:
- 97046
5 changes: 5 additions & 0 deletions docs/changelog/115314.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115314
summary: Only aggregations require at least one shard request
area: Search
type: enhancement
issues: []
18 changes: 18 additions & 0 deletions docs/changelog/115393.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
pr: 115393
summary: Remove deprecated local attribute from alias APIs
area: Indices APIs
type: breaking
issues: []
breaking:
title: Remove deprecated local attribute from alias APIs
area: REST API
details: >-
The following APIs no longer accept the `?local` query parameter:
`GET /_alias`, `GET /_aliases`, `GET /_alias/{name}`,
`HEAD /_alias/{name}`, `GET /{index}/_alias`, `HEAD /{index}/_alias`,
`GET /{index}/_alias/{name}`, `HEAD /{index}/_alias/{name}`,
`GET /_cat/aliases`, and `GET /_cat/aliases/{alias}`. This parameter
has been deprecated and ignored since version 8.12.
impact: >-
Cease usage of the `?local` query parameter when calling the listed APIs.
notable: false
29 changes: 29 additions & 0 deletions docs/changelog/115399.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
pr: 115399
summary: Adding breaking change entry for retrievers
area: Search
type: breaking
issues: []
breaking:
title: Reworking RRF retriever to be evaluated during rewrite phase
area: REST API
details: |-
In this release (8.16), we have introduced major changes to the retrievers framework
and how they can be evaluated, focusing mainly on compound retrievers
like `rrf` and `text_similarity_reranker`, which allowed us to support full
composability (i.e. any retriever can be nested under any compound retriever),
as well as supporting additional search features like collapsing, explaining,
aggregations, and highlighting.
To ensure consistency, and given that this rework is not available until 8.16,
`rrf` and `text_similarity_reranker` retriever queries would now
throw an exception in a mixed cluster scenario, where there are nodes
both in current or later (i.e. >= 8.16) and previous ( <= 8.15) versions.
As part of the rework, we have also removed the `_rank` property from
the responses of an `rrf` retriever.
impact: |-
- Users will not be able to use the `rrf` and `text_similarity_reranker` retrievers in a mixed cluster scenario
with previous releases (i.e. prior to 8.16), and the request will throw an `IllegalArgumentException`.
- `_rank` has now been removed from the output of the `rrf` retrievers so trying to directly parse the field
will throw an exception
notable: false
5 changes: 5 additions & 0 deletions docs/changelog/115429.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115429
summary: "[otel-data] Add more kubernetes aliases"
area: Data streams
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/115430.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115430
summary: Prevent NPE if model assignment is removed while waiting to start
area: Machine Learning
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/115459.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115459
summary: Guard blob store local directory creation with `doPrivileged`
area: Infra/Core
type: bug
issues: []
6 changes: 6 additions & 0 deletions docs/changelog/115594.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 115594
summary: Update `BlobCacheBufferedIndexInput::readVLong` to correctly handle negative
long values
area: Search
type: bug
issues: []
10 changes: 4 additions & 6 deletions docs/reference/cat/alias.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

[IMPORTANT]
====
cat APIs are only intended for human consumption using the command line or the
{kib} console. They are _not_ intended for use by applications. For application
cat APIs are only intended for human consumption using the command line or the
{kib} console. They are _not_ intended for use by applications. For application
consumption, use the <<aliases,aliases API>>.
====

Expand Down Expand Up @@ -45,8 +45,6 @@ include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=cat-h]

include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=help]

include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=local]

include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=cat-s]

include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=cat-v]
Expand Down Expand Up @@ -104,6 +102,6 @@ alias4 test1 - 2 1,2 -
This response shows that `alias2` has configured a filter, and specific routing
configurations in `alias3` and `alias4`.

If you only want to get information about specific aliases, you can specify
the aliases in comma-delimited format as a URL parameter, e.g.,
If you only want to get information about specific aliases, you can specify
the aliases in comma-delimited format as a URL parameter, e.g.,
/_cat/aliases/alias1,alias2.
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ Refer to the individual connectors-references,connector references for these con
====
We're using a self-managed connector in this tutorial.
To use these APIs with an Elastic managed connector, there's some extra setup for API keys.
Refer to native-connectors-manage-API-keys for details.
Refer to <<es-native-connectors-manage-API-keys>> for details.
====

We're now ready to sync our PostgreSQL data to {es}.
Expand Down
12 changes: 6 additions & 6 deletions docs/reference/connector/docs/connectors-servicenow.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ Comma-separated list of services to fetch data from ServiceNow. If the value is
- link:https://docs.servicenow.com/bundle/tokyo-it-service-management/page/product/incident-management/concept/c_IncidentManagement.html[Incident]
- link:https://docs.servicenow.com/bundle/tokyo-servicenow-platform/page/use/service-catalog-requests/task/t_AddNewRequestItems.html[Requested Item]
- link:https://docs.servicenow.com/bundle/tokyo-customer-service-management/page/product/customer-service-management/task/t_SearchTheKnowledgeBase.html[Knowledge]
- link:https://docs.servicenow.com/bundle/tokyo-it-service-management/page/product/change-management/task/t_CreateAChange.html[Change Request]
- link:https://docs.servicenow.com/bundle/tokyo-it-service-management/page/product/change-management/task/t_CreateAChange.html[Change request]
+
[NOTE]
====
If you have configured a custom service, the `*` value will not fetch data from the basic services above by default. In this case you'll need to mention these service names explicitly.
====
Default value is `*`. Examples:
+
- `User, Incident, Requested Item, Knowledge, Change Request`
- `User, Incident, Requested Item, Knowledge, Change request`
- `*`
Enable document level security::
Expand Down Expand Up @@ -139,7 +139,7 @@ For default services, connectors use the following roles to find users who have
| Knowledge | `admin`, `knowledge`, `knowledge_manager`, `knowledge_admin`
| Change Request | `admin`, `sn_change_read`, `itil`
| Change request | `admin`, `sn_change_read`, `itil`
|===
For services other than these defaults, the connector iterates over access controls with `read` operations and finds the respective roles for those services.
Expand Down Expand Up @@ -305,15 +305,15 @@ Comma-separated list of services to fetch data from ServiceNow. If the value is
- link:https://docs.servicenow.com/bundle/tokyo-it-service-management/page/product/incident-management/concept/c_IncidentManagement.html[Incident]
- link:https://docs.servicenow.com/bundle/tokyo-servicenow-platform/page/use/service-catalog-requests/task/t_AddNewRequestItems.html[Requested Item]
- link:https://docs.servicenow.com/bundle/tokyo-customer-service-management/page/product/customer-service-management/task/t_SearchTheKnowledgeBase.html[Knowledge]
- link:https://docs.servicenow.com/bundle/tokyo-it-service-management/page/product/change-management/task/t_CreateAChange.html[Change Request]
- link:https://docs.servicenow.com/bundle/tokyo-it-service-management/page/product/change-management/task/t_CreateAChange.html[Change request]
+
[NOTE]
====
If you have configured a custom service, the `*` value will not fetch data from the basic services above by default. In this case you'll need to mention these service names explicitly.
====
Default value is `*`. Examples:
+
- `User, Incident, Requested Item, Knowledge, Change Request`
- `User, Incident, Requested Item, Knowledge, Change request`
- `*`
`retry_count`::
Expand Down Expand Up @@ -374,7 +374,7 @@ For default services, connectors use the following roles to find users who have
| Knowledge | `admin`, `knowledge`, `knowledge_manager`, `knowledge_admin`
| Change Request | `admin`, `sn_change_read`, `itil`
| Change request | `admin`, `sn_change_read`, `itil`
|===
For services other than these defaults, the connector iterates over access controls with `read` operations and finds the respective roles for those services.
Expand Down
Loading

0 comments on commit 2833f8c

Please sign in to comment.