From cac836601b08843904d3211621fea9cbf61dc4e9 Mon Sep 17 00:00:00 2001
From: Christoffer Martinsson <cm@cmtec.se>
Date: Thu, 27 Nov 2025 13:34:30 +0100
Subject: [PATCH] Add NVMe device type flag for SMART data collection

---
 Cargo.lock                   |  6 +++---
 agent/Cargo.toml             |  2 +-
 agent/src/collectors/disk.rs | 37 ++++++++++++------------------------
 dashboard/Cargo.toml         |  2 +-
 shared/Cargo.toml            |  2 +-
 5 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa52479..275dc7c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.180"
+version = "0.1.181"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.180"
+version = "0.1.181"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.180"
+version = "0.1.181"
 dependencies = [
  "chrono",
  "serde",
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index f339a12..7780a63 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.181"
+version = "0.1.182"
 edition = "2021"
 
 [dependencies]
diff --git a/agent/src/collectors/disk.rs b/agent/src/collectors/disk.rs
index 573c7a0..cc7ba15 100644
--- a/agent/src/collectors/disk.rs
+++ b/agent/src/collectors/disk.rs
@@ -385,7 +385,6 @@ impl DiskCollector {
 
     /// Get SMART data for drives
     async fn get_smart_data_for_drives(&self, physical_drives: &[PhysicalDrive], mergerfs_pools: &[MergerfsPool]) -> HashMap<String, SmartData> {
-        use tracing::info;
         let mut smart_data = HashMap::new();
 
         // Collect all drive names
@@ -402,48 +401,36 @@ impl DiskCollector {
             }
         }
 
-        info!("Collecting SMART data for {} drives", all_drives.len());
-
         // Get SMART data for each drive
-        for drive_name in &all_drives {
-            match self.get_smart_data(drive_name).await {
-                Ok(data) => {
-                    info!("SMART data collected for {}: serial={:?}, temp={:?}, health={}",
-                        drive_name, data.serial_number, data.temperature_celsius, data.health);
-                    smart_data.insert(drive_name.clone(), data);
-                }
-                Err(e) => {
-                    info!("Failed to get SMART data for {}: {:?}", drive_name, e);
-                }
+        for drive_name in all_drives {
+            if let Ok(data) = self.get_smart_data(&drive_name).await {
+                smart_data.insert(drive_name, data);
             }
         }
 
-        info!("SMART data collection complete: {}/{} drives successful", smart_data.len(), all_drives.len());
         smart_data
     }
 
     /// Get SMART data for a single drive
     async fn get_smart_data(&self, drive_name: &str) -> Result<SmartData, CollectorError> {
-        use tracing::info;
-
         // Use direct smartctl (no sudo) - service has CAP_SYS_RAWIO capability
-        let output = Command::new("smartctl")
-            .args(&["-a", &format!("/dev/{}", drive_name)])
-            .output()
+        // For NVMe drives, specify device type explicitly
+        let mut cmd = Command::new("smartctl");
+        if drive_name.starts_with("nvme") {
+            cmd.args(&["-d", "nvme", "-a", &format!("/dev/{}", drive_name)]);
+        } else {
+            cmd.args(&["-a", &format!("/dev/{}", drive_name)]);
+        }
+
+        let output = cmd.output()
             .map_err(|e| CollectorError::SystemRead {
                 path: format!("SMART data for {}", drive_name),
                 error: e.to_string(),
             })?;
 
         let output_str = String::from_utf8_lossy(&output.stdout);
-        let error_str = String::from_utf8_lossy(&output.stderr);
-
-        // Debug logging for SMART command results
-        debug!("SMART output for {}: status={}, stdout_len={}, stderr={}",
-            drive_name, output.status, output_str.len(), error_str);
 
         if !output.status.success() {
-            info!("SMART command failed for {}, status={}, stderr={}", drive_name, output.status, error_str);
             // Return unknown data rather than failing completely
             return Ok(SmartData {
                 health: "UNKNOWN".to_string(),
diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml
index 2addf33..085a1fb 100644
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.181"
+version = "0.1.182"
 edition = "2021"
 
 [dependencies]
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index bbfcd35..5ca653f 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.181"
+version = "0.1.182"
 edition = "2021"
 
 [dependencies]