Display selected host with brackets in title bar

- Change nftables port labels to lowercase 'wan tcp:' and 'wan udp:' - Add brackets around selected host in title bar for clarity
Remove timeout wrapper from nft command
2025-12-04 18:47:30 +01:00 · 2025-12-04 16:10:25 +01:00 · 2025-12-04 16:02:14 +01:00 · 2025-12-04 15:59:11 +01:00
7 changed files with 27 additions and 13 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 [[package]]
 name = "cm-dashboard"
-version = "0.1.252"
+version = "0.1.256"
 dependencies = [
 "anyhow",
 "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.252"
+version = "0.1.256"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -325,7 +325,7 @@ dependencies = [
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.252"
+version = "0.1.256"
 dependencies = [
 "chrono",
 "serde",
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.253"
+version = "0.1.257"
 edition = "2021"
 [dependencies]
--- a/agent/src/collectors/cpu.rs
+++ b/agent/src/collectors/cpu.rs
@@ -282,8 +282,8 @@ impl Collector for CpuCollector {
            );
        }
-        // Calculate status using thresholds
+        // Calculate status using thresholds (use 5-minute average for stability)
-        agent_data.system.cpu.load_status = self.calculate_load_status(agent_data.system.cpu.load_1min);
+        agent_data.system.cpu.load_status = self.calculate_load_status(agent_data.system.cpu.load_5min);
        agent_data.system.cpu.temperature_status = if let Some(temp) = agent_data.system.cpu.temperature_celsius {
            self.calculate_temperature_status(temp)
        } else {
--- a/agent/src/collectors/systemd.rs
+++ b/agent/src/collectors/systemd.rs
@@ -186,7 +186,7 @@ impl SystemdCollector {
                        if !tcp_ports.is_empty() {
                            let metrics = Vec::new();
                            sub_services.push(SubServiceData {
-                                name: format!("TCP: {}", tcp_ports),
+                                name: format!("wan tcp: {}", tcp_ports),
                                service_status: Status::Info,
                                metrics,
                                service_type: "firewall_port".to_string(),
@@ -196,7 +196,7 @@ impl SystemdCollector {
                        if !udp_ports.is_empty() {
                            let metrics = Vec::new();
                            sub_services.push(SubServiceData {
-                                name: format!("UDP: {}", udp_ports),
+                                name: format!("wan udp: {}", udp_ports),
                                service_status: Status::Info,
                                metrics,
                                service_type: "firewall_port".to_string(),
@@ -914,8 +914,8 @@ impl SystemdCollector {
    /// Get nftables open ports grouped by protocol
    /// Returns: (tcp_ports_string, udp_ports_string)
    fn get_nftables_open_ports(&self) -> (String, String) {
-        let output = Command::new("timeout")
+        let output = Command::new("sudo")
-            .args(&["3", "sudo", "nft", "list", "ruleset"])
+            .args(&["/run/current-system/sw/bin/nft", "list", "ruleset"])
            .output();
        let output = match output {
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.253"
+version = "0.1.257"
 edition = "2021"
 [dependencies]
--- a/dashboard/src/ui/mod.rs
+++ b/dashboard/src/ui/mod.rs
@@ -556,7 +556,14 @@ impl TuiApp {
            ));
            if Some(host) == self.current_host.as_ref() {
-                // Selected host in bold background color against status background
+                // Selected host with brackets in bold background color against status background
                host_spans.push(Span::styled(
                    "[",
                    Style::default()
                        .fg(Theme::background())
                        .bg(background_color)
                        .add_modifier(Modifier::BOLD),
                ));
                host_spans.push(Span::styled(
                    host.clone(),
                    Style::default()
@@ -564,6 +571,13 @@ impl TuiApp {
                        .bg(background_color)
                        .add_modifier(Modifier::BOLD),
                ));
                host_spans.push(Span::styled(
                    "]",
                    Style::default()
                        .fg(Theme::background())
                        .bg(background_color)
                        .add_modifier(Modifier::BOLD),
                ));
            } else {
                // Other hosts in normal background color against status background
                host_spans.push(Span::styled(
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.253"
+version = "0.1.257"
 edition = "2021"
 [dependencies]
Author	SHA1	Message	Date
Christoffer Martinsson	41e1be451e	Display selected host with brackets in title bar All checks were successful Build and Release / build-and-release (push) Successful in 1m25s Details - Change nftables port labels to lowercase 'wan tcp:' and 'wan udp:' - Add brackets around selected host in title bar for clarity	2025-12-04 18:47:30 +01:00
Christoffer Martinsson	2863526ec8	Remove timeout wrapper from nft command All checks were successful Build and Release / build-and-release (push) Successful in 1m21s Details Run sudo nft directly without timeout wrapper to preserve capabilities. The timeout -> sudo chain was preventing nft from accessing netlink with proper permissions. - Change from 'timeout 3 sudo nft' to 'sudo nft' - Allows CAP_NET_ADMIN to pass through correctly - Update version to v0.1.256	2025-12-04 16:10:25 +01:00
Christoffer Martinsson	5da9213da6	Fix nftables query by using full path to nft binary All checks were successful Build and Release / build-and-release (push) Successful in 1m31s Details Use explicit path /run/current-system/sw/bin/nft to match sudoers configuration. Previously using 'nft' without path was resolving to wrong location and failing permission checks. - Change from 'sudo nft' to 'sudo /run/current-system/sw/bin/nft' - Matches sudoers entry for passwordless execution - Update version to v0.1.255	2025-12-04 16:02:14 +01:00
Christoffer Martinsson	a7755f02ae	Use 5-minute load average for CPU status calculation All checks were successful Build and Release / build-and-release (push) Successful in 1m27s Details Change CPU load status to use load_5min instead of load_1min for more stable status reporting. 5-minute average smooths out temporary spikes and provides better indication of sustained load. - Change load_status calculation from load_1min to load_5min - Add comment explaining use of 5-minute average for stability - Update version to v0.1.254	2025-12-04 15:59:11 +01:00