Merge branch 'main' into issues/729

.github/workflows/frontend_tests.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install node
         uses: actions/[email protected]
         with:
-          node-version: "18.17.1"
+          node-version: "22.12.0"
           cache: "pnpm"
           cache-dependency-path: "./frontend/pnpm-lock.yaml"
 

api/src/main/java/io/kafbat/ui/model/BrokerMetrics.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.model;
 
-import io.kafbat.ui.model.MetricDTO;
 import java.util.List;
 import lombok.Builder;
 import lombok.Data;

api/src/main/java/io/kafbat/ui/model/CleanupPolicy.java

@@ -20,18 +20,10 @@ public enum CleanupPolicy {
     this.policies = policies;
   }
 
-  public String getPolicy() {
-    return policies.get(0);
-  }
-
   public static CleanupPolicy fromString(String string) {
     return Arrays.stream(CleanupPolicy.values())
-        .filter(v ->
-            v.policies.stream().anyMatch(
-                s -> s.equals(string.replace(" ", "")
-                )
-            )
-        ).findFirst()
+        .filter(v -> v.policies.stream().anyMatch(s -> s.equals(string.replace(" ", ""))))
+        .findFirst()
         .orElse(UNKNOWN);
   }
 }

api/src/main/java/io/kafbat/ui/model/InternalBrokerConfig.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.model;
 
-
 import java.util.List;
 import lombok.Builder;
 import lombok.Data;
@@ -17,13 +16,13 @@ public class InternalBrokerConfig {
   private final List<ConfigEntry.ConfigSynonym> synonyms;
 
   public static InternalBrokerConfig from(ConfigEntry configEntry, boolean readOnlyCluster) {
-    InternalBrokerConfig.InternalBrokerConfigBuilder builder = InternalBrokerConfig.builder()
+    return InternalBrokerConfig.builder()
         .name(configEntry.name())
         .value(configEntry.value())
         .source(configEntry.source())
         .isReadOnly(readOnlyCluster || configEntry.isReadOnly())
         .isSensitive(configEntry.isSensitive())
-        .synonyms(configEntry.synonyms());
-    return builder.build();
+        .synonyms(configEntry.synonyms())
+        .build();
   }
 }

api/src/main/java/io/kafbat/ui/model/InternalClusterMetrics.java

@@ -1,15 +1,12 @@
 package io.kafbat.ui.model;
 
-import io.kafbat.ui.model.MetricDTO;
-import io.kafbat.ui.model.ServerStatusDTO;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 import lombok.Builder;
 import lombok.Data;
 
