From 70c6dbbbe6a80222b9e69f2dfae2fcd8f02783f8 Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 06:52:03 +0000 Subject: [PATCH 1/8] update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d70b50..ea87e6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,9 @@ RUN npm update --legacy-peer-deps RUN npm run build --release FROM alpine:3.18 -MAINTAINER Jens Thiel +LABEL maintainer="zn-luo" WORKDIR /opt/nats -VOLUME /data +#VOLUME /data RUN apk update && apk upgrade && \ apk add --no-cache libgcc libssl1.1 libcrypto1.1 ca-certificates sqlite-libs && \ update-ca-certificates && \ From f0f48cbce02516839d81a1d6a5a6f1d38b4606e7 Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 06:54:26 +0000 Subject: [PATCH 2/8] udpate server_name to Option --- src/datatypes.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatypes.rs b/src/datatypes.rs index 5cdffbe..59d9899 100644 --- a/src/datatypes.rs +++ b/src/datatypes.rs @@ -97,7 +97,7 @@ pub struct Publication { #[derive(Clone, Serialize, Deserialize, Debug, PartialEq)] pub struct ServerVarz { pub server_id: String, - pub server_name: String, + pub server_name: Option, pub version: String, pub proto: i32, pub go: String, From 9a3218d9a3d0df7a0ba31aa410081a7d41945009 Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 06:56:21 +0000 Subject: [PATCH 3/8] udpate tls_timeout from i64 to f64 --- src/datatypes.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/datatypes.rs b/src/datatypes.rs index 59d9899..f97e5fa 100644 --- a/src/datatypes.rs +++ b/src/datatypes.rs @@ -125,7 +125,7 @@ pub struct ServerVarz { pub websocket: Option, #[serde(default)] pub jetstream: Option, - pub tls_timeout: i64, + pub tls_timeout: f64, pub write_deadline: i64, pub start: String, pub now: String, @@ -163,7 +163,7 @@ pub struct ClusterInfo { #[serde(default)] pub auth_timeout: Option, #[serde(default)] - pub tls_timeout: Option, + pub tls_timeout: Option, #[serde(default)] pub tls_required: Option, #[serde(default)] @@ -178,7 +178,7 @@ pub struct ClusterInfo { pub struct MqttConfig { pub host: String, pub port: u16, - pub tls_timeout: i64, + pub tls_timeout: f64, } #[derive(Clone, Serialize, Deserialize, Debug, PartialEq)] From 65482cbb47e97bf14f68bedcbddccf659e0e8138 Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 06:57:33 +0000 Subject: [PATCH 4/8] update gomaxprocs to Option --- src/datatypes.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatypes.rs b/src/datatypes.rs index f97e5fa..1c8237b 100644 --- a/src/datatypes.rs +++ b/src/datatypes.rs @@ -132,7 +132,7 @@ pub struct ServerVarz { pub uptime: String, pub mem: i64, pub cores: i32, - pub gomaxprocs: i32, + pub gomaxprocs: Option, pub cpu: f64, pub connections: i64, pub total_connections: i64, From 6565dea89db832445e8456669013f0ff8a5f0f8c Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 07:01:34 +0000 Subject: [PATCH 5/8] update leafnodes to Option --- src/datatypes.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatypes.rs b/src/datatypes.rs index 1c8237b..fa37e2b 100644 --- a/src/datatypes.rs +++ b/src/datatypes.rs @@ -138,7 +138,7 @@ pub struct ServerVarz { pub total_connections: i64, pub routes: i64, pub remotes: i64, - pub leafnodes: i64, + pub leafnodes: Option, pub in_msgs: i64, pub out_msgs: i64, pub in_bytes: i64, From ef3264b2ccac8217b30d6561364e362abaf81dc7 Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 07:03:31 +0000 Subject: [PATCH 6/8] udpate slow_consumer_stats to Option --- src/datatypes.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatypes.rs b/src/datatypes.rs index fa37e2b..cab7105 100644 --- a/src/datatypes.rs +++ b/src/datatypes.rs @@ -149,7 +149,7 @@ pub struct ServerVarz { pub config_load_time: String, #[serde(default)] pub system_account: Option, - pub slow_consumer_stats: SlowConsumerStats, + pub slow_consumer_stats: Option, #[serde(default)] pub git_commit: Option, } From 6e0508ea0d06c82d4edc80a349813c4af112a12f Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 09:03:24 +0000 Subject: [PATCH 7/8] udpate port --- Dockerfile | 2 +- src/main.rs | 4 ++-- web/src/App.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea87e6a..0070ccd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,5 +28,5 @@ RUN apk update && apk upgrade && \ COPY --from=backend-builder /usr/src/NATS-WebUI/target/release/nats-webui /opt/nats/nats-webui COPY --from=frontend-builder /usr/src/NATS-WebUI/web/dist/ /opt/nats/web/dist USER 1000:1000 -EXPOSE 80 +EXPOSE 8600 ENTRYPOINT ["/opt/nats/nats-webui"] diff --git a/src/main.rs b/src/main.rs index 48f58a6..b199859 100755 --- a/src/main.rs +++ b/src/main.rs @@ -206,8 +206,8 @@ async fn main() -> rusqlite::Result<()> { .or(client_subscribe_route) .with(warp::log("web")); - debug!("Starting server on 0.0.0.0:80"); - warp::serve(route).run(([0, 0, 0, 0], 80)).await; + debug!("Starting server on 0.0.0.0:8600"); + warp::serve(route).run(([0, 0, 0, 0], 8600)).await; Ok(()) } diff --git a/web/src/App.vue b/web/src/App.vue index 998004d..df1e3e1 100755 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -41,7 +41,7 @@ - sphqxe, thielj github.com/thielj/NATS-WebUI + sphqxe, thielj github.com/zn-luo/NATS-WebUI From 7bd8cf2a5a72d806ab0ed223538b8cbf7e369d8f Mon Sep 17 00:00:00 2001 From: ubuntu Date: Thu, 27 Mar 2025 09:31:10 +0000 Subject: [PATCH 8/8] update web/src/App.vue --- web/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.vue b/web/src/App.vue index df1e3e1..be48403 100755 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -41,7 +41,7 @@ - sphqxe, thielj github.com/zn-luo/NATS-WebUI + sphqxe, thielj, zn-luo github.com/zn-luo/NATS-WebUI