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

Remove codename from NixOS build display

Browse Source 
- Strip codename part (e.g., '(Warbler)') from nixos-version output
- Display clean version format: '25.05.20251004.3bcc93c'
- Simplify parsing to use raw nixos-version output as requested
This commit is contained in:
Christoffer Martinsson 2025-10-23 14:55:18 +02:00
parent 64af24dc40
commit 3b1bda741b
1 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
agent/src/collectors/nixos.rs
View File

@ -20,42 +20,30 @@ impl NixOSCollector {
Self { config } Self { config }
} }
/// Get NixOS build information (short hash and timestamp) /// Get NixOS build information
fn get_nixos_build_info(&self) -> Result<(String, String), Box<dyn std::error::Error>> { fn get_nixos_build_info(&self) -> Result<String, Box<dyn std::error::Error>> {
// Try nixos-version command first // Get nixos-version output directly
if let Ok(output) = Command::new("nixos-version").output() { let output = Command::new("nixos-version").output()?;
if output.status.success() {
let version_line = String::from_utf8_lossy(&output.stdout); if !output.status.success() {
let version = version_line.trim(); return Err("nixos-version command failed".into());
// Parse format: "24.05.20241023.abcdef (Vicuna)"
if let Some(parts) = version.split('.').collect::<Vec<&str>>().get(2) {
if parts.len() >= 14 { // 8 digits + 6 hex chars minimum
let date_part = &parts[..8]; // YYYYMMDD
let hash_part = &parts[8..]; // remaining is hash
// Extract short hash (first 6 characters)
let short_hash = if hash_part.len() >= 6 {
&hash_part[..6]
} else {
hash_part
};
// Format date from YYYYMMDD to dd/mm/yy
if date_part.len() == 8 {
let year = &date_part[2..4]; // YY
let month = &date_part[4..6]; // MM
let day = &date_part[6..8]; // DD
let formatted_date = format!("{}/{}/{}", day, month, year);
return Ok((short_hash.to_string(), formatted_date));
}
}
}
}
} }
Err("Could not parse NixOS build information".into()) let version_line = String::from_utf8_lossy(&output.stdout);
let version = version_line.trim();
if version.is_empty() {
return Err("Empty nixos-version output".into());
}
// Remove codename part (e.g., "(Warbler)")
let clean_version = if let Some(pos) = version.find(" (") {
version[..pos].to_string()
} else {
version.to_string()
};
Ok(clean_version)
} }
/// Get currently active users /// Get currently active users
@ -94,19 +82,10 @@ impl Collector for NixOSCollector {
// Collect NixOS build information // Collect NixOS build information
match self.get_nixos_build_info() { match self.get_nixos_build_info() {
Ok((short_hash, formatted_date)) => { Ok(build_info) => {
// Create combined build string: "hash dd/mm/yy H:M:S"
// For now, use current time for H:M:S (could be enhanced to get actual build time)
let now = chrono::Local::now();
let build_string = format!("{} {} {}",
short_hash,
formatted_date,
now.format("%H:%M:%S")
);
metrics.push(Metric { metrics.push(Metric {
name: "system_nixos_build".to_string(), name: "system_nixos_build".to_string(),
value: MetricValue::String(build_string), value: MetricValue::String(build_info),
unit: None, unit: None,
description: Some("NixOS build information".to_string()), description: Some("NixOS build information".to_string()),
status: Status::Ok, status: Status::Ok,