Add NVMe device type flag for SMART data collection
All checks were successful
Build and Release / build-and-release (push) Successful in 1m19s
All checks were successful
Build and Release / build-and-release (push) Successful in 1m19s
This commit is contained in:
parent
bd22ce265b
commit
cac836601b
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.180"
|
version = "0.1.181"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.180"
|
version = "0.1.181"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@ -324,7 +324,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.180"
|
version = "0.1.181"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.181"
|
version = "0.1.182"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -385,7 +385,6 @@ impl DiskCollector {
|
|||||||
|
|
||||||
/// Get SMART data for drives
|
/// Get SMART data for drives
|
||||||
async fn get_smart_data_for_drives(&self, physical_drives: &[PhysicalDrive], mergerfs_pools: &[MergerfsPool]) -> HashMap<String, SmartData> {
|
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();
|
let mut smart_data = HashMap::new();
|
||||||
|
|
||||||
// Collect all drive names
|
// 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
|
// Get SMART data for each drive
|
||||||
for drive_name in &all_drives {
|
for drive_name in all_drives {
|
||||||
match self.get_smart_data(drive_name).await {
|
if let Ok(data) = self.get_smart_data(&drive_name).await {
|
||||||
Ok(data) => {
|
smart_data.insert(drive_name, 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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("SMART data collection complete: {}/{} drives successful", smart_data.len(), all_drives.len());
|
|
||||||
smart_data
|
smart_data
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get SMART data for a single drive
|
/// Get SMART data for a single drive
|
||||||
async fn get_smart_data(&self, drive_name: &str) -> Result<SmartData, CollectorError> {
|
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
|
// Use direct smartctl (no sudo) - service has CAP_SYS_RAWIO capability
|
||||||
let output = Command::new("smartctl")
|
// For NVMe drives, specify device type explicitly
|
||||||
.args(&["-a", &format!("/dev/{}", drive_name)])
|
let mut cmd = Command::new("smartctl");
|
||||||
.output()
|
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 {
|
.map_err(|e| CollectorError::SystemRead {
|
||||||
path: format!("SMART data for {}", drive_name),
|
path: format!("SMART data for {}", drive_name),
|
||||||
error: e.to_string(),
|
error: e.to_string(),
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let output_str = String::from_utf8_lossy(&output.stdout);
|
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() {
|
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 unknown data rather than failing completely
|
||||||
return Ok(SmartData {
|
return Ok(SmartData {
|
||||||
health: "UNKNOWN".to_string(),
|
health: "UNKNOWN".to_string(),
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.181"
|
version = "0.1.182"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.181"
|
version = "0.1.182"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user