cm/cm-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 271 Wiki Activity

Remove debug logging from Docker collection code
All checks were successful
Build and Release / build-and-release (push) Successful in 1m19s
Details

Browse Source
This commit is contained in:
Christoffer Martinsson 2025-11-27 12:50:20 +01:00
parent fefe30ec51
commit 5dd8cadef3
5 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
[[package]] [[package]]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.175" version = "0.1.178"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -301,7 +301,7 @@ dependencies = [
[[package]] [[package]]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.175" version = "0.1.178"
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.175" version = "0.1.178"
dependencies = [ dependencies = [
"chrono", "chrono",
"serde", "serde",

2
agent/Cargo.toml
View File

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

18
agent/src/collectors/systemd.rs
View File

@ -4,7 +4,7 @@ use cm_dashboard_shared::{AgentData, ServiceData, SubServiceData, SubServiceMetr
use std::process::Command; use std::process::Command;
use std::sync::RwLock; use std::sync::RwLock;
use std::time::Instant; use std::time::Instant;
use tracing::{debug, info}; use tracing::debug;
use super::{Collector, CollectorError}; use super::{Collector, CollectorError};
use crate::config::SystemdConfig; use crate::config::SystemdConfig;
@ -118,10 +118,7 @@ impl SystemdCollector {
} }
if service_name.contains("docker") && active_status == "active" { if service_name.contains("docker") && active_status == "active" {
info!("Collecting Docker sub-services for service: {}", service_name);
let docker_containers = self.get_docker_containers(); let docker_containers = self.get_docker_containers();
info!("Found {} Docker containers", docker_containers.len());
for (container_name, container_status) in docker_containers { for (container_name, container_status) in docker_containers {
// For now, docker containers have no additional metrics // For now, docker containers have no additional metrics
// Future: could add memory_mb, cpu_percent, restart_count, etc. // Future: could add memory_mb, cpu_percent, restart_count, etc.
@ -136,7 +133,6 @@ impl SystemdCollector {
// Add Docker images // Add Docker images
let docker_images = self.get_docker_images(); let docker_images = self.get_docker_images();
info!("Found {} Docker images", docker_images.len());
for (image_name, image_status, image_size) in docker_images { for (image_name, image_status, image_size) in docker_images {
let mut metrics = Vec::new(); let mut metrics = Vec::new();
metrics.push(SubServiceMetric { metrics.push(SubServiceMetric {
@ -151,8 +147,6 @@ impl SystemdCollector {
metrics, metrics,
}); });
} }
info!("Total Docker sub-services added: {}", sub_services.len());
} }
// Create complete service data // Create complete service data
@ -823,9 +817,6 @@ impl SystemdCollector {
/// Get docker images as sub-services /// Get docker images as sub-services
fn get_docker_images(&self) -> Vec<(String, String, String)> { fn get_docker_images(&self) -> Vec<(String, String, String)> {
let mut images = Vec::new(); let mut images = Vec::new();
info!("Collecting Docker images");
// Check if docker is available (cm-agent user is in docker group) // Check if docker is available (cm-agent user is in docker group)
let output = Command::new("docker") let output = Command::new("docker")
.args(&["images", "--format", "{{.Repository}}:{{.Tag}},{{.Size}}"]) .args(&["images", "--format", "{{.Repository}}:{{.Tag}},{{.Size}}"])
@ -833,13 +824,10 @@ impl SystemdCollector {
let output = match output { let output = match output {
Ok(out) if out.status.success() => out, Ok(out) if out.status.success() => out,
Ok(out) => { Ok(_) => {
let stderr = String::from_utf8_lossy(&out.stderr);
info!("Docker images command failed with status: {}, stderr: {}", out.status, stderr);
return images; return images;
} }
Err(e) => { Err(_) => {
info!("Docker images command error: {}", e);
return images; return images;
} }
}; };

2
dashboard/Cargo.toml
View File

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

2
shared/Cargo.toml
View File

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