Merge branch 'upstream/master' into rollover-add-max_shard_docs

* upstream/master: (762 commits)
  [DOCS] Add note to that log4j customization is outside the support scope (elastic#82668)
  Batch Index Settings Update Requests (elastic#82896)
  [DOCS] Delete pipeline containing stored script (elastic#83102)
  Try again to fix changelog areas after reorg (elastic#83100)
  Bind to non-localhost for transport in some cases (elastic#82973)
  [DOCS] Reuse multi-level `join` warning (elastic#82976)
  Remove unnecessary CopyOnWriteHashMap class (elastic#83040)
  Adjust changelog categories after reorg (elastic#83087)
  [DOCS] Fix typo in `action.destructive_requires_name` breaking change (elastic#83085)
  Stack Monitoring: Add Enterprise Search monitoring index templates (elastic#82743)
  [DOCS] Fix stored script example snippet (elastic#83056)
  [DOCS] Re-add network traffic para to `term` query (elastic#83047)
  [DOCS] Rename example stored script (elastic#83054)
  [ML][DOCS] Add Trained model APIs to the REST APIs index (elastic#82791)
  [ML] Update running process when global calendar changes (elastic#83044)
  [Transform] Fix condition on which the transform stops processing buckets (elastic#82852)
  [DOCS] Fixes field names in ML sum functions. (elastic#83048)
  [ML] fix NLP tokenization never_split handling around punctuation (elastic#82982)
  Construct dynamic updates directly via object builders (elastic#81449)
  Emit trace.id into audit logs (elastic#82849)
  ...

# Conflicts:
#	client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
#	client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java
#	server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java
#	server/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java
#	x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/RolloverActionTests.java
#	x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/TimeseriesLifecycleTypeTests.java
#	x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/WaitForRolloverReadyStepTests.java

Author: weizijun

.backportrc.json

@@ -3,9 +3,8 @@
   "targetBranchChoices": [
     "master",
     "8.0",
+    "7.17",
     "7.16",
-    "7.15",
-    "7.14",
     "6.8"
   ],
   "targetPRLabels": ["backport"],

.ci/bwcVersions

@@ -44,7 +44,11 @@ BWC_VERSION:
   - "7.15.0"
   - "7.15.1"
   - "7.15.2"
-  - "7.15.3"
   - "7.16.0"
+  - "7.16.1"
+  - "7.16.2"
+  - "7.16.3"
+  - "7.16.4"
+  - "7.17.0"
   - "8.0.0"
   - "8.1.0"

.ci/java-versions-aarch64.properties

@@ -4,5 +4,5 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=jdk16
+ES_BUILD_JAVA=jdk17
 ES_RUNTIME_JAVA=jdk17

.ci/java-versions-fips.properties

@@ -4,5 +4,5 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=openjdk16
+ES_BUILD_JAVA=openjdk17
 ES_RUNTIME_JAVA=openjdk17

.ci/java-versions.properties

@@ -4,5 +4,5 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=openjdk16
+ES_BUILD_JAVA=openjdk17
 ES_RUNTIME_JAVA=openjdk17

.ci/jobs.t/defaults.yml

@@ -53,6 +53,7 @@
           url: https://github.com/elastic/elasticsearch/
       - inject:
           properties-content: |
+            COMPOSE_HTTP_TIMEOUT=120
             JOB_BRANCH=%BRANCH%
             HOME=$JENKINS_HOME
             GRADLEW=./gradlew --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/

.ci/jobs.t/elastic+elasticsearch+multijob+packaging-tests-upgrade.yml

@@ -28,4 +28,4 @@
             JAVA16_HOME=$HOME/.java/openjdk16
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          ./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION
+          ./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v$BWC_VERSION

.ci/jobs.t/elastic+elasticsearch+periodic+ear.yml

@@ -25,6 +25,7 @@
           sudo cryptsetup open --key-file key.secret "$LOOP" secret --verbose
           sudo mkfs.ext2 /dev/mapper/secret
           sudo mkdir /mnt/secret
+          # Change /mnt/secret with care (at least a test uses this path to detect when encryption at rest is used)
           sudo mount /dev/mapper/secret /mnt/secret
           sudo chown -R jenkins /mnt/secret
           cp -r "$WORKSPACE" /mnt/secret

.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark.yml

@@ -0,0 +1,49 @@
+---
+- job:
+    name: "elastic+elasticsearch+pull-request+build-benchmark"
+    display-name: "elastic / elasticsearch - pull request build benchmark"
+    description: "Testing of Elasticsearch pull requests - build benchmark"
+    workspace: "/dev/shm/elastic+elasticsearch+pull-request+build-bench"
+    scm:
+      - git:
+          refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
+          branches:
+            - "${ghprbActualCommit}"
+    properties:
+      - inject:
+          properties-content: |
+            BUILD_PERFORMANCE_TEST=true
+            COMPOSE_HTTP_TIMEOUT=120
+            JOB_BRANCH=%BRANCH%
+            HOME=$JENKINS_HOME
+            GRADLEW=./gradlew --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
+            GRADLEW_BAT=./gradlew.bat --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
+    triggers:
+      - github-pull-request:
+          org-list:
+            - elastic
+          allow-whitelist-orgs-as-admins: true
+          trigger-phrase: '.*run\W+elasticsearch-ci/build-bench.*'
+          github-hooks: true
+          status-context: elasticsearch-ci/build-benchmark
+          cancel-builds-on-update: true
+          black-list-target-branches:
+            - 6.8
+          excluded-regions:
+            - ^docs/.*
+          white-list-labels:
+            - 'build-benchmark'
+    builders:
+      - inject:
+          properties-file: '.ci/java-versions.properties'
+          properties-content: |
+            JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
+            RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
+            JAVA8_HOME=$HOME/.java/java8
+            JAVA11_HOME=$HOME/.java/java11
+      - shell: |
+         #!/usr/local/bin/runbld --redirect-stderr
+         $WORKSPACE/.ci/scripts/run-gradle.sh :build-tools-internal:bootstrapPerformanceTests
+         $WORKSPACE/.ci/scripts/install-gradle-profiler.sh
+         $WORKSPACE/.ci/scripts/run-gradle-profiler.sh --benchmark --scenario-file build-tools-internal/build/performanceTests/elasticsearch-build-tool-update.scenarios --project-dir . --output-dir profile-out
+         tar -czf build/${BUILD_NUMBER}.tar.bz2 profile-out

.ci/jobs.t/elastic+elasticsearch+pull-request+example-plugins.yml

@@ -18,8 +18,11 @@
           github-hooks: true
           status-context: elasticsearch-ci/example-plugins
           cancel-builds-on-update: true
-          white-list-labels:
-            - ':Delivery/Build'
+          included-regions:
+            - build-conventions/.*
+            - build-tools/.*
+            - build-tools-internal/.*
+            - plugins/examples/.*
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'