Skip to content

Commit 7ee43b7

Browse files
Merge branch 'main' into feature/connector-failed-modal
2 parents abef6eb + bd7d954 commit 7ee43b7

File tree

116 files changed

+813
-6260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+813
-6260
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gradle/libs.versions.toml @kafbat/backend
1616
/frontend/ @kafbat/frontend
1717

1818
# TESTS
19-
/e2e-tests/ @kafbat/qa
19+
/e2e-playwright/ @kafbat/qa
2020

2121
# INFRA
2222
/.github/workflows/ @kafbat/devops

.github/dependabot.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ updates:
1111
labels:
1212
- "type/dependencies"
1313
- "scope/backend"
14+
ignore:
15+
# Disable dependabot pull requests for Netty
16+
# In general, our Netty references are temporary overrides, usually applied to address transitive Spring vulnerabilities, and should be configured with caution
17+
# In general, having conflicting Netty versions in the classpath is not recommended
18+
- dependency-name: "io.netty:*"
1419
groups:
1520
spring-boot-dependencies:
1621
patterns:
@@ -23,16 +28,10 @@ updates:
2328
exclude-patterns:
2429
- "org.springframework.boot:*"
2530
- "io.spring.dependency-management"
26-
# All netty references are temporary overwrites that must be set carefully
27-
# We do not need dependabot to send pull requests
28-
- "io.netty:*"
2931
other-dependencies:
3032
exclude-patterns:
3133
- "org.springframework.boot:*"
3234
- "io.spring.dependency-management"
33-
# All netty references are temporary overwrites that must be set carefully
34-
# We do not need dependabot to send pull requests
35-
- "io.netty:*"
3635
patterns:
3736
- "*"
3837
update-types:

.github/workflows/e2e-manual.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/e2e-playwright-run.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ jobs:
5858
- name: Build with Gradle
5959
id: build_app
6060
run: |
61-
./gradlew build \
62-
-x :e2e-tests:check \
63-
-x :e2e-tests:build \
64-
-x test \
61+
./gradlew build -x test \
6562
-Pbuild-docker-images=true \
6663
-Pinclude-frontend=true \
6764
-Pversion=latest

.github/workflows/e2e-pr.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/e2e-run.yml

Lines changed: 0 additions & 176 deletions
This file was deleted.

.github/workflows/e2e-weekly.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

api/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ dependencies {
7272
// CVE Fixes
7373
implementation libs.apache.commons.compress
7474
implementation libs.okhttp3.logging.intercepter
75-
// START Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
76-
implementation libs.netty.codec
77-
implementation libs.netty.codec.http
78-
// END Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
79-
// CVE Fixes End
80-
8175

8276
implementation libs.modelcontextprotocol.spring.webflux
8377
implementation libs.victools.jsonschema.generator

api/src/main/java/io/kafbat/ui/config/ClustersProperties.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,19 @@ public class ClustersProperties {
4343
CacheProperties cache = new CacheProperties();
4444
ClusterFtsProperties fts = new ClusterFtsProperties();
4545

46+
AdminClient adminClient = new AdminClient();
47+
48+
@Data
49+
public static class AdminClient {
50+
Integer timeout;
51+
int describeConsumerGroupsPartitionSize = 50;
52+
int describeConsumerGroupsConcurrency = 4;
53+
int listConsumerGroupOffsetsPartitionSize = 50;
54+
int listConsumerGroupOffsetsConcurrency = 4;
55+
int getTopicsConfigPartitionSize = 200;
56+
int describeTopicsPartitionSize = 200;
57+
}
58+
4659
@Data
4760
public static class Cluster {
4861
@NotBlank(message = "field name for for cluster could not be blank")

api/src/main/java/io/kafbat/ui/controller/ClientQuotasController.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,21 @@
2626
public class ClientQuotasController extends AbstractController implements ClientQuotasApi, McpTool {
2727

2828
private static final Comparator<ClientQuotaRecord> QUOTA_RECORDS_COMPARATOR =
29-
Comparator.nullsLast(Comparator.comparing(ClientQuotaRecord::user))
30-
.thenComparing(Comparator.nullsLast(Comparator.comparing(ClientQuotaRecord::clientId)))
31-
.thenComparing(Comparator.nullsLast(Comparator.comparing(ClientQuotaRecord::ip)));
29+
Comparator.nullsLast(
30+
Comparator.comparing(ClientQuotaRecord::user, Comparator.nullsLast(String::compareTo))
31+
)
32+
.thenComparing(Comparator.nullsLast(
33+
Comparator.comparing(
34+
ClientQuotaRecord::clientId,
35+
Comparator.nullsLast(String::compareTo)
36+
)
37+
))
38+
.thenComparing(Comparator.nullsLast(
39+
Comparator.comparing(
40+
ClientQuotaRecord::ip,
41+
Comparator.nullsLast(String::compareTo)
42+
)
43+
));
3244

3345
private final ClientQuotaService clientQuotaService;
3446

0 commit comments

Comments
 (0)