From a7b69b8ae79144076f6d00675257afc8859a5cc5 Mon Sep 17 00:00:00 2001
From: Christoffer Martinsson <cm@cmtec.se>
Date: Mon, 1 Dec 2025 13:21:26 +0100
Subject: [PATCH] Fix duplicate data by clearing vectors before collection

Collectors now clear their target vectors (tmpfs, drives, pools, services)
before populating to prevent duplicates when updating cached AgentData.

- Clear tmpfs list in memory collector
- Clear drives and pools in disk collector
- Clear services in systemd collector
- Bump version to v0.1.231
---
 Cargo.lock                      | 6 +++---
 agent/Cargo.toml                | 2 +-
 agent/src/collectors/disk.rs    | 4 ++++
 agent/src/collectors/memory.rs  | 5 ++++-
 agent/src/collectors/systemd.rs | 3 +++
 dashboard/Cargo.toml            | 2 +-
 shared/Cargo.toml               | 2 +-
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 615740f..1d3a91a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.230"
+version = "0.1.231"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.230"
+version = "0.1.231"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -325,7 +325,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.230"
+version = "0.1.231"
 dependencies = [
  "chrono",
  "serde",
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index dc0bdee..8173adb 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.230"
+version = "0.1.231"
 edition = "2021"
 
 [dependencies]
diff --git a/agent/src/collectors/disk.rs b/agent/src/collectors/disk.rs
index bc40c33..a3c92df 100644
--- a/agent/src/collectors/disk.rs
+++ b/agent/src/collectors/disk.rs
@@ -66,6 +66,10 @@ impl DiskCollector {
 
     /// Collect all storage data and populate AgentData
     async fn collect_storage_data(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
+        // Clear drives and pools to prevent duplicates when updating cached data
+        agent_data.system.storage.drives.clear();
+        agent_data.system.storage.pools.clear();
+
         // Step 1: Get mount points and their backing devices
         let mount_devices = self.get_mount_devices().await?;
         
diff --git a/agent/src/collectors/memory.rs b/agent/src/collectors/memory.rs
index e186704..8899f99 100644
--- a/agent/src/collectors/memory.rs
+++ b/agent/src/collectors/memory.rs
@@ -200,13 +200,16 @@ impl Collector for MemoryCollector {
         debug!("Collecting memory metrics");
         let start = std::time::Instant::now();
 
+        // Clear tmpfs list to prevent duplicates when updating cached data
+        agent_data.system.memory.tmpfs.clear();
+
         // Parse memory info from /proc/meminfo
         let info = self.parse_meminfo().await?;
 
         // Populate memory data directly
         self.populate_memory_data(&info, agent_data).await?;
 
-        // Collect tmpfs data  
+        // Collect tmpfs data
         self.populate_tmpfs_data(agent_data).await?;
 
         let duration = start.elapsed();
diff --git a/agent/src/collectors/systemd.rs b/agent/src/collectors/systemd.rs
index 3136dc8..6b7571f 100644
--- a/agent/src/collectors/systemd.rs
+++ b/agent/src/collectors/systemd.rs
@@ -841,6 +841,9 @@ impl SystemdCollector {
 #[async_trait]
 impl Collector for SystemdCollector {
     async fn collect_structured(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
+        // Clear services to prevent duplicates when updating cached data
+        agent_data.services.clear();
+
         // Use cached complete data if available and fresh
         if let Some(cached_complete_services) = self.get_cached_complete_services() {
             for service_data in cached_complete_services {
diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml
index a9b75ff..97f4c9f 100644
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.230"
+version = "0.1.231"
 edition = "2021"
 
 [dependencies]
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 924589c..9e0da4b 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.230"
+version = "0.1.231"
 edition = "2021"
 
 [dependencies]