Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 966ba27b1e | |||
| 6c6c9144bd | |||
| 3fdcec8047 |
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.233"
|
version = "0.1.236"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.233"
|
version = "0.1.236"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -325,7 +325,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.233"
|
version = "0.1.236"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.233"
|
version = "0.1.236"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -159,17 +159,24 @@ impl SystemdCollector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if service_name.contains("openvpn-vpn-connection") && status_info.active_state == "active" {
|
if service_name == "openvpn-vpn-connection" && status_info.active_state == "active" {
|
||||||
if let Some(external_ip) = self.get_vpn_external_ip() {
|
tracing::info!("Checking VPN external IP for service: {}", service_name);
|
||||||
|
match self.get_vpn_external_ip() {
|
||||||
|
Some(external_ip) => {
|
||||||
|
tracing::info!("Got VPN external IP: {}", external_ip);
|
||||||
let metrics = Vec::new();
|
let metrics = Vec::new();
|
||||||
|
|
||||||
sub_services.push(SubServiceData {
|
sub_services.push(SubServiceData {
|
||||||
name: format!("IP: {}", external_ip),
|
name: format!("ip: {}", external_ip),
|
||||||
service_status: Status::Ok,
|
service_status: Status::Ok,
|
||||||
metrics,
|
metrics,
|
||||||
service_type: "vpn_route".to_string(),
|
service_type: "vpn_route".to_string(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
None => {
|
||||||
|
tracing::warn!("Failed to get VPN external IP");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create complete service data
|
// Create complete service data
|
||||||
@@ -855,6 +862,7 @@ impl SystemdCollector {
|
|||||||
let output = Command::new("timeout")
|
let output = Command::new("timeout")
|
||||||
.args(&[
|
.args(&[
|
||||||
"5",
|
"5",
|
||||||
|
"sudo",
|
||||||
"ip",
|
"ip",
|
||||||
"netns",
|
"netns",
|
||||||
"exec",
|
"exec",
|
||||||
@@ -871,12 +879,12 @@ impl SystemdCollector {
|
|||||||
if output.status.success() {
|
if output.status.success() {
|
||||||
let ip = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
let ip = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||||
if !ip.is_empty() && ip.contains('.') {
|
if !ip.is_empty() && ip.contains('.') {
|
||||||
debug!("VPN external IP: {}", ip);
|
|
||||||
return Some(ip);
|
return Some(ip);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
debug!("Failed to get VPN external IP");
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
tracing::warn!("VPN external IP query failed. Exit code: {:?}, stderr: {}", output.status.code(), stderr);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.233"
|
version = "0.1.236"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -298,6 +298,22 @@ impl ServicesWidget {
|
|||||||
.bg(Theme::background()),
|
.bg(Theme::background()),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
} else if info.service_type == "vpn_route" {
|
||||||
|
// VPN route info - no status icon
|
||||||
|
vec![
|
||||||
|
// Indentation and tree prefix
|
||||||
|
ratatui::text::Span::styled(
|
||||||
|
format!(" {} ", tree_symbol),
|
||||||
|
Typography::tree(),
|
||||||
|
),
|
||||||
|
// Service name (no icon)
|
||||||
|
ratatui::text::Span::styled(
|
||||||
|
short_name,
|
||||||
|
Style::default()
|
||||||
|
.fg(Theme::secondary_text())
|
||||||
|
.bg(Theme::background()),
|
||||||
|
),
|
||||||
|
]
|
||||||
} else {
|
} else {
|
||||||
vec![
|
vec![
|
||||||
// Indentation and tree prefix
|
// Indentation and tree prefix
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.233"
|
version = "0.1.236"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Reference in New Issue
Block a user