Merge branch 'main' into pem-rate-rnd-tst

Author: pabloem

.buildkite/pipelines/periodic.template.yml

@@ -246,7 +246,7 @@ steps:
       image: family/elasticsearch-ubuntu-2404
       machineType: n2-standard-8
       buildDirectory: /dev/shm/bk
-    if: build.branch == "main" || build.branch == "9.1" || build.branch == "9.0" || build.branch == "8.19" || build.branch == "8.18" || build.branch == "7.17"
+    if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$/
   - label: check-branch-consistency
     command: .ci/scripts/run-gradle.sh branchConsistency
     timeout_in_minutes: 15

.buildkite/pipelines/periodic.yml

@@ -684,7 +684,7 @@ steps:
       image: family/elasticsearch-ubuntu-2404
       machineType: n2-standard-8
       buildDirectory: /dev/shm/bk
-    if: build.branch == "main" || build.branch == "9.1" || build.branch == "9.0" || build.branch == "8.19" || build.branch == "8.18" || build.branch == "7.17"
+    if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$/
   - label: check-branch-consistency
     command: .ci/scripts/run-gradle.sh branchConsistency
     timeout_in_minutes: 15

docs/changelog/133659.yaml

@@ -0,0 +1,5 @@
+pr: 133659
+summary: Fixed GeneralScriptException to return 400 http status code
+area: Infra/Scripting
+type: bug
+issues: []

docs/changelog/133722.yaml

@@ -0,0 +1,5 @@
+pr: 133722
+summary: Fix disk usage estimation for SORTED_SET doc values
+area: Codec
+type: bug
+issues: []

docs/changelog/133752.yaml

@@ -0,0 +1,5 @@
+pr: 133752
+summary: Avoid stale enrich results after policy execution
+area: Ingest Node
+type: bug
+issues: []