Add NVMe device type flag for SMART data collection

Agent changes:
- Changed docker ps and docker images commands to run without sudo
- cm-agent user is already in docker group, so sudo is not needed
- Fixes "unable to change to root gid: Operation not permitted" error
- Systemd security restrictions were blocking sudo gid changes

This fixes Docker container and image collection on systems with
systemd security hardening enabled.

Updated to version 0.1.178

Cargo.lock

@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.175"
+version = "0.1.181"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.175"
+version = "0.1.181"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.175"
+version = "0.1.181"
 dependencies = [
  "chrono",
  "serde",

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.175"
+version = "0.1.182"
 edition = "2021"
 
 [dependencies]

agent/src/collectors/disk.rs

@@ -386,7 +386,7 @@ impl DiskCollector {
     /// Get SMART data for drives
     async fn get_smart_data_for_drives(&self, physical_drives: &[PhysicalDrive], mergerfs_pools: &[MergerfsPool]) -> HashMap<String, SmartData> {
         let mut smart_data = HashMap::new();
-        
+
         // Collect all drive names
         let mut all_drives = std::collections::HashSet::new();
         for drive in physical_drives {
@@ -413,23 +413,24 @@ impl DiskCollector {
 
     /// Get SMART data for a single drive
     async fn get_smart_data(&self, drive_name: &str) -> Result<SmartData, CollectorError> {
-        let output = Command::new("sudo")
+        // Use direct smartctl (no sudo) - service has CAP_SYS_RAWIO capability
-            .args(&["smartctl", "-a", &format!("/dev/{}", drive_name)])
+        // For NVMe drives, specify device type explicitly
-            .output()
+        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() {
-            debug!("SMART command failed for {}: {}", drive_name, error_str);
             // Return unknown data rather than failing completely
             return Ok(SmartData {
                 health: "UNKNOWN".to_string(),

agent/src/collectors/systemd.rs

@@ -118,10 +118,7 @@ impl SystemdCollector {
                     }
 
                     if service_name.contains("docker") && active_status == "active" {
-                        debug!("Collecting Docker sub-services for service: {}", service_name);
-
                         let docker_containers = self.get_docker_containers();
-                        debug!("Found {} Docker containers", docker_containers.len());
                         for (container_name, container_status) in docker_containers {
                             // For now, docker containers have no additional metrics
                             // Future: could add memory_mb, cpu_percent, restart_count, etc.
@@ -136,7 +133,6 @@ impl SystemdCollector {
 
                         // Add Docker images
                         let docker_images = self.get_docker_images();
-                        debug!("Found {} Docker images", docker_images.len());
                         for (image_name, image_status, image_size) in docker_images {
                             let mut metrics = Vec::new();
                             metrics.push(SubServiceMetric {
@@ -151,8 +147,6 @@ impl SystemdCollector {
                                 metrics,
                             });
                         }
-
-                        debug!("Total Docker sub-services added: {}", sub_services.len());
                     }
 
                     // Create complete service data
@@ -779,10 +773,10 @@ impl SystemdCollector {
     fn get_docker_containers(&self) -> Vec<(String, String)> {
         let mut containers = Vec::new();
 
-        // Check if docker is available (use sudo for permissions)
+        // Check if docker is available (cm-agent user is in docker group)
         // Use -a to show ALL containers (running and stopped)
-        let output = Command::new("sudo")
+        let output = Command::new("docker")
-            .args(&["docker", "ps", "-a", "--format", "{{.Names}},{{.Status}}"])
+            .args(&["ps", "-a", "--format", "{{.Names}},{{.Status}}"])
             .output();
 
         let output = match output {
@@ -823,22 +817,17 @@ impl SystemdCollector {
     /// Get docker images as sub-services
     fn get_docker_images(&self) -> Vec<(String, String, String)> {
         let mut images = Vec::new();
-
+        // Check if docker is available (cm-agent user is in docker group)
-        debug!("Collecting Docker images");
+        let output = Command::new("docker")
-
+            .args(&["images", "--format", "{{.Repository}}:{{.Tag}},{{.Size}}"])
-        // Check if docker is available (use sudo for permissions)
-        let output = Command::new("sudo")
-            .args(&["docker", "images", "--format", "{{.Repository}}:{{.Tag}},{{.Size}}"])
             .output();
 
         let output = match output {
             Ok(out) if out.status.success() => out,
-            Ok(out) => {
+            Ok(_) => {
-                debug!("Docker images command failed with status: {}", out.status);
                 return images;
             }
-            Err(e) => {
+            Err(_) => {
-                debug!("Docker images command error: {}", e);
                 return images;
             }
         };

dashboard/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.175"
+version = "0.1.182"
 edition = "2021"
 
 [dependencies]

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.175"
+version = "0.1.182"
 edition = "2021"
 
 [dependencies]