From 5b51a62c49c4cb3cc86d0f3c449962d37e62e264 Mon Sep 17 00:00:00 2001 From: liugddx Date: Sun, 14 Jul 2024 21:21:10 +0800 Subject: [PATCH 1/3] 1 --- .../engine/server/SeaTunnelHealthMonitor.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java index 2adf87aa412..aad401a3cc1 100644 --- a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java +++ b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java @@ -202,6 +202,7 @@ boolean exceedsThreshold() { public String render() { update(); sb.setLength(0); + ipPort(); renderProcessors(); renderPhysicalMemory(); renderSwap(); @@ -220,6 +221,15 @@ public String render() { return sb.toString(); } + private void ipPort() { + sb.append("host=") + .append(node.address.getHost()) + .append(", "); + sb.append("port=") + .append(node.address.getPort()) + .append(", "); + } + private void renderConnection() { sb.append("connection.active.count=") .append(tcpConnectionActiveCount.read()) From db28a2aff78306970979bc669a560aa292e16e65 Mon Sep 17 00:00:00 2001 From: gdliu3 Date: Mon, 15 Jul 2024 10:41:08 +0800 Subject: [PATCH 2/3] 1 --- .../seatunnel/engine/server/SeaTunnelHealthMonitor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java index aad401a3cc1..f7489b2c755 100644 --- a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java +++ b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/SeaTunnelHealthMonitor.java @@ -222,12 +222,8 @@ public String render() { } private void ipPort() { - sb.append("host=") - .append(node.address.getHost()) - .append(", "); - sb.append("port=") - .append(node.address.getPort()) - .append(", "); + sb.append("host=").append(node.address.getHost()).append(", "); + sb.append("port=").append(node.address.getPort()).append(", "); } private void renderConnection() { From 6ce0abdbd2a886b87952969a8e8008aa31120faa Mon Sep 17 00:00:00 2001 From: gdliu3 Date: Mon, 15 Jul 2024 19:51:04 +0800 Subject: [PATCH 3/3] 1 --- .../test/java/org/apache/seatunnel/engine/e2e/RestApiIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/RestApiIT.java b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/RestApiIT.java index 71b903ca16d..bc7a030c406 100644 --- a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/RestApiIT.java +++ b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/RestApiIT.java @@ -306,6 +306,8 @@ public void testSystemMonitoringInformation() { .then() .assertThat() .time(lessThan(5000L)) + .body("[0].host", equalTo("localhost")) + .body("[0].port", notNullValue()) .statusCode(200); }); }