-
 @Data
 @Builder(toBuilder = true)
 public class InternalClusterMetrics {

api/src/main/java/io/kafbat/ui/model/InternalClusterState.java

@@ -1,9 +1,6 @@
 package io.kafbat.ui.model;
 
 import com.google.common.base.Throwables;
-import io.kafbat.ui.model.BrokerDiskUsageDTO;
-import io.kafbat.ui.model.MetricsCollectionErrorDTO;
-import io.kafbat.ui.model.ServerStatusDTO;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;

api/src/main/java/io/kafbat/ui/model/InternalPartition.java

@@ -20,5 +20,4 @@ public class InternalPartition {
   private final Long segmentSize;
   private final Integer segmentCount;
 
-
 }

api/src/main/java/io/kafbat/ui/model/InternalPartitionsOffsets.java

@@ -7,7 +7,6 @@
 import lombok.Value;
 import org.apache.kafka.common.TopicPartition;
 
-
 public class InternalPartitionsOffsets {
 
   @Value

api/src/main/java/io/kafbat/ui/model/InternalTopic.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.model;
 
-import io.kafbat.ui.config.ClustersProperties;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -16,8 +15,6 @@
 @Builder(toBuilder = true)
 public class InternalTopic {
 
-  ClustersProperties clustersProperties;
-
   // from TopicDescription
   private final String name;
   private final boolean internal;

api/src/main/java/io/kafbat/ui/model/InternalTopicConfig.java

@@ -5,7 +5,6 @@
 import lombok.Data;
 import org.apache.kafka.clients.admin.ConfigEntry;
 
-
 @Data
 @Builder
 public class InternalTopicConfig {

api/src/main/java/io/kafbat/ui/model/Metrics.java

@@ -11,7 +11,6 @@
 import lombok.Builder;
 import lombok.Value;
 
-
 @Builder
 @Value
 public class Metrics {

api/src/main/java/io/kafbat/ui/model/Statistics.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.model;
 
-import io.kafbat.ui.model.ServerStatusDTO;
 import io.kafbat.ui.service.ReactiveAdminClient;
 import java.util.List;
 import java.util.Map;

documentation/compose/auth-context.yaml

@@ -19,7 +19,7 @@ services:
       SPRING_SECURITY_USER_PASSWORD: pass
 
   kafka:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     hostname: kafka
     container_name: kafka
     ports:

documentation/compose/cluster-sr-auth.yaml

@@ -3,7 +3,7 @@ version: '2'
 services:
 
   kafka1:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     hostname: kafka1
     container_name: kafka1
     ports:
@@ -31,7 +31,7 @@ services:
     command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry1:
-    image: confluentinc/cp-schema-registry:7.2.1
+    image: confluentinc/cp-schema-registry:7.8.0
     ports:
       - 18085:8085
     depends_on:
@@ -55,7 +55,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     volumes:
        - ./data/message.json:/data/message.json
     depends_on:

documentation/compose/kafbat-ui.yaml

@@ -27,7 +27,7 @@ services:
       DYNAMIC_CONFIG_ENABLED: 'true'
 
   kafka0:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     hostname: kafka0
     container_name: kafka0
     ports:
@@ -55,7 +55,7 @@ services:
     command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   kafka1:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     hostname: kafka1
     container_name: kafka1
     ports:
@@ -83,7 +83,7 @@ services:
     command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:7.2.1
+    image: confluentinc/cp-schema-registry:7.8.0
     ports:
       - 8085:8085
     depends_on:
@@ -99,7 +99,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   schemaregistry1:
-    image: confluentinc/cp-schema-registry:7.2.1
+    image: confluentinc/cp-schema-registry:7.8.0
     ports:
       - 18085:8085
     depends_on:
@@ -115,7 +115,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   kafka-connect0:
-    image: confluentinc/cp-kafka-connect:7.2.1
+    image: confluentinc/cp-kafka-connect:7.8.0
     ports:
       - 8083:8083
     depends_on:
@@ -140,7 +140,7 @@ services:
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     volumes:
        - ./data/message.json:/data/message.json
     depends_on:

documentation/compose/kafka-ssl-components.yaml

@@ -39,7 +39,7 @@ services:
       - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
 
   kafka0:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     hostname: kafka0
     container_name: kafka0
     ports:
@@ -80,7 +80,7 @@ services:
     command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:7.2.1
+    image: confluentinc/cp-schema-registry:7.8.0
     depends_on:
       - kafka0
     environment:
@@ -111,7 +111,7 @@ services:
       - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
 
   kafka-connect0:
-    image: confluentinc/cp-kafka-connect:7.2.1
+    image: confluentinc/cp-kafka-connect:7.8.0
     ports:
       - 8083:8083
     depends_on:

documentation/compose/kafka-ssl.yml

@@ -22,7 +22,7 @@ services:
       - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
 
   kafka:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     hostname: kafka
     container_name: kafka
     ports:

documentation/compose/kafka-zookeeper.yaml

@@ -3,7 +3,7 @@ version: '2'
 services:
 
   zookeeper:
-    image: confluentinc/cp-zookeeper:7.2.1
+    image: confluentinc/cp-zookeeper:7.8.0
     hostname: zookeeper
     container_name: zookeeper
     ports:
@@ -13,7 +13,7 @@ services:
       ZOOKEEPER_TICK_TIME: 2000
 
   kafka:
-    image: confluentinc/cp-server:7.2.1
+    image: confluentinc/cp-server:7.8.0
     hostname: kafka
     container_name: kafka
     depends_on:
@@ -36,7 +36,7 @@ services:
       KAFKA_JMX_HOSTNAME: kafka
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     volumes:
        - ./data/message.json:/data/message.json
     depends_on:

documentation/compose/ui-acl-with-zk.yaml

@@ -27,7 +27,7 @@ services:
       - 2181:2181
 
   kafka:
-    image: confluentinc/cp-kafka:7.2.1
+    image: confluentinc/cp-kafka:7.8.0
     hostname: kafka
     container_name: kafka
     ports: