Move VPN route display from vpn-connection to vpn-download

Consolidate VPN-related information under openvpn-vpn-download service.
Now shows both VPN route and torrent statistics as sub-services.

- Remove route from openvpn-vpn-connection
- Add route to openvpn-vpn-download (displayed first)
- Torrent stats displayed second
- Update version to v0.1.251

Cargo.lock

@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.248"
+version = "0.1.250"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.248"
+version = "0.1.250"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -325,7 +325,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.248"
+version = "0.1.250"
 dependencies = [
  "chrono",
  "serde",

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.249"
+version = "0.1.251"
 edition = "2021"
 
 [dependencies]

agent/src/collectors/systemd.rs

@@ -154,7 +154,8 @@ impl SystemdCollector {
                         }
                     }
 
-                    if service_name == "openvpn-vpn-connection" && status_info.active_state == "active" {
+                    if service_name == "openvpn-vpn-download" && status_info.active_state == "active" {
+                        // Add VPN route
                         if let Some(external_ip) = self.get_vpn_external_ip() {
                             let metrics = Vec::new();
 
@@ -165,9 +166,8 @@ impl SystemdCollector {
                                 service_type: "vpn_route".to_string(),
                             });
                         }
-                    }
 
-                    if service_name == "openvpn-vpn-download" && status_info.active_state == "active" {
+                        // Add torrent stats
                         if let Some((active_count, download_mbps, upload_mbps)) = self.get_qbittorrent_stats() {
                             let metrics = Vec::new();
 
@@ -920,12 +920,18 @@ impl SystemdCollector {
 
         let output = match output {
             Ok(out) if out.status.success() => out,
-            _ => return (String::new(), String::new()),
+            _ => {
+                debug!("Failed to run nft list ruleset");
+                return (String::new(), String::new());
+            }
         };
 
         let output_str = match String::from_utf8(output.stdout) {
             Ok(s) => s,
-            Err(_) => return (String::new(), String::new()),
+            Err(_) => {
+                debug!("Failed to parse nft output as UTF-8");
+                return (String::new(), String::new());
+            }
         };
 
         let mut tcp_ports = std::collections::HashSet::new();
@@ -945,8 +951,8 @@ impl SystemdCollector {
                 continue;
             }
 
-            // Reset when entering other chains
+            // Reset when exiting chain (closing brace) or entering other chains
-            if line.starts_with("chain ") && !line.contains("input_wan") {
+            if line == "}" || (line.starts_with("chain ") && !line.contains("input_wan")) {
                 in_wan_chain = false;
                 continue;
             }
@@ -985,6 +991,8 @@ impl SystemdCollector {
         let tcp_str = tcp_vec.iter().map(|p| p.to_string()).collect::<Vec<_>>().join(", ");
         let udp_str = udp_vec.iter().map(|p| p.to_string()).collect::<Vec<_>>().join(", ");
 
+        debug!("nftables WAN ports - TCP: '{}', UDP: '{}'", tcp_str, udp_str);
+
         (tcp_str, udp_str)
     }
 

dashboard/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.249"
+version = "0.1.251"
 edition = "2021"
 
 [dependencies]

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.249"
+version = "0.1.251"
 edition = "2021"
 
 [dependencies]