Kafka Node and Rebalance Enhancements

.github/workflows/integration.yml

@@ -166,7 +166,7 @@ jobs:
           # See: https://quarkus.io/guides/tests-with-coverage#coverage-for-integration-tests
           #
           mvn verify -B --no-transfer-progress -DskipSTs \
-            -Dquarkus.package.write-transformed-bytecode-to-build-output=true
+            -Dquarkus.package.write-transformed-bytecode-to-build-output=false
 
       - name: Archive Failed Tests Results
         uses: actions/upload-artifact@v7
@@ -208,25 +208,23 @@ jobs:
           npm ci --ignore-scripts
           npm run lint
 
-#  test-storybook:
-#    runs-on: ubuntu-24.04
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v7
-#
-#      - name: Build Storybook
-#        working-directory: ./ui
-#        run: |
-#          npm ci
-#          npx playwright install
-#          npm run build-storybook
-#
-#      - name: Test Storybook
-#        working-directory: ./ui
-#        run: |
-#          npx --yes concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
-#            "npx http-server storybook-static --port 6006 --silent" \
-#            "npx wait-on tcp:127.0.0.1:6006 && npm run test-storybook"
+  test-storybook:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - name: Install Dependencies
+        working-directory: api/src/main/webui
+        run: npm ci --ignore-scripts
+
+      - name: Install Playwright Browsers
+        working-directory: api/src/main/webui
+        run: node_modules/.bin/playwright install chromium --with-deps
+
+      - name: Test Storybook
+        working-directory: api/src/main/webui
+        run: npm run test-storybook
 
   Playwright:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'safe to test') || github.repository == 'streamshub/console' }}

.gitignore

@@ -36,4 +36,4 @@ release.properties
 # Systemtests
 systemtests/screenshots/
 systemtests/config.yaml
-systemtests/tracing/
+systemtests/tracing/

api/src/main/java/com/github/streamshub/console/api/KafkaRebalancesResource.java

@@ -142,7 +142,7 @@ public Response listRebalances(
                 listParams,
                 KafkaRebalance::fromCursor);
 
-        var rebalanceList = rebalanceService.listRebalances(listSupport);
+        var rebalanceList = rebalanceService.listRebalances(fields, listSupport);
         var responseEntity = new KafkaRebalance.RebalanceDataList(rebalanceList, listSupport);
 
         return Response.ok(responseEntity).build();
