Merge branch 'main' into fix/117042_Support_7x_segments_as_archive_in_8x

Author: drempapis

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/TermsReduceBenchmark.java

@@ -111,7 +111,7 @@ public void setup() {
                 dict[i] = new BytesRef(Long.toString(rand.nextLong()));
             }
             for (int i = 0; i < numShards; i++) {
-                aggsList.add(InternalAggregations.from(Collections.singletonList(newTerms(rand, dict, true))));
+                aggsList.add(InternalAggregations.from(newTerms(rand, dict, true)));
             }
         }
 
@@ -124,7 +124,7 @@ private StringTerms newTerms(Random rand, BytesRef[] dict, boolean withNested) {
             for (BytesRef term : randomTerms) {
                 InternalAggregations subAggs;
                 if (withNested) {
-                    subAggs = InternalAggregations.from(Collections.singletonList(newTerms(rand, dict, false)));
+                    subAggs = InternalAggregations.from(newTerms(rand, dict, false));
                 } else {
                     subAggs = InternalAggregations.EMPTY;
                 }

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/bucket/terms/StringTermsSerializationBenchmark.java

@@ -50,13 +50,13 @@ public class StringTermsSerializationBenchmark {
 
     @Setup
     public void initResults() {
-        results = DelayableWriteable.referencing(InternalAggregations.from(List.of(newTerms(true))));
+        results = DelayableWriteable.referencing(InternalAggregations.from(newTerms(true)));
     }
 
     private StringTerms newTerms(boolean withNested) {
         List<StringTerms.Bucket> resultBuckets = new ArrayList<>(buckets);
         for (int i = 0; i < buckets; i++) {
-            InternalAggregations inner = withNested ? InternalAggregations.from(List.of(newTerms(false))) : InternalAggregations.EMPTY;
+            InternalAggregations inner = withNested ? InternalAggregations.from(newTerms(false)) : InternalAggregations.EMPTY;
             resultBuckets.add(new StringTerms.Bucket(new BytesRef("test" + i), i, inner, false, 0, DocValueFormat.RAW));
         }
         return new StringTerms(

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ebdac923867a3cec0098302416d1e3c6c0c729fc4e2e05c10637a8af33a76c5
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -22,7 +22,7 @@ public enum DockerBase {
     // Chainguard based wolfi image with latest jdk
     // This is usually updated via renovatebot
     // spotless:off
-    WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:dd66beec64a7f9b19c6c35a1195153b2b630a55e16ec71949ed5187c5947eea1",
+    WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:bd401704a162a7937cd1015f755ca9da9aba0fdf967fc6bf90bf8d3f6b2eb557",
         "-wolfi",
         "apk"
     ),

build-tools-internal/src/main/resources/changelog-schema.json

@@ -291,6 +291,7 @@
         "JVM option",
         "Java API",
         "Logging",
+        "Logs",
         "Mapping",
         "Packaging",
         "Painless",

build-tools-internal/src/main/resources/minimumGradleVersion

@@ -1 +1 @@
-8.12
+8.12.1

catalog-info.yaml

@@ -123,7 +123,7 @@ spec:
       pipeline_file: .buildkite/pipelines/lucene-snapshot/build-snapshot.yml
       env:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
-        SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
+        SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
         SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
       branch_configuration: lucene_snapshot
       default_branch: lucene_snapshot
@@ -167,7 +167,7 @@ spec:
       pipeline_file: .buildkite/pipelines/lucene-snapshot/update-branch.yml
       env:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
-        SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
+        SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
         SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
       default_branch: lucene_snapshot
       teams:
@@ -210,7 +210,7 @@ spec:
       pipeline_file: .buildkite/pipelines/lucene-snapshot/run-tests.yml
       env:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
-        SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
+        SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
         SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
       branch_configuration: lucene_snapshot
       default_branch: lucene_snapshot

docs/README.asciidoc

@@ -157,16 +157,15 @@ used for its modifiers:
   * `// TESTRESPONSE[skip:reason]`: Skip the assertions specified by this
   response.
 * `// TESTSETUP`: Marks this snippet as the "setup" for all other snippets in
-  this file. This is a somewhat natural way of structuring documentation. You
-  say "this is the data we use to explain this feature" then you add the
-  snippet that you mark `// TESTSETUP` and then every snippet will turn into
-  a test that runs the setup snippet first. See the "painless" docs for a file
-  that puts this to good use. This is fairly similar to `// TEST[setup:name]`
-  but rather than the setup defined in `docs/build.gradle` the setup is defined
-  right in the documentation file. In general, we should prefer `// TESTSETUP`
-  over `// TEST[setup:name]` because it makes it more clear what steps have to
-  be taken before the examples will work. Tip: `// TESTSETUP` can only be used
-  on the first snippet of a document.
+  this file. In order to enhance clarity and simplify understanding for readers,
+  a straightforward approach involves marking the first snippet in the documentation file with the 
+  `// TESTSETUP` marker. By doing so, it clearly indicates that this particular snippet serves as the setup 
+  or preparation step for all subsequent snippets in the file. 
+  This helps in explaining the necessary steps that need to be executed before running the examples.
+  Unlike the alternative convention `// TEST[setup:name]`, which relies on a setup defined in a separate file,
+  this convention brings the setup directly into the documentation file, making it more self-contained and reducing ambiguity.
+  By adopting this convention, users can easily identify and follow the correct sequence 
+  of steps to ensure that the examples provided in the documentation work as intended.
 * `// TEARDOWN`: Ends and cleans up a test series started with `// TESTSETUP` or
   `// TEST[setup:name]`. You can use `// TEARDOWN` to set up multiple tests in
   the same file.

docs/build.gradle

@@ -120,7 +120,6 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
   // TODO: remove this once cname is prepended to transport.publish_address by default in 8.0
   systemProperty 'es.transport.cname_in_publish_address', 'true'
 
-  systemProperty 'es.queryable_built_in_roles_enabled', 'false'
 
   requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
   requiresFeature 'es.failure_store_feature_flag_enabled', Version.fromString("8.12.0")
@@ -856,6 +855,9 @@ buildRestTests.setups['library'] = '''
 
 '''
 buildRestTests.setups['sensor_rollup_job'] = '''
+  - requires:
+      test_runner_features: [ "allowed_warnings" ]
+
   - do:
       indices.create:
         index: dummy-rollup-index
@@ -886,9 +888,10 @@ buildRestTests.setups['sensor_rollup_job'] = '''
               node:
                 type: keyword
   - do:
-      raw:
-        method: PUT
-        path: _rollup/job/sensor
+      allowed_warnings:
+        - "The rollup functionality will be removed in Elasticsearch 10.0. See docs for more information."
+      rollup.put_job:
+        id: sensor
         body:  >
             {
                 "index_pattern": "sensor-*",
@@ -918,6 +921,9 @@ buildRestTests.setups['sensor_rollup_job'] = '''
             }
 '''
 buildRestTests.setups['sensor_started_rollup_job'] = '''
+  - requires:
+      test_runner_features: [ "allowed_warnings" ]
+
   - do:
       indices.create:
         index: dummy-rollup-index
@@ -967,9 +973,10 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
           {"timestamp": 1516297294000, "temperature": 202, "voltage": 4.0, "node": "c"}
 
   - do:
-      raw:
-        method: PUT
-        path: _rollup/job/sensor
+      allowed_warnings:
+        - "The rollup functionality will be removed in Elasticsearch 10.0. See docs for more information."
+      rollup.put_job:
+        id: sensor
         body:  >
             {
                 "index_pattern": "sensor-*",
@@ -998,9 +1005,10 @@ buildRestTests.setups['sensor_started_rollup_job'] = '''
                 ]
             }
   - do:
-      raw:
-        method: POST
-        path: _rollup/job/sensor/_start
+      allowed_warnings:
+        - "The rollup functionality will be removed in Elasticsearch 10.0. See docs for more information."
+      rollup.start_job:
+        id: sensor
 '''
 
 buildRestTests.setups['sensor_index'] = '''

docs/changelog/113131.yaml

@@ -0,0 +1,10 @@
+pr: 113131
+summary: Emit deprecation warning when executing one of the rollup APIs
+area: Rollup
+type: deprecation
+issues: []
+deprecation:
+  title: Emit deprecation warning when executing one of the rollup APIs
+  area: Rollup
+  details: Rollup is already deprecated since 8.11.0 via documentation and since 8.15.0 it is no longer possible to create new rollup jobs in clusters without rollup usage. This change updates the rollup APIs to emit a deprecation warning.
+  impact: Returning a deprecation warning when using one of the rollup APIs.