Merge remote-tracking branch 'origin/main' into lucene_snapshot

Author: elasticsearchmachine

docs/changelog/131015.yaml

@@ -0,0 +1,5 @@
+pr: 131015
+summary: Move streams status actions to cluster:monitor group
+area: Data streams
+type: bug
+issues: []

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/StreamsStatusAction.java

@@ -26,7 +26,7 @@
 
 public class StreamsStatusAction {
 
-    public static ActionType<Response> INSTANCE = new ActionType<>("cluster:admin/streams/status");
+    public static ActionType<Response> INSTANCE = new ActionType<>("cluster:monitor/streams/status");
 
     public static class Request extends LocalClusterStateRequest {
         protected Request(TimeValue masterTimeout) {

muted-tests.yml

@@ -546,6 +546,12 @@ tests:
 - class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT
   method: testNotLikeListKeyword
   issue: https://github.com/elastic/elasticsearch/issues/131155
+- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
+  method: testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges
+  issue: https://github.com/elastic/elasticsearch/issues/131165
+- class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT
+  method: testLookupJoinAliases
+  issue: https://github.com/elastic/elasticsearch/issues/131166
 
 # Examples:
 #

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

@@ -534,7 +534,6 @@ public static void setupEntitlementsForClass() {
             TestEntitlementBootstrap.setActive(false == withoutEntitlements);
             TestEntitlementBootstrap.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode);
             if (entitledPackages != null) {
-                assert withEntitlementsOnTestCode == false : "Cannot use @WithEntitlementsOnTestCode together with @EntitledTestPackages";
                 assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages";
                 TestEntitlementBootstrap.setEntitledTestPackages(entitledPackages.value());
             }

x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java

@@ -73,7 +73,6 @@ public class Constants {
         "cluster:admin/scripts/painless/context",
         "cluster:admin/scripts/painless/execute",
         "cluster:admin/streams/logs/toggle",
-        "cluster:admin/streams/status",
         "cluster:admin/synonyms/delete",
         "cluster:admin/synonyms/get",
         "cluster:admin/synonyms/put",
@@ -373,6 +372,7 @@ public class Constants {
         "cluster:monitor/settings",
         "cluster:monitor/state",
         "cluster:monitor/stats",
+        "cluster:monitor/streams/status",
         "cluster:monitor/task",
         "cluster:monitor/task/get",
         "cluster:monitor/tasks/lists",

x-pack/test/idp-fixture/src/main/resources/oidc/Dockerfile

@@ -1,5 +1,5 @@
 FROM c2id/c2id-server-demo:16.1.1 AS c2id
-FROM openjdk:21-jdk-buster
+FROM eclipse-temurin:17-noble
 
 # Using this to launch a fake server on container start; see `setup.sh`
 RUN apt-get update -qqy && apt-get install -qqy python3