|
|
|
|
@@ -4,7 +4,7 @@ use cm_dashboard_shared::{AgentData, ServiceData, SubServiceData, SubServiceMetr
|
|
|
|
|
use std::process::Command;
|
|
|
|
|
use std::sync::RwLock;
|
|
|
|
|
use std::time::Instant;
|
|
|
|
|
use tracing::debug;
|
|
|
|
|
use tracing::{debug, info};
|
|
|
|
|
|
|
|
|
|
use super::{Collector, CollectorError};
|
|
|
|
|
use crate::config::SystemdConfig;
|
|
|
|
|
@@ -118,10 +118,10 @@ impl SystemdCollector {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if service_name.contains("docker") && active_status == "active" {
|
|
|
|
|
debug!("Collecting Docker sub-services for service: {}", service_name);
|
|
|
|
|
info!("Collecting Docker sub-services for service: {}", service_name);
|
|
|
|
|
|
|
|
|
|
let docker_containers = self.get_docker_containers();
|
|
|
|
|
debug!("Found {} Docker containers", docker_containers.len());
|
|
|
|
|
info!("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 +136,7 @@ impl SystemdCollector {
|
|
|
|
|
|
|
|
|
|
// Add Docker images
|
|
|
|
|
let docker_images = self.get_docker_images();
|
|
|
|
|
debug!("Found {} Docker images", docker_images.len());
|
|
|
|
|
info!("Found {} Docker images", docker_images.len());
|
|
|
|
|
for (image_name, image_status, image_size) in docker_images {
|
|
|
|
|
let mut metrics = Vec::new();
|
|
|
|
|
metrics.push(SubServiceMetric {
|
|
|
|
|
@@ -152,7 +152,7 @@ impl SystemdCollector {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
debug!("Total Docker sub-services added: {}", sub_services.len());
|
|
|
|
|
info!("Total Docker sub-services added: {}", sub_services.len());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create complete service data
|
|
|
|
|
@@ -824,7 +824,7 @@ impl SystemdCollector {
|
|
|
|
|
fn get_docker_images(&self) -> Vec<(String, String, String)> {
|
|
|
|
|
let mut images = Vec::new();
|
|
|
|
|
|
|
|
|
|
debug!("Collecting Docker images");
|
|
|
|
|
info!("Collecting Docker images");
|
|
|
|
|
|
|
|
|
|
// Check if docker is available (use sudo for permissions)
|
|
|
|
|
let output = Command::new("sudo")
|
|
|
|
|
@@ -834,11 +834,12 @@ impl SystemdCollector {
|
|
|
|
|
let output = match output {
|
|
|
|
|
Ok(out) if out.status.success() => out,
|
|
|
|
|
Ok(out) => {
|
|
|
|
|
debug!("Docker images command failed with status: {}", out.status);
|
|
|
|
|
let stderr = String::from_utf8_lossy(&out.stderr);
|
|
|
|
|
info!("Docker images command failed with status: {}, stderr: {}", out.status, stderr);
|
|
|
|
|
return images;
|
|
|
|
|
}
|
|
|
|
|
Err(e) => {
|
|
|
|
|
debug!("Docker images command error: {}", e);
|
|
|
|
|
info!("Docker images command error: {}", e);
|
|
|
|
|
return images;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|