Merge branch 'upstream/master' into rollup-index-improvement

* upstream/master: (167 commits)
  Mute FrozenSearchableSnapshotsIntegTests#testCreateAndRestorePartialSearchableSnapshot
  Mute LdapSessionFactoryTests#testSslTrustIsReloaded
  Fix spotless violation from last commit
  Mute GeoGridTilerTestCase#testGeoGridSetValuesBoundingBoxes_UnboundedGeoShapeCellValues
  Small formatting clean up (elastic#84144)
  Always re-run Feature migrations which have encountered errors (elastic#83918)
  [DOCS] Clarify `orientation` usage for WKT and GeoJSON polygons (elastic#84025)
  Group field caps response by index mapping hash (elastic#83494)
  Shrink join queries in slow log (elastic#83914)
  TSDB: Reject the nested object fields that are configured time_series_dimension (elastic#83920)
  [DOCS] Remove note about partial response from Bulk API docs (elastic#84053)
  Allow regular data streams to be migrated to tsdb data streams. (elastic#83843)
  [DOCS] Fix `ignore_unavailable` parameter definition (elastic#84071)
  Make Metadata extend AbstractCollection (elastic#83791)
  Add API specs for OpenID Connect APIs
  Revert "Clean up for superuser role name references (elastic#83627)" (elastic#84096)
  Update Lucene analysis base url (elastic#84094)
  Avoid null threadContext in ResultDeduplicator (elastic#84093)
  Use static empty store files metadata (elastic#84034)
  Preserve context in snapshotDeletionListeners (elastic#84089)
  ...

# Conflicts:
#	x-pack/plugin/rollup/build.gradle

Author: weizijun

.ci/bwcVersions

@@ -51,5 +51,6 @@ BWC_VERSION:
   - "7.17.0"
   - "7.17.1"
   - "8.0.0"
+  - "8.0.1"
   - "8.1.0"
   - "8.2.0"

.ci/jobs.t/elastic+elasticsearch+intake+multijob+bwc.yml renamed to .ci/jobs.t/elastic+elasticsearch+intake+multijob+bwc-snapshots.yml

@@ -1,7 +1,9 @@
 ---
-jjbb-template: generic-gradle-unix.yml
+jjbb-template: matrix-gradle-unix.yml
 vars:
-  - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc
+  - job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc-snapshots
   - job-display-name: "elastic / elasticsearch # %BRANCH% - intake bwc"
   - job-description: Elasticsearch %BRANCH% branch intake backwards compatibility checks.
-  - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files bwcTestSnapshots"
+  - matrix-yaml-file: ".ci/snapshotBwcVersions"
+  - matrix-variable: BWC_VERSION
+  - gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$BWC_VERSION#bwcTest"

.ci/jobs.t/elastic+elasticsearch+intake.yml

@@ -42,7 +42,7 @@
               kill-phase-on: NEVER
               current-parameters: true
               git-revision: true
-            - name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc
+            - name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc-snapshots
               kill-phase-on: NEVER
               current-parameters: true
               git-revision: true

.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml

@@ -14,6 +14,7 @@
           type: label-expression
           name: os
           values:
+            - "almalinux-8-aarch64&&immutable"
             - "ubuntu-1804-aarch64&&immutable"
     builders:
       - inject:

.ci/jobs.t/elastic+elasticsearch+pull-request+bwc.yml renamed to .ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots.yml

@@ -1,9 +1,11 @@
 ---
 - job:
-    name: "elastic+elasticsearch+pull-request+bwc"
+    name: "elastic+elasticsearch+pull-request+bwc-snapshots"
     display-name: "elastic / elasticsearch - pull request bwc"
     description: "Testing of Elasticsearch pull requests - bwc"
-    workspace: "/dev/shm/elastic+elasticsearch+pull-request+bwc"
+    project-type: matrix
+    node: master
+    child-workspace: "/dev/shm/elastic+elasticsearch+pull-request+bwc"
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
@@ -23,6 +25,16 @@
           black-list-labels:
             - '>test-mute'
             - 'test-full-bwc'
+    axes:
+      - axis:
+          type: slave
+          name: nodes
+          values:
+            - "general-purpose"
+      - axis:
+          type: yaml
+          filename: ".ci/snapshotBwcVersions"
+          name: "BWC_VERSION"
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'
@@ -34,4 +46,4 @@
             JAVA16_HOME=$HOME/.java/openjdk16
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          $WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed bwcTestSnapshots
+          $WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed v$BWC_VERSION#bwcTest

.ci/snapshotBwcVersions

@@ -0,0 +1,5 @@
+BWC_VERSION:
+  - "7.17.1"
+  - "8.0.1"
+  - "8.1.0"
+  - "8.2.0"

CHANGELOG.md

@@ -0,0 +1,3 @@
+# Elasticsearch Changlog
+
+Please see the [release notes](https://www.elastic.co/guide/en/elasticsearch/reference/current/es-release-notes.html) in the reference manual.

CONTRIBUTING.md

@@ -112,11 +112,11 @@ Contributing to the Elasticsearch codebase
 
 **Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
 
-JDK 16 is required to build Elasticsearch. You must have a JDK 16 installation
+JDK 17 is required to build Elasticsearch. You must have a JDK 17 installation
 with the environment variable `JAVA_HOME` referencing the path to Java home for
-your JDK 16 installation. By default, tests use the same runtime as `JAVA_HOME`.
+your JDK 17 installation. By default, tests use the same runtime as `JAVA_HOME`.
 However, since Elasticsearch supports JDK 11, the build supports compiling with
-JDK 16 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME`
+JDK 17 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME`
 pointing to the Java home of a JDK 11 installation. Note that this mechanism can
 be used to test against other JDKs as well, this is not only limited to JDK 11.
 
@@ -151,9 +151,9 @@ and then run `curl` in another window like this:
 ### Importing the project into IntelliJ IDEA
 
 The minimum IntelliJ IDEA version required to import the Elasticsearch project is 2020.1
-Elasticsearch builds using Java 16. When importing into IntelliJ you will need
+Elasticsearch builds using Java 17. When importing into IntelliJ you will need
 to define an appropriate SDK. The convention is that **this SDK should be named
-"16"** so that the project import will detect it automatically. For more details
+"17"** so that the project import will detect it automatically. For more details
 on defining an SDK in IntelliJ please refer to [their documentation](https://www.jetbrains.com/help/idea/sdk.html#define-sdk).
 SDK definitions are global, so you can add the JDK from any project, or after
 project import. Importing with a missing JDK will still work, IntelliJ will

benchmarks/README.md

@@ -5,7 +5,7 @@ This directory contains the microbenchmark suite of Elasticsearch. It relies on
 ## Purpose
 
 We do not want to microbenchmark everything but the kitchen sink and should typically rely on our
-[macrobenchmarks](https://elasticsearch-benchmarks.elastic.co/app/kibana#/dashboard/Nightly-Benchmark-Overview) with
+[macrobenchmarks](https://elasticsearch-benchmarks.elastic.co/) with
 [Rally](https://github.com/elastic/rally). Microbenchmarks are intended to spot performance regressions in performance-critical components.
 The microbenchmark suite is also handy for ad-hoc microbenchmarks but please remove them again before merging your PR.
 

benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json

@@ -1233,6 +1233,11 @@
             "total" : 0,
             "failed" : 0
           }
+        },
+        "archive" : {
+          "available" : false,
+          "enabled" : true,
+          "indices_count" : 0
         }
       }
     }