Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d38a7a984 | |||
| b0ee0242bd | |||
| 8f9e9eabca |
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.170"
|
||||
version = "0.1.173"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@@ -301,7 +301,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.170"
|
||||
version = "0.1.173"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -324,7 +324,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.170"
|
||||
version = "0.1.173"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"serde",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.170"
|
||||
version = "0.1.173"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -757,8 +757,9 @@ impl SystemdCollector {
|
||||
let mut containers = Vec::new();
|
||||
|
||||
// Check if docker is available (use sudo for permissions)
|
||||
// Use -a to show ALL containers (running and stopped)
|
||||
let output = Command::new("sudo")
|
||||
.args(&["docker", "ps", "--format", "{{.Names}},{{.Status}}"])
|
||||
.args(&["docker", "ps", "-a", "--format", "{{.Names}},{{.Status}}"])
|
||||
.output();
|
||||
|
||||
let output = match output {
|
||||
@@ -783,10 +784,10 @@ impl SystemdCollector {
|
||||
|
||||
let container_status = if status_str.contains("Up") {
|
||||
"active"
|
||||
} else if status_str.contains("Exited") {
|
||||
"warning" // Match original: Exited → Warning, not inactive
|
||||
} else if status_str.contains("Exited") || status_str.contains("Created") {
|
||||
"inactive" // Stopped/created containers are inactive
|
||||
} else {
|
||||
"failed" // Other states → failed
|
||||
"failed" // Other states (restarting, paused, dead) → failed
|
||||
};
|
||||
|
||||
containers.push((format!("docker_{}", container_name), container_status.to_string()));
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.170"
|
||||
version = "0.1.173"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -629,10 +629,20 @@ impl SystemWidget {
|
||||
let virtual_interfaces: Vec<_> = self.network_interfaces.iter().filter(|i| !i.is_physical).collect();
|
||||
|
||||
// Find standalone virtual interfaces (those without a parent)
|
||||
let standalone_virtual: Vec<_> = virtual_interfaces.iter()
|
||||
let mut standalone_virtual: Vec<_> = virtual_interfaces.iter()
|
||||
.filter(|i| i.parent_interface.is_none())
|
||||
.collect();
|
||||
|
||||
// Sort standalone virtual: VLANs first (by VLAN ID), then others alphabetically
|
||||
standalone_virtual.sort_by(|a, b| {
|
||||
match (a.vlan_id, b.vlan_id) {
|
||||
(Some(vlan_a), Some(vlan_b)) => vlan_a.cmp(&vlan_b),
|
||||
(Some(_), None) => std::cmp::Ordering::Less,
|
||||
(None, Some(_)) => std::cmp::Ordering::Greater,
|
||||
(None, None) => a.name.cmp(&b.name),
|
||||
}
|
||||
});
|
||||
|
||||
// Render physical interfaces with their children
|
||||
for (phy_idx, interface) in physical.iter().enumerate() {
|
||||
let is_last_physical = phy_idx == physical.len() - 1 && standalone_virtual.is_empty();
|
||||
@@ -646,7 +656,7 @@ impl SystemWidget {
|
||||
lines.push(Line::from(header_spans));
|
||||
|
||||
// Find child interfaces for this physical interface
|
||||
let children: Vec<_> = virtual_interfaces.iter()
|
||||
let mut children: Vec<_> = virtual_interfaces.iter()
|
||||
.filter(|vi| {
|
||||
if let Some(parent) = &vi.parent_interface {
|
||||
parent == &interface.name
|
||||
@@ -656,6 +666,16 @@ impl SystemWidget {
|
||||
})
|
||||
.collect();
|
||||
|
||||
// Sort children: VLANs first (by VLAN ID), then others alphabetically
|
||||
children.sort_by(|a, b| {
|
||||
match (a.vlan_id, b.vlan_id) {
|
||||
(Some(vlan_a), Some(vlan_b)) => vlan_a.cmp(&vlan_b),
|
||||
(Some(_), None) => std::cmp::Ordering::Less,
|
||||
(None, Some(_)) => std::cmp::Ordering::Greater,
|
||||
(None, None) => a.name.cmp(&b.name),
|
||||
}
|
||||
});
|
||||
|
||||
// Count total items under this physical interface (IPs + children)
|
||||
let ip_count = interface.ipv4_addresses.len() + interface.ipv6_addresses.len();
|
||||
let total_children = ip_count + children.len();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.170"
|
||||
version = "0.1.173"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
Reference in New Issue
Block a user