From 4681e0c694c973c599ffd5864b948cb5d94cf884 Mon Sep 17 00:00:00 2001 From: donpat1to Date: Wed, 1 Oct 2025 19:00:34 +0200 Subject: [PATCH] fixed id type --- WatcherAgent/src/docker/container.rs | 6 +++--- WatcherAgent/src/docker/mod.rs | 2 +- WatcherAgent/src/metrics.rs | 2 +- WatcherAgent/src/models.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WatcherAgent/src/docker/container.rs b/WatcherAgent/src/docker/container.rs index 98b159b..9b0c2a3 100644 --- a/WatcherAgent/src/docker/container.rs +++ b/WatcherAgent/src/docker/container.rs @@ -34,8 +34,8 @@ pub async fn get_available_container(docker: &Docker) -> Vec { container.id.as_ref()?; // Skip if no ID let id = container.id?; - let short_string_id = if id.len() > 12 { &id[..12] } else { &id }; - let short_id: u32 = short_string_id.trim().parse().unwrap(); + let short_id = if id.len() > 12 { &id[..12] } else { &id }; + //let short_id: u32 = short_string_id.trim().parse().unwrap(); let name = container.names .and_then(|names| names.into_iter().next()) @@ -59,7 +59,7 @@ pub async fn get_available_container(docker: &Docker) -> Vec { println!(" - ID: {}, Image: {:?}, Name: {}", short_id, container.image, name); Some(DockerContainer { - ID: short_id, + ID: short_id.to_string(), image, Name: name, Status: status, diff --git a/WatcherAgent/src/docker/mod.rs b/WatcherAgent/src/docker/mod.rs index ebaf999..6f54ea0 100644 --- a/WatcherAgent/src/docker/mod.rs +++ b/WatcherAgent/src/docker/mod.rs @@ -63,7 +63,7 @@ impl DockerContainer { /// /// # Returns /// * `Result>` - Container ID as integer. - pub async fn get_docker_container_id(container: DockerContainer) -> Result> { + pub async fn get_docker_container_id(container: DockerContainer) -> Result> { Ok(container.ID) } diff --git a/WatcherAgent/src/metrics.rs b/WatcherAgent/src/metrics.rs index 16bf778..60d6b6c 100644 --- a/WatcherAgent/src/metrics.rs +++ b/WatcherAgent/src/metrics.rs @@ -109,7 +109,7 @@ impl Collector { ram_load: hardware.memory.current_load.unwrap_or_default(), ram_size: hardware.memory.total_size.unwrap_or_default(), disk_size: hardware.disk.total_size.unwrap_or_default(), - disk_usage: hardware.disk.total_used.unwrap_or_default(), + disk_usage: hardware.disk.total_usage.unwrap_or_default(), disk_temp: 0.0, // not supported net_rx: hardware.network.rx_rate.unwrap_or_default(), net_tx: hardware.network.tx_rate.unwrap_or_default(), diff --git a/WatcherAgent/src/models.rs b/WatcherAgent/src/models.rs index 82a79ae..92b98f2 100644 --- a/WatcherAgent/src/models.rs +++ b/WatcherAgent/src/models.rs @@ -187,7 +187,7 @@ pub struct Acknowledgment { /// - `_cpu_load`: CPU usage as a percentage (**0.0–100.0**) #[derive(Debug, Serialize, Clone)] pub struct DockerContainer { - pub ID: u32, + pub ID: String, pub image: String, pub Name: String, pub Status: String, // "running";"stopped";others