Merge branch 'main' into remove-ingest-document-equals

joegallo · Sep 18, 2023 · ab38b86 · ab38b86
2 parents 8d0e9ab + 3691312
commit ab38b86
Show file tree

Hide file tree

Showing 68 changed files with 634 additions and 327 deletions.
diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part1.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part1.yml
@@ -34,6 +34,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'build-benchmark'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part2.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part2.yml
@@ -34,6 +34,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'build-benchmark'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots-windows.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots-windows.yml
@@ -29,6 +29,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots.yml
@@ -26,6 +26,7 @@
           black-list-labels:
             - '>test-mute'
             - 'test-full-bwc'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+cloud-deploy.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+cloud-deploy.yml
@@ -26,6 +26,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'cloud-deploy'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+docs-check.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+docs-check.yml
@@ -23,6 +23,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+eql-correctness.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+eql-correctness.yml
@@ -25,6 +25,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+example-plugins.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+example-plugins.yml
@@ -23,6 +23,8 @@
             - build-tools/.*
             - build-tools-internal/.*
             - plugins/examples/.*
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+full-bwc.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+full-bwc.yml
@@ -27,6 +27,7 @@
             - 'test-full-bwc'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix-sample.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix-sample.yml
@@ -27,6 +27,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix.yml
@@ -28,6 +28,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-nojdk.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-nojdk.yml
@@ -32,6 +32,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample-nojdk.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample-nojdk.yml
@@ -31,6 +31,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml
@@ -30,6 +30,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows.yml
@@ -32,6 +32,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-upgrade-tests.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-upgrade-tests.yml
@@ -29,6 +29,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml
@@ -27,6 +27,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-windows.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-windows.yml
@@ -28,6 +28,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml
@@ -27,6 +27,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-windows.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-windows.yml
@@ -28,6 +28,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-fips.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-fips.yml
@@ -28,6 +28,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-windows.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-3-windows.yml
@@ -29,6 +29,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-3.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-3.yml
@@ -23,6 +23,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
           black-list-target-branches:
             - 6.8
             - 7.17

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+precommit.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+precommit.yml
@@ -20,6 +20,8 @@
           cancel-builds-on-update: true
           white-list-labels:
             - '>test-mute'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+release-tests.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+release-tests.yml
@@ -25,6 +25,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'test-release'
+          black-list-labels:
+            - 'buildkite-opt-in'
           black-list-target-branches:
             - 7.15
             - 6.8

diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+rest-compatibility.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+rest-compatibility.yml
@@ -28,6 +28,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/.ci/templates.t/pull-request-gradle-unix.yml b/.ci/templates.t/pull-request-gradle-unix.yml
@@ -23,6 +23,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

diff --git a/docs/changelog/99470.yaml b/docs/changelog/99470.yaml
@@ -0,0 +1,5 @@
+pr: 99470
+summary: "ESQL: Improve log messages"
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/reference/snapshot-restore/repository-s3.asciidoc b/docs/reference/snapshot-restore/repository-s3.asciidoc
@@ -226,16 +226,16 @@ emulate S3's behaviour in full. The `repository-s3` type requires full
 compatibility with S3. In particular it must support the same set of API
 endpoints, return the same errors in case of failures, and offer consistency
 and performance at least as good as S3 even when accessed concurrently by
-multiple nodes. Incompatible error codes, consistency or performance may be
-particularly hard to track down since errors, consistency failures, and
-performance issues are usually rare and hard to reproduce.
+multiple nodes. You will need to work with the supplier of your storage system
+to address any incompatibilities you encounter.
 
 You can perform some basic checks of the suitability of your storage system
 using the {ref}/repo-analysis-api.html[repository analysis API]. If this API
 does not complete successfully, or indicates poor performance, then your
 storage system is not fully compatible with AWS S3 and therefore unsuitable for
-use as a snapshot repository. You will need to work with the supplier of your
-storage system to address any incompatibilities you encounter.
+use as a snapshot repository. However, these checks do not guarantee full
+compatibility. Incompatible error codes and consistency or performance issues
+may be rare and hard to reproduce.
 
 [[repository-s3-repository]]
 ==== Repository settings

diff --git a/...rc/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceTests.java b/...rc/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceTests.java
@@ -923,7 +923,7 @@ public void testDownsampling() throws Exception {
             DataStreamLifecycle.newBuilder()
                 .downsampling(
                     new Downsampling(
-                        List.of(new Round(TimeValue.timeValueMillis(0), new DownsampleConfig(new DateHistogramInterval("1s"))))
+                        List.of(new Round(TimeValue.timeValueMillis(0), new DownsampleConfig(new DateHistogramInterval("5m"))))
                     )
                 )
                 .dataRetention(TimeValue.MAX_VALUE)
@@ -977,7 +977,7 @@ public void testDownsampling() throws Exception {
         String downsampleIndexName = DownsampleConfig.generateDownsampleIndexName(
             DOWNSAMPLED_INDEX_PREFIX,
             state.metadata().index(firstGenIndex),
-            new DateHistogramInterval("1s")
+            new DateHistogramInterval("5m")
         );
         {
             // let's simulate the in-progress downsampling
@@ -1100,7 +1100,7 @@ public void testDownsamplingWhenTargetIndexNameClashYieldsException() throws Exc
             DataStreamLifecycle.newBuilder()
                 .downsampling(
                     new Downsampling(
-                        List.of(new Round(TimeValue.timeValueMillis(0), new DownsampleConfig(new DateHistogramInterval("1s"))))
+                        List.of(new Round(TimeValue.timeValueMillis(0), new DownsampleConfig(new DateHistogramInterval("5m"))))
                     )
                 )
                 .dataRetention(TimeValue.MAX_VALUE)
@@ -1129,7 +1129,7 @@ public void testDownsamplingWhenTargetIndexNameClashYieldsException() throws Exc
         String downsampleIndexName = DownsampleConfig.generateDownsampleIndexName(
             DOWNSAMPLED_INDEX_PREFIX,
             state.metadata().index(firstGenIndexName),
-            new DateHistogramInterval("1s")
+            new DateHistogramInterval("5m")
         );
         Metadata.Builder newMetadata = Metadata.builder(state.metadata())
             .put(

diff --git a/.../yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/10_explain_lifecycle.yml b/.../yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/10_explain_lifecycle.yml
@@ -1,8 +1,8 @@
 ---
 "Explain backing index lifecycle":
   - skip:
-      version: " - 8.9.99"
-      reason: "Explain data stream lifecycle API was updated in 8.10"
+      version: " - 8.10.99"
+      reason: "Data stream lifecycle was GA in 8.11"
       features: allowed_warnings
   - do:
       allowed_warnings:

diff --git a/...ources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml b/...ources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml
@@ -1,8 +1,8 @@
 ---
 "Create data stream with lifecycle":
   - skip:
-      version: " - 8.9.99"
-      reason: "data stream lifecycle in index templates was added after 8.10"
+      version: " - 8.10.99"
+      reason: "Data stream lifecycle was GA in 8.11"
       features: allowed_warnings
   - do:
       allowed_warnings:

diff --git a/...eams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/30_not_found.yml b/...eams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/30_not_found.yml
@@ -1,8 +1,8 @@
 setup:
   - skip:
       features: allowed_warnings
-      version: " - 8.9.99"
-      reason: "Data stream lifecycles only supported in 8.10+"
+      version: " - 8.10.99"
+      reason: "Data stream lifecycle was GA in 8.11"
   - do:
       allowed_warnings:
         - "index template [my-lifecycle] has index patterns [my-data-stream-1] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-lifecycle] will take precedence during new index creation"