Merge branch 'main' into unmute_chaining_test

przemekwitek · Jan 15, 2024 · bc67f01 · bc67f01
2 parents fa33b46 + 4d7e0ec
commit bc67f01
Show file tree

Hide file tree

Showing 242 changed files with 2,963 additions and 2,428 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -48,7 +48,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.17", "8.11.4", "8.12.0", "8.13.0"]
+            BWC_VERSION: ["7.17.17", "8.11.5", "8.12.0", "8.13.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -1793,6 +1793,22 @@ steps:
         env:
           BWC_VERSION: 8.11.4
 
+      - label: "{{matrix.image}} / 8.11.5 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.11.5
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - rocky-8
+              - ubuntu-2004
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: custom-16-32768
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.11.5
+
       - label: "{{matrix.image}} / 8.12.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.0
         timeout_in_minutes: 300

diff --git a/.buildkite/pipelines/periodic-platform-support.yml b/.buildkite/pipelines/periodic-platform-support.yml
@@ -89,6 +89,7 @@ steps:
           setup:
             image:
               - amazonlinux-2023
+              - amazonlinux-2
         agents:
           provider: aws
           imagePrefix: elasticsearch-{{matrix.image}}

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -1102,6 +1102,16 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.11.4
+      - label: 8.11.5 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.11.5#bwcTest
+        timeout_in_minutes: 300
+        agents:
+          provider: gcp
+          image: family/elasticsearch-ubuntu-2004
+          machineType: n1-standard-32
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.11.5
       - label: 8.12.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.0#bwcTest
         timeout_in_minutes: 300

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -109,5 +109,6 @@ BWC_VERSION:
   - "8.11.2"
   - "8.11.3"
   - "8.11.4"
+  - "8.11.5"
   - "8.12.0"
   - "8.13.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,5 @@
 BWC_VERSION:
   - "7.17.17"
-  - "8.11.4"
+  - "8.11.5"
   - "8.12.0"
   - "8.13.0"
diff --git a/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle b/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle
@@ -79,7 +79,6 @@ if (BuildParams.inFipsJvm) {
           // with no x-pack. Tests having security explicitly enabled/disabled will override this setting
           setting 'xpack.security.enabled', 'false'
           setting 'xpack.security.fips_mode.enabled', 'true'
-          setting 'xpack.security.fips_mode.required_providers', '["BCFIPS", "BCJSSE"]'
           setting 'xpack.license.self_generated.type', 'trial'
           setting 'xpack.security.authc.password_hashing.algorithm', 'pbkdf2_stretch'
           keystorePassword 'keystore-password'

diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java
@@ -201,7 +201,7 @@ public void beforeStart() {
                     try {
                         mockServer.start();
                         node.setting("telemetry.metrics.enabled", "true");
-                        node.setting("tracing.apm.agent.enabled", "true");
+                        node.setting("tracing.apm.enabled", "true");
                         node.setting("tracing.apm.agent.transaction_sample_rate", "0.10");
                         node.setting("tracing.apm.agent.metrics_interval", "10s");
                         node.setting("tracing.apm.agent.server_url", "http://127.0.0.1:" + mockServer.getPort());
@@ -213,8 +213,8 @@ public void beforeStart() {
                 // if metrics were not enabled explicitly for gradlew run we should disable them
                 else if (node.getSettingKeys().contains("telemetry.metrics.enabled") == false) { // metrics
                     node.setting("telemetry.metrics.enabled", "false");
-                } else if (node.getSettingKeys().contains("tracing.apm.agent.enabled") == false) { // tracing
-                    node.setting("tracing.apm.agent.enable", "false");
+                } else if (node.getSettingKeys().contains("tracing.apm.enabled") == false) { // tracing
+                    node.setting("tracing.apm.enable", "false");
                 }
 
             }

diff --git a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java
@@ -79,7 +79,8 @@ class APMJvmOptions {
         "application_packages", "org.elasticsearch,org.apache.lucene",
         "metrics_interval", "120s",
         "breakdown_metrics", "false",
-        "central_config", "false"
+        "central_config", "false",
+        "transaction_sample_rate", "0.2"
         );
     // end::noformat
 

diff --git a/docs/changelog/102843.yaml b/docs/changelog/102843.yaml
diff --git a/docs/changelog/102848.yaml b/docs/changelog/102848.yaml
diff --git a/docs/changelog/103003.yaml b/docs/changelog/103003.yaml
diff --git a/docs/changelog/103151.yaml b/docs/changelog/103151.yaml
diff --git a/docs/changelog/103474.yaml b/docs/changelog/103474.yaml
diff --git a/docs/changelog/103611.yaml b/docs/changelog/103611.yaml
diff --git a/docs/changelog/103758.yaml b/docs/changelog/103758.yaml
diff --git a/docs/changelog/103865.yaml b/docs/changelog/103865.yaml
diff --git a/docs/changelog/104122.yaml b/docs/changelog/104122.yaml
@@ -0,0 +1,5 @@
+pr: 104122
+summary: Consider currently refreshing data in the memory usage of refresh
+area: Engine
+type: bug
+issues: []
diff --git a/docs/changelog/104155.yaml b/docs/changelog/104155.yaml
@@ -0,0 +1,6 @@
+pr: 104155
+summary: "Updated `missingTrainedModel` message to include: you may need to create\
+  \ it"
+area: Machine Learning
+type: enhancement
+issues: []
diff --git a/docs/changelog/104265.yaml b/docs/changelog/104265.yaml
@@ -0,0 +1,6 @@
+pr: 104265
+summary: Remove `hashCode` and `equals` from `OperationModeUpdateTask`
+area: ILM+SLM
+type: bug
+issues:
+ - 100871
diff --git a/docs/changelog/104281.yaml b/docs/changelog/104281.yaml
@@ -0,0 +1,5 @@
+pr: 104281
+summary: Data streams fix failure store delete
+area: Data streams
+type: bug
+issues: []
diff --git a/docs/changelog/104314.yaml b/docs/changelog/104314.yaml
@@ -0,0 +1,5 @@
+pr: 104314
+summary: "[LTR] `FieldValueExtrator` - Checking if fetched values is empty"
+area: Machine Learning
+type: bug
+issues: []
diff --git a/docs/reference/connector/apis/cancel-connector-sync-job-api.asciidoc b/docs/reference/connector/apis/cancel-connector-sync-job-api.asciidoc
@@ -4,6 +4,8 @@
 <titleabbrev>Cancel connector sync job</titleabbrev>
 ++++
 
+preview::[]
+
 Cancels a connector sync job.
 
 [[cancel-connector-sync-job-api-request]]

diff --git a/docs/reference/connector/apis/check-in-connector-api.asciidoc b/docs/reference/connector/apis/check-in-connector-api.asciidoc
@@ -1,12 +1,11 @@
 [[check-in-connector-api]]
 === Check in connector API
-
-preview::[]
-
 ++++
 <titleabbrev>Check in a connector</titleabbrev>
 ++++
 
+preview::[]
+
 Updates the `last_seen` field of a connector with current timestamp.
 
 [[check-in-connector-api-request]]

diff --git a/docs/reference/connector/apis/check-in-connector-sync-job-api.asciidoc b/docs/reference/connector/apis/check-in-connector-sync-job-api.asciidoc
@@ -4,6 +4,8 @@
 <titleabbrev>Check in connector sync job</titleabbrev>
 ++++
 
+preview::[]
+
 Checks in a connector sync job (updates `last_seen` to the current time).
 
 [[check-in-connector-sync-job-api-request]]

diff --git a/docs/reference/connector/apis/connector-apis.asciidoc b/docs/reference/connector/apis/connector-apis.asciidoc
@@ -3,17 +3,16 @@
 
 preview::[]
 
-++++
-<titleabbrev>Connector APIs</titleabbrev>
-++++
-
----
-
-The connector and sync jobs API provides a convenient way to create and manage Elastic connectors and sync jobs in an internal index.
+The connector and sync jobs API provides a convenient way to create and manage Elastic {enterprise-search-ref}/connectors.html[connectors^] and sync jobs in an internal index.
 
 This API provides an alternative to relying solely on {kib} UI for connector and sync job management. The API comes with a set of
 validations and assertions to ensure that the state representation in the internal index remains valid.
 
+[TIP]
+====
+We also have a command-line interface for Elastic connectors. Learn more in the https://github.com/elastic/connectors/blob/main/docs/CLI.md[elastic/connectors] repository.
+====
+
 [discrete]
 [[elastic-connector-apis]]
 === Connector APIs

diff --git a/docs/reference/connector/apis/create-connector-api.asciidoc b/docs/reference/connector/apis/create-connector-api.asciidoc
@@ -4,6 +4,8 @@
 <titleabbrev>Create connector</titleabbrev>
 ++++
 
+preview::[]
+
 Creates a connector.
 
 

diff --git a/docs/reference/connector/apis/create-connector-sync-job-api.asciidoc b/docs/reference/connector/apis/create-connector-sync-job-api.asciidoc
@@ -4,6 +4,9 @@
 <titleabbrev>Create connector sync job</titleabbrev>
 ++++
 
+preview::[]
+
+
 Creates a connector sync job.
 
 [source, console]

diff --git a/docs/reference/connector/apis/delete-connector-api.asciidoc b/docs/reference/connector/apis/delete-connector-api.asciidoc
@@ -1,12 +1,11 @@
 [[delete-connector-api]]
 === Delete connector API
-
-preview::[]
-
 ++++
 <titleabbrev>Delete connector</titleabbrev>
 ++++
 
+preview::[]
+
 Removes a connector and its associated data.
 This is a destructive action that is not recoverable.
 

diff --git a/docs/reference/connector/apis/delete-connector-sync-job-api.asciidoc b/docs/reference/connector/apis/delete-connector-sync-job-api.asciidoc
@@ -1,12 +1,11 @@
 [[delete-connector-sync-job-api]]
 === Delete connector sync job API
-
-preview::[]
-
 ++++
 <titleabbrev>Delete connector sync job</titleabbrev>
 ++++
 
+preview::[]
+
 Removes a connector sync job and its associated data.
 This is a destructive action that is not recoverable.
 

diff --git a/docs/reference/connector/apis/get-connector-api.asciidoc b/docs/reference/connector/apis/get-connector-api.asciidoc
@@ -1,10 +1,11 @@
 [[get-connector-api]]
 === Get connector API
-preview::[]
 ++++
 <titleabbrev>Get connector</titleabbrev>
 ++++
 
+preview::[]
+
 Retrieves the details about a connector.
 
 [[get-connector-api-request]]

diff --git a/docs/reference/connector/apis/get-connector-sync-job-api.asciidoc b/docs/reference/connector/apis/get-connector-sync-job-api.asciidoc
@@ -1,10 +1,11 @@
 [[get-connector-sync-job-api]]
 === Get connector sync job API
-preview::[]
 ++++
 <titleabbrev>Get connector sync job</titleabbrev>
 ++++
 
+preview::[]
+
 Retrieves the details about a connector sync job.
 
 [[get-connector-sync-job-api-request]]

diff --git a/docs/reference/connector/apis/list-connector-sync-jobs-api.asciidoc b/docs/reference/connector/apis/list-connector-sync-jobs-api.asciidoc
@@ -1,13 +1,12 @@
 [role="xpack"]
 [[list-connector-sync-jobs-api]]
 === List connector sync jobs API
-
-preview::[]
-
 ++++
 <titleabbrev>List connector sync jobs</titleabbrev>
 ++++
 
+preview::[]
+
 Returns information about all stored connector sync jobs ordered by their creation date in ascending order.
 
 

diff --git a/docs/reference/connector/apis/list-connectors-api.asciidoc b/docs/reference/connector/apis/list-connectors-api.asciidoc
@@ -1,13 +1,12 @@
 [role="xpack"]
 [[list-connector-api]]
 === List connectors API
-
-preview::[]
-
 ++++
 <titleabbrev>List connectors</titleabbrev>
 ++++
 
+preview::[]
+
 Returns information about all stored connectors.
 
 

diff --git a/docs/reference/connector/apis/set-connector-sync-job-error-api.asciidoc b/docs/reference/connector/apis/set-connector-sync-job-error-api.asciidoc
@@ -4,6 +4,8 @@
 <titleabbrev>Set connector sync job error</titleabbrev>
 ++++
 
+preview::[]
+
 Sets a connector sync job error.
 
 [[set-connector-sync-job-error-api-request]]

diff --git a/docs/reference/connector/apis/set-connector-sync-job-stats-api.asciidoc b/docs/reference/connector/apis/set-connector-sync-job-stats-api.asciidoc
@@ -4,6 +4,8 @@
 <titleabbrev>Set connector sync job stats</titleabbrev>
 ++++
 
+preview::[]
+
 Sets connector sync job stats.
 
 [[set-connector-sync-job-stats-api-request]]

diff --git a/docs/reference/connector/apis/update-connector-configuration-api.asciidoc b/docs/reference/connector/apis/update-connector-configuration-api.asciidoc
@@ -1,12 +1,11 @@
 [[update-connector-configuration-api]]
 === Update connector configuration API
-
-preview::[]
-
 ++++
 <titleabbrev>Update connector configuration</titleabbrev>
 ++++
 
+preview::[]
+
 Updates the `configuration` of a connector.
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ @@
     <titleabbrev>Create connector</titleabbrev>
     ++++
+    preview::[]
     Creates a connector.
@@ Expand Down @@