Merge pull request ESQL-1371 from elastic/main

🤖 ESQL: Merge upstream

Author: elasticsearchmachine

server/src/main/java/org/elasticsearch/health/RestGetHealthAction.java

@@ -11,6 +11,8 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestCancellableNodeClient;
 import org.elasticsearch.rest.action.RestChunkedToXContentListener;
 
@@ -19,6 +21,7 @@
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
+@ServerlessScope(Scope.INTERNAL)
 public class RestGetHealthAction extends BaseRestHandler {
 
     private static final String VERBOSE_PARAM = "verbose";

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java

@@ -31,7 +31,7 @@
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
-@ServerlessScope(Scope.PUBLIC)
+@ServerlessScope(Scope.INTERNAL)
 public class RestClusterGetSettingsAction extends BaseRestHandler {
 
     private final Settings settings;

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java

@@ -25,7 +25,7 @@
 
 import static org.elasticsearch.rest.RestRequest.Method.PUT;
 
-@ServerlessScope(Scope.PUBLIC)
+@ServerlessScope(Scope.INTERNAL)
 public class RestClusterUpdateSettingsAction extends BaseRestHandler {
     private static final String PERSISTENT = "persistent";
     private static final String TRANSIENT = "transient";

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java

@@ -21,7 +21,7 @@
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
-@ServerlessScope(Scope.PUBLIC)
+@ServerlessScope(Scope.INTERNAL)
 public class RestPendingClusterTasksAction extends BaseRestHandler {
 
     @Override

server/src/main/java/org/elasticsearch/rest/action/cat/RestCatRecoveryAction.java

@@ -23,6 +23,8 @@
 import org.elasticsearch.indices.recovery.RecoveryState;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestCancellableNodeClient;
 import org.elasticsearch.rest.action.RestResponseListener;
 
@@ -38,6 +40,7 @@
  * in a string format, designed to be used at the command line. An Index can
  * be specified to limit output to a particular index or indices.
  */
+@ServerlessScope(Scope.INTERNAL)
 public class RestCatRecoveryAction extends AbstractCatAction {
 
     @Override

server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java

@@ -14,13 +14,16 @@
 import org.elasticsearch.common.Table;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestResponseListener;
 
 import java.util.List;
 import java.util.Locale;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
+@ServerlessScope(Scope.INTERNAL)
 public class RestHealthAction extends AbstractCatAction {
 
     @Override

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/ClusterHandle.java

@@ -29,6 +29,12 @@ public interface ClusterHandle extends Closeable {
      */
     void stop(boolean forcibly);
 
+    /**
+     * Stops the node at a given index.
+     * @param index of the node to stop
+     */
+    void stopNode(int index);
+
     /**
      * Restarts the cluster. Effectively the same as calling {@link #stop(boolean)} followed by {@link #start()}
      *
@@ -60,6 +66,11 @@ public interface ClusterHandle extends Closeable {
      */
     String getHttpAddress(int index);
 
+    /**
+     * Get the name of the node for the given index.
+     */
+    String getName(int index);
+
     /**
      * Returns a comma-separated list of TCP transport endpoints for cluster. If this method is called on an unstarted cluster, the cluster
      * will be started. This method is thread-safe and subsequent calls will wait for cluster start and availability.

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/DefaultElasticsearchCluster.java

@@ -53,6 +53,12 @@ public void stop(boolean forcibly) {
         handle.stop(forcibly);
     }
 
+    @Override
+    public void stopNode(int index) {
+        checkHandle();
+        handle.stopNode(index);
+    }
+
     @Override
     public void restart(boolean forcibly) {
         checkHandle();
@@ -83,6 +89,12 @@ public String getHttpAddress(int index) {
         return handle.getHttpAddress(index);
     }
 
+    @Override
+    public String getName(int index) {
+        checkHandle();
+        return handle.getName(index);
+    }
+
     @Override
     public String getTransportEndpoints() {
         checkHandle();

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterHandle.java

@@ -156,6 +156,14 @@ public void upgradeToVersion(Version version) {
         waitUntilReady();
     }
 
+    public String getName(int index) {
+        return nodes.get(index).getName();
+    }
+
+    public void stopNode(int index) {
+        nodes.get(index).stop(false);
+    }
+
     protected void waitUntilReady() {
         writeUnicastHostsFile();
         try {

x-pack/plugin/core/src/main/java/module-info.java

@@ -72,6 +72,7 @@
     exports org.elasticsearch.xpack.core.logstash;
     exports org.elasticsearch.xpack.core.ml.action;
     exports org.elasticsearch.xpack.core.ml.annotations;
+    exports org.elasticsearch.xpack.core.ml.autoscaling;
     exports org.elasticsearch.xpack.core.ml.calendars;
     exports org.elasticsearch.xpack.core.ml.datafeed.extractor;
     exports org.elasticsearch.xpack.core.ml.datafeed;