CPS S2D4: do not expose skip_unavailable in API responses

Author: pawankartik-elastic

server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRemoteIT.java

@@ -97,8 +97,8 @@ public void testRemoteClusterStats() throws ExecutionException, InterruptedExcep
             assertThat(remoteStats.get(clusterAlias).clusterUUID(), not(equalTo("")));
             assertThat(remoteStats.get(clusterAlias).mode(), oneOf("sniff", "proxy"));
         }
-        assertFalse(remoteStats.get(REMOTE1).skipUnavailable());
-        assertTrue(remoteStats.get(REMOTE2).skipUnavailable());
+        assertFalse(remoteStats.get(REMOTE1).skipUnavailable().get());
+        assertTrue(remoteStats.get(REMOTE2).skipUnavailable().get());
     }
 
     private void setupClusters() {

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 public class ClusterStatsResponse extends BaseNodesResponse<ClusterStatsNodeResponse> implements ToXContentFragment {
@@ -181,7 +182,7 @@ public String toString() {
     public record RemoteClusterStats(
         String clusterUUID,
         String mode,
-        boolean skipUnavailable,
+        Optional<Boolean> skipUnavailable,
         String transportCompress,
         Set<String> versions,
         String status,
@@ -192,7 +193,7 @@ public record RemoteClusterStats(
         long heapBytes,
         long memBytes
     ) implements ToXContentFragment {
-        public RemoteClusterStats(String mode, boolean skipUnavailable, String transportCompress) {
+        public RemoteClusterStats(String mode, Optional<Boolean> skipUnavailable, String transportCompress) {
             this(
                 "unavailable",
                 mode,
@@ -231,7 +232,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.startObject();
             builder.field("cluster_uuid", clusterUUID);
             builder.field("mode", mode);
-            builder.field("skip_unavailable", skipUnavailable);
+            if (skipUnavailable.isPresent()) {
+                builder.field("skip_unavailable", skipUnavailable.get());
+            }
             builder.field("transport.compress", transportCompress);
             builder.field("status", status);
             builder.field("version", versions);

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java

@@ -497,7 +497,7 @@ RemoteClusterStats makeRemoteClusterStats(String clusterAlias) {
             var compression = RemoteClusterSettings.REMOTE_CLUSTER_COMPRESS.getConcreteSettingForNamespace(clusterAlias).get(settings);
             return new RemoteClusterStats(
                 remoteConnectionInfo.getModeInfo().modeName(),
-                remoteConnection.isSkipUnavailable(),
+                remoteClusterService.isSkipUnavailable(clusterAlias),
                 compression.toString()
             );
         }