@@ -156,7 +156,7 @@ public Response listRebalances(
     @APIResponse(responseCode = "504", ref = "ServerTimeout")
     @Authorized
     @ResourcePrivilege(Privilege.GET)
-    public Response getRebalance(
+    public Response describeRebalance(
             @Parameter(description = "Cluster identifier")
             @PathParam("clusterId")
             String clusterId,
@@ -176,6 +176,7 @@ public Response getRebalance(
                         KafkaRebalance.Fields.STATUS,
                         KafkaRebalance.Fields.MODE,
                         KafkaRebalance.Fields.BROKERS,
+                        KafkaRebalance.Fields.BROKER_CAPACITY,
                         KafkaRebalance.Fields.GOALS,
                         KafkaRebalance.Fields.SKIP_HARD_GOAL_CHECK,
                         KafkaRebalance.Fields.REBALANCE_DISK,
@@ -187,6 +188,7 @@ public Response getRebalance(
                         KafkaRebalance.Fields.REPLICA_MOVEMENT_STRATEGIES,
                         KafkaRebalance.Fields.SESSION_ID,
                         KafkaRebalance.Fields.OPTIMIZATION_RESULT,
+                        KafkaRebalance.Fields.OPTIMIZATION_PROPOSAL,
                         KafkaRebalance.Fields.CONDITIONS,
                     },
                     payload = ErrorCategory.InvalidQueryParameter.class)
@@ -203,6 +205,7 @@ public Response getRebalance(
                                 KafkaRebalance.Fields.STATUS,
                                 KafkaRebalance.Fields.MODE,
                                 KafkaRebalance.Fields.BROKERS,
+                                KafkaRebalance.Fields.BROKER_CAPACITY,
                                 KafkaRebalance.Fields.GOALS,
                                 KafkaRebalance.Fields.SKIP_HARD_GOAL_CHECK,
                                 KafkaRebalance.Fields.REBALANCE_DISK,
@@ -214,13 +217,14 @@ public Response getRebalance(
                                 KafkaRebalance.Fields.REPLICA_MOVEMENT_STRATEGIES,
                                 KafkaRebalance.Fields.SESSION_ID,
                                 KafkaRebalance.Fields.OPTIMIZATION_RESULT,
+                                KafkaRebalance.Fields.OPTIMIZATION_PROPOSAL,
                                 KafkaRebalance.Fields.CONDITIONS,
                             }))
             List<String> fields) {
 
         requestedFields.accept(fields);
 
-        var result = rebalanceService.getRebalance(rebalanceId);
+        var result = rebalanceService.getRebalance(rebalanceId, fields);
         var responseEntity = new KafkaRebalance.RebalanceData(result);
 
         return Response.ok(responseEntity).build();

api/src/main/java/com/github/streamshub/console/api/model/KafkaRebalance.java

@@ -1,5 +1,6 @@
 package com.github.streamshub.console.api.model;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -64,6 +65,7 @@ public static class Fields {
         public static final String STATUS = "status";
         public static final String MODE = "mode";
         public static final String BROKERS = "brokers";
+        public static final String BROKER_CAPACITY = "brokerCapacity";
         public static final String GOALS = "goals";
         public static final String SKIP_HARD_GOAL_CHECK = "skipHardGoalCheck";
         public static final String REBALANCE_DISK = "rebalanceDisk";
@@ -75,6 +77,7 @@ public static class Fields {
         public static final String REPLICA_MOVEMENT_STRATEGIES = "replicaMovementStrategies";
         public static final String SESSION_ID = "sessionId";
         public static final String OPTIMIZATION_RESULT = "optimizationResult";
+        public static final String OPTIMIZATION_PROPOSAL = "optimizationProposal";
         public static final String CONDITIONS = "conditions";
 
         static final Comparator<KafkaRebalance> ID_COMPARATOR =
@@ -196,6 +199,46 @@ static final class Meta extends JsonApiMeta {
         String action;
     }
 
+    public static final record BrokerCapacityOverride(
+            @JsonProperty
+            List<Integer> brokers,
+            @JsonProperty
+            String cpu,
+            @JsonProperty
+            String inboundNetwork,
+            @JsonProperty
+            String outboundNetwork
+    ) {
+    }
+
+    public static final record BrokerCapacity(
+            @JsonProperty
+            String cpu,
+            @JsonProperty
+            String inboundNetwork,
+            @JsonProperty
+            String outboundNetwork,
+            @JsonProperty
+            List<BrokerCapacityOverride> overrides
+    ) {
+    }
+
+    public static final record BrokerLoadImpact(
+            @JsonProperty
+            BigDecimal before,
+            @JsonProperty
+            BigDecimal after,
+            @JsonProperty
+            BigDecimal diff
+    ) {
+    }
+
+    public static final record OptimizationProposal(
+            @JsonProperty
+            Map<String, Map<String, BrokerLoadImpact>> brokerImpact
+    ) {
+    }
+
     @JsonFilter("fieldFilter")
     @Schema(name = "KafkaRebalanceAttributes")
     static class Attributes extends KubeAttributes {
@@ -211,6 +254,9 @@ static class Attributes extends KubeAttributes {
         @Schema(readOnly = true, nullable = true)
         List<Integer> brokers;
 
+        @JsonProperty
+        BrokerCapacity brokerCapacity;
+
         @JsonProperty
         @Schema(readOnly = true, nullable = true)
         List<String> goals;
@@ -253,7 +299,11 @@ static class Attributes extends KubeAttributes {
 
         @JsonProperty
         @Schema(readOnly = true)
-        Map<String, Object> optimizationResult = new HashMap<>(0);
+        Map<String, Object> optimizationResult = HashMap.newHashMap(0);
+
+        @JsonProperty
+        @Schema(readOnly = true)
+        OptimizationProposal optimizationProposal;
 
         @JsonProperty
         @Schema(readOnly = true)
@@ -317,6 +367,10 @@ public void brokers(List<Integer> brokers) {
         attributes.brokers = brokers;
     }
 
+    public void brokerCapacity(BrokerCapacity brokerCapacity) {
+        attributes.brokerCapacity = brokerCapacity;
+    }
+
     public void goals(List<String> goals) {
         attributes.goals = goals;
     }
@@ -361,6 +415,10 @@ public Map<String, Object> optimizationResult() {
         return attributes.optimizationResult;
     }
 
+    public void optimizationProposal(OptimizationProposal optimizationProposal) {
+        attributes.optimizationProposal = optimizationProposal;
+    }
+
     public void conditions(List<Condition> conditions) {
         attributes.conditions = conditions;
     }

api/src/main/java/com/github/streamshub/console/api/service/KafkaRebalanceService.java

@@ -3,6 +3,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,8 +18,11 @@
 
 import org.jboss.logging.Logger;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.streamshub.console.api.model.Condition;
 import com.github.streamshub.console.api.model.KafkaRebalance;
+import com.github.streamshub.console.api.model.KafkaRebalance.BrokerLoadImpact;
 import com.github.streamshub.console.api.security.PermissionService;
 import com.github.streamshub.console.api.support.KafkaContext;
 import com.github.streamshub.console.api.support.ListRequestContext;
@@ -31,6 +35,8 @@
 import io.strimzi.api.ResourceAnnotations;
 import io.strimzi.api.ResourceLabels;
 import io.strimzi.api.kafka.model.kafka.Kafka;
+import io.strimzi.api.kafka.model.kafka.KafkaSpec;
+import io.strimzi.api.kafka.model.kafka.cruisecontrol.CruiseControlSpec;
 import io.strimzi.api.kafka.model.rebalance.KafkaRebalanceMode;
 import io.strimzi.api.kafka.model.rebalance.KafkaRebalanceSpec;
 import io.strimzi.api.kafka.model.rebalance.KafkaRebalanceState;
@@ -45,6 +51,9 @@ public class KafkaRebalanceService {
     @Inject
     KubernetesClient client;
 
+    @Inject
+    ObjectMapper mapper;
+
     @Inject
     ConsoleConfig consoleConfig;
 
@@ -54,7 +63,7 @@ public class KafkaRebalanceService {
     @Inject
     PermissionService permissionService;
 
-    public List<KafkaRebalance> listRebalances(ListRequestContext<KafkaRebalance> listSupport) {
+    public List<KafkaRebalance> listRebalances(List<String> fields, ListRequestContext<KafkaRebalance> listSupport) {
         final Map<String, Integer> statuses = new HashMap<>();
         listSupport.meta().put("summary", Map.of("statuses", statuses));
 
@@ -65,7 +74,7 @@ public List<KafkaRebalance> listRebalances(ListRequestContext<KafkaRebalance> li
                         ResourceTypes.Kafka.REBALANCES,
                         Privilege.LIST,
                         r -> r.getMetadata().getName()))
-                .map(this::toKafkaRebalance)
+                .map(r -> toKafkaRebalance(r, fields))
                 .map(rebalance -> tallyStatus(statuses, rebalance))
                 .filter(listSupport.filter(KafkaRebalance.class))
                 .map(listSupport::tally)
@@ -77,9 +86,9 @@ public List<KafkaRebalance> listRebalances(ListRequestContext<KafkaRebalance> li
                 .toList();
     }
 
-    public KafkaRebalance getRebalance(String id) {
+    public KafkaRebalance getRebalance(String id, List<String> fields) {
         return findRebalance(id)
-            .map(this::toKafkaRebalance)
+            .map(r -> toKafkaRebalance(r, fields))
             .map(permissionService.addPrivileges(ResourceTypes.Kafka.REBALANCES, KafkaRebalance::name))
             .orElseThrow(() -> new NotFoundException("No such Kafka rebalance resource"));
     }
@@ -98,11 +107,11 @@ public KafkaRebalance patchRebalance(String id, KafkaRebalance rebalance) {
 
                 return client.resource(resource).patch();
             })
-            .map(this::toKafkaRebalance)
+            .map(r -> toKafkaRebalance(r, Collections.emptyList()))
             .orElseThrow(() -> new NotFoundException("No such Kafka rebalance resource"));
     }
 
-    KafkaRebalance toKafkaRebalance(io.strimzi.api.kafka.model.rebalance.KafkaRebalance resource) {
+    KafkaRebalance toKafkaRebalance(io.strimzi.api.kafka.model.rebalance.KafkaRebalance resource, List<String> fields) {
         KafkaRebalanceSpec rebalanceSpec = resource.getSpec();
         Optional<KafkaRebalanceStatus> rebalanceStatus = Optional.ofNullable(resource.getStatus());
         Optional<KafkaRebalanceState> state = rebalanceStatus
@@ -115,13 +124,32 @@ KafkaRebalance toKafkaRebalance(io.strimzi.api.kafka.model.rebalance.KafkaRebala
                 .findFirst();
 
         String id = Base64.getUrlEncoder().encodeToString(Cache.metaNamespaceKeyFunc(resource).getBytes(StandardCharsets.UTF_8));
+        String namespace = resource.getMetadata().getNamespace();
         KafkaRebalance rebalance = new KafkaRebalance(id);
         rebalance.name(resource.getMetadata().getName());
-        rebalance.namespace(resource.getMetadata().getNamespace());
+        rebalance.namespace(namespace);
         rebalance.creationTimestamp(resource.getMetadata().getCreationTimestamp());
         rebalance.status(state.map(Enum::name).orElse(null));
         rebalance.mode(Optional.ofNullable(rebalanceSpec.getMode()).map(KafkaRebalanceMode::toValue).orElse(null));
         rebalance.brokers(rebalanceSpec.getBrokers());
+        rebalance.brokerCapacity(Optional.ofNullable(kafkaContext.resource())
+                .map(Kafka::getSpec)
+                .map(KafkaSpec::getCruiseControl)
+                .map(CruiseControlSpec::getBrokerCapacity)
+                .map(capacity -> new KafkaRebalance.BrokerCapacity(
+                        capacity.getCpu(),
+                        capacity.getInboundNetwork(),
+                        capacity.getOutboundNetwork(),
+                        Optional.ofNullable(capacity.getOverrides())
+                            .orElseGet(Collections::emptyList)
+                            .stream()
+                            .map(override -> new KafkaRebalance.BrokerCapacityOverride(
+                                    override.getBrokers(), 
+                                    override.getCpu(), 
+                                    override.getInboundNetwork(),
+                                    override.getOutboundNetwork()))
+                            .toList()))
+                .orElse(null));
         rebalance.goals(rebalanceSpec.getGoals());
         rebalance.skipHardGoalCheck(rebalanceSpec.isSkipHardGoalCheck());
         rebalance.rebalanceDisk(rebalanceSpec.isRebalanceDisk());
@@ -148,9 +176,43 @@ KafkaRebalance toKafkaRebalance(io.strimzi.api.kafka.model.rebalance.KafkaRebala
                 .map(allowed -> allowed.stream().map(Enum::name).toList())
                 .ifPresent(rebalance.allowedActions()::addAll);
 
+        if (fields.contains(KafkaRebalance.Fields.OPTIMIZATION_PROPOSAL)) {
+            rebalance.optimizationProposal(getOptimizationProposal(namespace, rebalanceStatus));
+        }
+
         return rebalance;
     }
 
+    private KafkaRebalance.OptimizationProposal getOptimizationProposal(String namespace, Optional<KafkaRebalanceStatus> rebalanceStatus) {
+        return rebalanceStatus
+                .map(KafkaRebalanceStatus::getOptimizationResult)
+                .map(result -> result.get("afterBeforeLoadConfigMap"))
+                .filter(String.class::isInstance)
+                .map(String.class::cast)
+                .map(configMapName -> client.configMaps().inNamespace(namespace).withName(configMapName).get())
+                .map(configMap -> {
+                    var data = configMap.getData();
+                    var qname = "%s/%s".formatted(configMap.getMetadata().getNamespace(), configMap.getMetadata().getName());
+                    var brokerLoadImpact = Optional.ofNullable(data.get("brokerLoad.json"))
+                            .map(json -> {
+                                try {
+                                    return mapper.readValue(json, new TypeReference<Map<String, Map<String, BrokerLoadImpact>>>() {
+                                        // No implementation
+                                    });
+                                } catch (Exception e) {
+                                    logger.warnf("""
+                                            Error reading 'brokerLoad.json' from rebalance \
+                                            afterBeforeLoadConfigMap ConfigMap[%s]: %s""", qname, e.getMessage());
+                                    return null;
+                                }
+                            })
+                            .orElse(null);
+
+                    return new KafkaRebalance.OptimizationProposal(brokerLoadImpact);
+                })
+                .orElse(null);
+    }
+
     KafkaRebalance tallyStatus(Map<String, Integer> statuses, KafkaRebalance rebalance) {
         String status = rebalance.status();
         if (status != null) {
@@ -214,3 +276,4 @@ private boolean isTemplate(io.strimzi.api.kafka.model.rebalance.KafkaRebalance r
             .orElse(false);
     }
 }
+