Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bd22ce265b | |||
| bbc8b7b1cb | |||
| 5dd8cadef3 | |||
| fefe30ec51 | |||
| fb40cce748 | |||
| eaa057b284 |
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.175"
|
||||
version = "0.1.180"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@@ -301,7 +301,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.175"
|
||||
version = "0.1.180"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -324,7 +324,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.175"
|
||||
version = "0.1.180"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"serde",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.175"
|
||||
version = "0.1.181"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -385,6 +385,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> {
|
||||
use tracing::info;
|
||||
let mut smart_data = HashMap::new();
|
||||
|
||||
// Collect all drive names
|
||||
@@ -401,20 +402,33 @@ impl DiskCollector {
|
||||
}
|
||||
}
|
||||
|
||||
info!("Collecting SMART data for {} drives", all_drives.len());
|
||||
|
||||
// Get SMART data for each drive
|
||||
for drive_name in all_drives {
|
||||
if let Ok(data) = self.get_smart_data(&drive_name).await {
|
||||
smart_data.insert(drive_name, data);
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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> {
|
||||
let output = Command::new("sudo")
|
||||
.args(&["smartctl", "-a", &format!("/dev/{}", drive_name)])
|
||||
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()
|
||||
.map_err(|e| CollectorError::SystemRead {
|
||||
path: format!("SMART data for {}", drive_name),
|
||||
@@ -429,7 +443,7 @@ impl DiskCollector {
|
||||
drive_name, output.status, output_str.len(), error_str);
|
||||
|
||||
if !output.status.success() {
|
||||
debug!("SMART command failed for {}: {}", drive_name, error_str);
|
||||
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(),
|
||||
|
||||
@@ -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")
|
||||
.args(&["docker", "ps", "-a", "--format", "{{.Names}},{{.Status}}"])
|
||||
let output = Command::new("docker")
|
||||
.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();
|
||||
|
||||
debug!("Collecting Docker images");
|
||||
|
||||
// Check if docker is available (use sudo for permissions)
|
||||
let output = Command::new("sudo")
|
||||
.args(&["docker", "images", "--format", "{{.Repository}}:{{.Tag}},{{.Size}}"])
|
||||
// Check if docker is available (cm-agent user is in docker group)
|
||||
let output = Command::new("docker")
|
||||
.args(&["images", "--format", "{{.Repository}}:{{.Tag}},{{.Size}}"])
|
||||
.output();
|
||||
|
||||
let output = match output {
|
||||
Ok(out) if out.status.success() => out,
|
||||
Ok(out) => {
|
||||
debug!("Docker images command failed with status: {}", out.status);
|
||||
Ok(_) => {
|
||||
return images;
|
||||
}
|
||||
Err(e) => {
|
||||
debug!("Docker images command error: {}", e);
|
||||
Err(_) => {
|
||||
return images;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.175"
|
||||
version = "0.1.181"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.175"
|
||||
version = "0.1.181"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
Reference in New Issue
Block a user