Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 66ab7a492d | |||
| 4d615a7f45 | |||
| fd7ad23205 |
103
CLAUDE.md
103
CLAUDE.md
@@ -357,53 +357,88 @@ Keep responses concise and focused. Avoid extensive implementation summaries unl
|
||||
|
||||
## Completed Architecture Migration (v0.1.131)
|
||||
|
||||
## Agent Architecture Migration Plan (v0.1.139)
|
||||
## Complete Fix Plan (v0.1.140)
|
||||
|
||||
**🎯 Goal: Eliminate String Metrics Bridge, Direct Structured Data Collection**
|
||||
**🎯 Goal: Fix ALL Issues - Display AND Core Functionality**
|
||||
|
||||
### Current Architecture (v0.1.138)
|
||||
### Current Broken State (v0.1.139)
|
||||
|
||||
**Current Flow:**
|
||||
**❌ What's Broken:**
|
||||
```
|
||||
Collectors → String Metrics → MetricManager.cache
|
||||
↘
|
||||
process_metrics() → HostStatusManager → Notifications
|
||||
↘
|
||||
broadcast_all_metrics() → Bridge Conversion → AgentData → ZMQ
|
||||
✅ Data Collection: Agent collects structured data correctly
|
||||
❌ Storage Display: Shows wrong mount points, missing temperature/wear
|
||||
❌ Status Evaluation: Everything shows "OK" regardless of actual values
|
||||
❌ Notifications: Not working - can't send alerts when systems fail
|
||||
❌ Thresholds: Not being evaluated (CPU load, memory usage, disk temperature)
|
||||
```
|
||||
|
||||
**Issues:**
|
||||
- Bridge conversion loses mount point information (`/` becomes `root`, `/boot` becomes `boot`)
|
||||
- Tmpfs mounts not properly displayed in RAM section
|
||||
- Unnecessary string parsing complexity and potential bugs
|
||||
- String-to-JSON conversion introduces data transformation errors
|
||||
**Root Cause:**
|
||||
During atomic migration, I removed core monitoring functionality and only fixed data collection, making the dashboard useless as a monitoring tool.
|
||||
|
||||
### Target Architecture
|
||||
### Complete Fix Plan - Do Everything Right
|
||||
|
||||
**Target Flow:**
|
||||
#### Phase 1: Fix Storage Display (CURRENT)
|
||||
- ✅ Use `lsblk` instead of `findmnt` (eliminates `/nix/store` bind mount issue)
|
||||
- ✅ Add `sudo smartctl` for permissions
|
||||
- ✅ Fix NVMe SMART parsing (`Temperature:` and `Percentage Used:`)
|
||||
- 🔄 Test that dashboard shows: `● nvme0n1 T: 28°C W: 1%` correctly
|
||||
|
||||
#### Phase 2: Restore Status Evaluation System
|
||||
- **CPU Status**: Evaluate load averages against thresholds → Status::Warning/Critical
|
||||
- **Memory Status**: Evaluate usage_percent against thresholds → Status::Warning/Critical
|
||||
- **Storage Status**: Evaluate temperature & usage against thresholds → Status::Warning/Critical
|
||||
- **Service Status**: Evaluate service states → Status::Warning if inactive
|
||||
- **Overall Host Status**: Aggregate component statuses → host-level status
|
||||
|
||||
#### Phase 3: Restore Notification System
|
||||
- **Status Change Detection**: Track when component status changes from OK→Warning/Critical
|
||||
- **Email Notifications**: Send alerts when status degrades
|
||||
- **Notification Rate Limiting**: Prevent spam (existing logic)
|
||||
- **Maintenance Mode**: Honor `/tmp/cm-maintenance` to suppress alerts
|
||||
- **Batched Notifications**: Group multiple alerts into single email
|
||||
|
||||
#### Phase 4: Integration & Testing
|
||||
- **AgentData Status Fields**: Add status fields to structured data
|
||||
- **Dashboard Status Display**: Show colored indicators based on actual status
|
||||
- **End-to-End Testing**: Verify alerts fire when thresholds exceeded
|
||||
- **Verify All Thresholds**: CPU load, memory usage, disk temperature, service states
|
||||
|
||||
### Target Architecture (CORRECT)
|
||||
|
||||
**Complete Flow:**
|
||||
```
|
||||
Collectors → AgentData → HostStatusManager → Notifications
|
||||
↘
|
||||
Direct ZMQ Transmission
|
||||
Collectors → AgentData → StatusEvaluator → Notifications
|
||||
↘ ↗
|
||||
ZMQ → Dashboard → Status Display
|
||||
```
|
||||
|
||||
### Implementation Plan
|
||||
**Key Components:**
|
||||
1. **Collectors**: Populate AgentData with raw metrics
|
||||
2. **StatusEvaluator**: Apply thresholds to AgentData → Status enum values
|
||||
3. **Notifications**: Send emails on status changes (OK→Warning/Critical)
|
||||
4. **Dashboard**: Display data with correct status colors/indicators
|
||||
|
||||
#### Atomic Migration (v0.1.139) - Single Complete Rewrite
|
||||
- **Complete removal** of string metrics system - no legacy support
|
||||
- **Collectors output structured data directly** - populate `AgentData` with correct mount points
|
||||
- **HostStatusManager operates on `AgentData`** - status evaluation on structured fields
|
||||
- **Notifications process structured data** - preserve all notification logic
|
||||
- **Direct ZMQ transmission** - no bridge conversion code
|
||||
- **Service tracking preserved** - user-stopped flags, thresholds, all functionality intact
|
||||
- **Zero backward compatibility** - clean break from string metric architecture
|
||||
### Implementation Rules
|
||||
|
||||
### Benefits
|
||||
- **Correct Display**: `/` and `/boot` mount points, proper tmpfs in RAM section
|
||||
- **Performance**: Eliminate string parsing overhead
|
||||
- **Maintainability**: Type-safe data flow, no string parsing bugs
|
||||
- **Functionality Preserved**: Status evaluation, notifications, service tracking intact
|
||||
- **Clean Architecture**: NO legacy fallback code, complete migration to structured data
|
||||
**MUST COMPLETE ALL:**
|
||||
- Fix storage display to show correct mount points and temperature
|
||||
- Restore working status evaluation (thresholds → Status enum)
|
||||
- Restore working notifications (email alerts on status changes)
|
||||
- Test that monitoring actually works (alerts fire when appropriate)
|
||||
|
||||
**NO SHORTCUTS:**
|
||||
- Don't commit partial fixes
|
||||
- Don't claim functionality works when it doesn't
|
||||
- Test every component thoroughly
|
||||
- Keep existing configuration and thresholds working
|
||||
|
||||
**Success Criteria:**
|
||||
- Dashboard shows `● nvme0n1 T: 28°C W: 1%` format
|
||||
- High CPU load triggers Warning status and email alert
|
||||
- High memory usage triggers Warning status and email alert
|
||||
- High disk temperature triggers Warning status and email alert
|
||||
- Failed services trigger Warning status and email alert
|
||||
- Maintenance mode suppresses notifications as expected
|
||||
|
||||
## Implementation Rules
|
||||
|
||||
|
||||
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.138"
|
||||
version = "0.1.140"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@@ -301,7 +301,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.138"
|
||||
version = "0.1.140"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -324,7 +324,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.138"
|
||||
version = "0.1.140"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"serde",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-agent"
|
||||
version = "0.1.139"
|
||||
version = "0.1.141"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -26,6 +26,16 @@ pub struct Agent {
|
||||
collectors: Vec<Box<dyn Collector>>,
|
||||
notification_manager: NotificationManager,
|
||||
service_tracker: UserStoppedServiceTracker,
|
||||
previous_status: Option<SystemStatus>,
|
||||
}
|
||||
|
||||
/// Track system component status for change detection
|
||||
#[derive(Debug, Clone)]
|
||||
struct SystemStatus {
|
||||
cpu_load_status: cm_dashboard_shared::Status,
|
||||
cpu_temperature_status: cm_dashboard_shared::Status,
|
||||
memory_usage_status: cm_dashboard_shared::Status,
|
||||
// Add more as needed
|
||||
}
|
||||
|
||||
impl Agent {
|
||||
@@ -91,6 +101,7 @@ impl Agent {
|
||||
collectors,
|
||||
notification_manager,
|
||||
service_tracker,
|
||||
previous_status: None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -147,7 +158,7 @@ impl Agent {
|
||||
debug!("Starting structured data collection");
|
||||
|
||||
// Initialize empty AgentData
|
||||
let mut agent_data = AgentData::new(self.hostname.clone(), "v0.1.139".to_string());
|
||||
let mut agent_data = AgentData::new(self.hostname.clone(), env!("CARGO_PKG_VERSION").to_string());
|
||||
|
||||
// Collect data from all collectors
|
||||
for collector in &self.collectors {
|
||||
@@ -157,6 +168,11 @@ impl Agent {
|
||||
}
|
||||
}
|
||||
|
||||
// Check for status changes and send notifications
|
||||
if let Err(e) = self.check_status_changes_and_notify(&agent_data).await {
|
||||
error!("Failed to check status changes: {}", e);
|
||||
}
|
||||
|
||||
// Broadcast the structured data via ZMQ
|
||||
if let Err(e) = self.zmq_handler.publish_agent_data(&agent_data).await {
|
||||
error!("Failed to broadcast agent data: {}", e);
|
||||
@@ -167,6 +183,84 @@ impl Agent {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Check for status changes and send notifications
|
||||
async fn check_status_changes_and_notify(&mut self, agent_data: &AgentData) -> Result<()> {
|
||||
// Extract current status
|
||||
let current_status = SystemStatus {
|
||||
cpu_load_status: agent_data.system.cpu.load_status.clone(),
|
||||
cpu_temperature_status: agent_data.system.cpu.temperature_status.clone(),
|
||||
memory_usage_status: agent_data.system.memory.usage_status.clone(),
|
||||
};
|
||||
|
||||
// Check for status changes
|
||||
if let Some(previous) = self.previous_status.clone() {
|
||||
self.check_and_notify_status_change(
|
||||
"CPU Load",
|
||||
&previous.cpu_load_status,
|
||||
¤t_status.cpu_load_status,
|
||||
format!("CPU load: {:.1}", agent_data.system.cpu.load_1min)
|
||||
).await?;
|
||||
|
||||
self.check_and_notify_status_change(
|
||||
"CPU Temperature",
|
||||
&previous.cpu_temperature_status,
|
||||
¤t_status.cpu_temperature_status,
|
||||
format!("CPU temperature: {}°C",
|
||||
agent_data.system.cpu.temperature_celsius.unwrap_or(0.0) as i32)
|
||||
).await?;
|
||||
|
||||
self.check_and_notify_status_change(
|
||||
"Memory Usage",
|
||||
&previous.memory_usage_status,
|
||||
¤t_status.memory_usage_status,
|
||||
format!("Memory usage: {:.1}%", agent_data.system.memory.usage_percent)
|
||||
).await?;
|
||||
}
|
||||
|
||||
// Store current status for next comparison
|
||||
self.previous_status = Some(current_status);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Check individual status change and send notification if degraded
|
||||
async fn check_and_notify_status_change(
|
||||
&mut self,
|
||||
component: &str,
|
||||
previous: &cm_dashboard_shared::Status,
|
||||
current: &cm_dashboard_shared::Status,
|
||||
details: String
|
||||
) -> Result<()> {
|
||||
use cm_dashboard_shared::Status;
|
||||
|
||||
// Only notify on status degradation (OK → Warning/Critical, Warning → Critical)
|
||||
let should_notify = match (previous, current) {
|
||||
(Status::Ok, Status::Warning) => true,
|
||||
(Status::Ok, Status::Critical) => true,
|
||||
(Status::Warning, Status::Critical) => true,
|
||||
_ => false,
|
||||
};
|
||||
|
||||
if should_notify {
|
||||
let subject = format!("{} {} Alert", self.hostname, component);
|
||||
let body = format!(
|
||||
"Alert: {} status changed from {:?} to {:?}\n\nDetails: {}\n\nTime: {}",
|
||||
component,
|
||||
previous,
|
||||
current,
|
||||
details,
|
||||
chrono::Utc::now().format("%Y-%m-%d %H:%M:%S UTC")
|
||||
);
|
||||
|
||||
info!("Sending notification: {} - {:?} → {:?}", component, previous, current);
|
||||
|
||||
if let Err(e) = self.notification_manager.send_direct_email(&subject, &body).await {
|
||||
error!("Failed to send notification for {}: {}", component, e);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Handle incoming commands from dashboard
|
||||
async fn handle_commands(&mut self) -> Result<()> {
|
||||
// Try to receive a command (non-blocking)
|
||||
|
||||
@@ -179,6 +179,14 @@ impl Collector for CpuCollector {
|
||||
);
|
||||
}
|
||||
|
||||
// Calculate status using thresholds
|
||||
agent_data.system.cpu.load_status = self.calculate_load_status(agent_data.system.cpu.load_1min);
|
||||
agent_data.system.cpu.temperature_status = if let Some(temp) = agent_data.system.cpu.temperature_celsius {
|
||||
self.calculate_temperature_status(temp)
|
||||
} else {
|
||||
Status::Unknown
|
||||
};
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use anyhow::Result;
|
||||
use async_trait::async_trait;
|
||||
use cm_dashboard_shared::{AgentData, DriveData, FilesystemData, PoolData, HysteresisThresholds};
|
||||
use cm_dashboard_shared::{AgentData, DriveData, FilesystemData, PoolData, HysteresisThresholds, Status};
|
||||
|
||||
use crate::config::DiskConfig;
|
||||
use std::process::Command;
|
||||
@@ -105,13 +105,13 @@ impl DiskCollector {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Get mount devices mapping from /proc/mounts
|
||||
/// Get block devices and their mount points using lsblk
|
||||
async fn get_mount_devices(&self) -> Result<HashMap<String, String>, CollectorError> {
|
||||
let output = Command::new("findmnt")
|
||||
.args(&["-rn", "-o", "TARGET,SOURCE"])
|
||||
let output = Command::new("lsblk")
|
||||
.args(&["-rn", "-o", "NAME,MOUNTPOINT"])
|
||||
.output()
|
||||
.map_err(|e| CollectorError::SystemRead {
|
||||
path: "mount points".to_string(),
|
||||
path: "block devices".to_string(),
|
||||
error: e.to_string(),
|
||||
})?;
|
||||
|
||||
@@ -119,18 +119,21 @@ impl DiskCollector {
|
||||
for line in String::from_utf8_lossy(&output.stdout).lines() {
|
||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
||||
if parts.len() >= 2 {
|
||||
let mount_point = parts[0];
|
||||
let device = parts[1];
|
||||
let device_name = parts[0];
|
||||
let mount_point = parts[1];
|
||||
|
||||
// Skip special filesystems
|
||||
if !device.starts_with('/') || device.contains("loop") {
|
||||
// Skip swap partitions and unmounted devices
|
||||
if mount_point == "[SWAP]" || mount_point.is_empty() {
|
||||
continue;
|
||||
}
|
||||
|
||||
mount_devices.insert(mount_point.to_string(), device.to_string());
|
||||
// Convert device name to full path
|
||||
let device_path = format!("/dev/{}", device_name);
|
||||
mount_devices.insert(mount_point.to_string(), device_path);
|
||||
}
|
||||
}
|
||||
|
||||
debug!("Found {} mounted block devices", mount_devices.len());
|
||||
Ok(mount_devices)
|
||||
}
|
||||
|
||||
@@ -319,8 +322,8 @@ impl DiskCollector {
|
||||
|
||||
/// Get SMART data for a single drive
|
||||
async fn get_smart_data(&self, drive_name: &str) -> Result<SmartData, CollectorError> {
|
||||
let output = Command::new("smartctl")
|
||||
.args(&["-a", &format!("/dev/{}", drive_name)])
|
||||
let output = Command::new("sudo")
|
||||
.args(&["smartctl", "-a", &format!("/dev/{}", drive_name)])
|
||||
.output()
|
||||
.map_err(|e| CollectorError::SystemRead {
|
||||
path: format!("SMART data for {}", drive_name),
|
||||
@@ -328,6 +331,21 @@ impl DiskCollector {
|
||||
})?;
|
||||
|
||||
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() {
|
||||
debug!("SMART command failed for {}: {}", drive_name, error_str);
|
||||
// Return unknown data rather than failing completely
|
||||
return Ok(SmartData {
|
||||
health: "UNKNOWN".to_string(),
|
||||
temperature_celsius: None,
|
||||
wear_percent: None,
|
||||
});
|
||||
}
|
||||
|
||||
let mut health = "UNKNOWN".to_string();
|
||||
let mut temperature = None;
|
||||
@@ -342,13 +360,22 @@ impl DiskCollector {
|
||||
}
|
||||
}
|
||||
|
||||
// Temperature parsing
|
||||
// Temperature parsing for different drive types
|
||||
if line.contains("Temperature_Celsius") || line.contains("Airflow_Temperature_Cel") {
|
||||
// Traditional SATA drives: attribute table format
|
||||
if let Some(temp_str) = line.split_whitespace().nth(9) {
|
||||
if let Ok(temp) = temp_str.parse::<f32>() {
|
||||
temperature = Some(temp);
|
||||
}
|
||||
}
|
||||
} else if line.starts_with("Temperature:") {
|
||||
// NVMe drives: simple "Temperature: 27 Celsius" format
|
||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
||||
if parts.len() >= 2 {
|
||||
if let Ok(temp) = parts[1].parse::<f32>() {
|
||||
temperature = Some(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Wear level parsing for SSDs
|
||||
@@ -359,6 +386,18 @@ impl DiskCollector {
|
||||
}
|
||||
}
|
||||
}
|
||||
// NVMe wear parsing: "Percentage Used: 1%"
|
||||
if line.contains("Percentage Used:") {
|
||||
if let Some(percent_part) = line.split("Percentage Used:").nth(1) {
|
||||
if let Some(percent_str) = percent_part.split_whitespace().next() {
|
||||
if let Some(percent_clean) = percent_str.strip_suffix('%') {
|
||||
if let Ok(wear) = percent_clean.parse::<f32>() {
|
||||
wear_percent = Some(wear);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(SmartData {
|
||||
@@ -373,14 +412,18 @@ impl DiskCollector {
|
||||
for drive in physical_drives {
|
||||
let smart = smart_data.get(&drive.name);
|
||||
|
||||
let filesystems: Vec<FilesystemData> = drive.filesystems.iter().map(|fs| {
|
||||
let mut filesystems: Vec<FilesystemData> = drive.filesystems.iter().map(|fs| {
|
||||
FilesystemData {
|
||||
mount: fs.mount_point.clone(), // This preserves "/" and "/boot" correctly
|
||||
usage_percent: fs.usage_percent,
|
||||
used_gb: fs.used_bytes as f32 / (1024.0 * 1024.0 * 1024.0),
|
||||
total_gb: fs.total_bytes as f32 / (1024.0 * 1024.0 * 1024.0),
|
||||
usage_status: self.calculate_filesystem_usage_status(fs.usage_percent),
|
||||
}
|
||||
}).collect();
|
||||
|
||||
// Sort filesystems by mount point for consistent display order
|
||||
filesystems.sort_by(|a, b| a.mount.cmp(&b.mount));
|
||||
|
||||
agent_data.system.storage.drives.push(DriveData {
|
||||
name: drive.name.clone(),
|
||||
@@ -388,6 +431,12 @@ impl DiskCollector {
|
||||
temperature_celsius: smart.and_then(|s| s.temperature_celsius),
|
||||
wear_percent: smart.and_then(|s| s.wear_percent),
|
||||
filesystems,
|
||||
temperature_status: smart.and_then(|s| s.temperature_celsius)
|
||||
.map(|temp| self.calculate_temperature_status(temp))
|
||||
.unwrap_or(Status::Unknown),
|
||||
health_status: self.calculate_health_status(
|
||||
smart.map(|s| s.health.as_str()).unwrap_or("UNKNOWN")
|
||||
),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -424,6 +473,32 @@ impl DiskCollector {
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Calculate filesystem usage status
|
||||
fn calculate_filesystem_usage_status(&self, usage_percent: f32) -> Status {
|
||||
// Use standard filesystem warning/critical thresholds
|
||||
if usage_percent >= 95.0 {
|
||||
Status::Critical
|
||||
} else if usage_percent >= 85.0 {
|
||||
Status::Warning
|
||||
} else {
|
||||
Status::Ok
|
||||
}
|
||||
}
|
||||
|
||||
/// Calculate drive temperature status
|
||||
fn calculate_temperature_status(&self, temperature: f32) -> Status {
|
||||
self.temperature_thresholds.evaluate(temperature)
|
||||
}
|
||||
|
||||
/// Calculate drive health status
|
||||
fn calculate_health_status(&self, health: &str) -> Status {
|
||||
match health {
|
||||
"PASSED" => Status::Ok,
|
||||
"FAILED" => Status::Critical,
|
||||
_ => Status::Unknown,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use async_trait::async_trait;
|
||||
use cm_dashboard_shared::{AgentData, TmpfsData, HysteresisThresholds};
|
||||
use cm_dashboard_shared::{AgentData, TmpfsData, HysteresisThresholds, Status};
|
||||
|
||||
use tracing::debug;
|
||||
|
||||
@@ -153,6 +153,9 @@ impl MemoryCollector {
|
||||
});
|
||||
}
|
||||
|
||||
// Sort tmpfs mounts by mount point for consistent display order
|
||||
agent_data.system.memory.tmpfs.sort_by(|a, b| a.mount.cmp(&b.mount));
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -184,6 +187,11 @@ impl MemoryCollector {
|
||||
"/tmp" | "/var/tmp" | "/dev/shm" | "/run" | "/var/log"
|
||||
) || mount_point.starts_with("/run/user/") // User session tmpfs
|
||||
}
|
||||
|
||||
/// Calculate memory usage status based on thresholds
|
||||
fn calculate_memory_status(&self, usage_percent: f32) -> Status {
|
||||
self.usage_thresholds.evaluate(usage_percent)
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
@@ -212,6 +220,9 @@ impl Collector for MemoryCollector {
|
||||
);
|
||||
}
|
||||
|
||||
// Calculate status using thresholds
|
||||
agent_data.system.memory.usage_status = self.calculate_memory_status(agent_data.system.memory.usage_percent);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,9 @@ impl NixOSCollector {
|
||||
// Set agent version from environment or Nix store path
|
||||
agent_data.agent_version = self.get_agent_version().await;
|
||||
|
||||
// Set NixOS build/generation information
|
||||
agent_data.build_version = self.get_nixos_generation().await;
|
||||
|
||||
// Set current timestamp
|
||||
agent_data.timestamp = chrono::Utc::now().timestamp() as u64;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard"
|
||||
version = "0.1.139"
|
||||
version = "0.1.141"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -138,6 +138,9 @@ impl Widget for SystemWidget {
|
||||
|
||||
// Extract agent version
|
||||
self.agent_hash = Some(agent_data.agent_version.clone());
|
||||
|
||||
// Extract build version
|
||||
self.nixos_build = agent_data.build_version.clone();
|
||||
|
||||
// Extract CPU data directly
|
||||
let cpu = &agent_data.system.cpu;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cm-dashboard-shared"
|
||||
version = "0.1.139"
|
||||
version = "0.1.141"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use crate::Status;
|
||||
|
||||
/// Complete structured data from an agent
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct AgentData {
|
||||
pub hostname: String,
|
||||
pub agent_version: String,
|
||||
pub build_version: Option<String>,
|
||||
pub timestamp: u64,
|
||||
pub system: SystemData,
|
||||
pub services: Vec<ServiceData>,
|
||||
@@ -27,6 +29,8 @@ pub struct CpuData {
|
||||
pub load_15min: f32,
|
||||
pub frequency_mhz: f32,
|
||||
pub temperature_celsius: Option<f32>,
|
||||
pub load_status: Status,
|
||||
pub temperature_status: Status,
|
||||
}
|
||||
|
||||
/// Memory monitoring data
|
||||
@@ -39,6 +43,7 @@ pub struct MemoryData {
|
||||
pub swap_total_gb: f32,
|
||||
pub swap_used_gb: f32,
|
||||
pub tmpfs: Vec<TmpfsData>,
|
||||
pub usage_status: Status,
|
||||
}
|
||||
|
||||
/// Tmpfs filesystem data
|
||||
@@ -65,6 +70,8 @@ pub struct DriveData {
|
||||
pub temperature_celsius: Option<f32>,
|
||||
pub wear_percent: Option<f32>,
|
||||
pub filesystems: Vec<FilesystemData>,
|
||||
pub temperature_status: Status,
|
||||
pub health_status: Status,
|
||||
}
|
||||
|
||||
/// Filesystem on a drive
|
||||
@@ -74,6 +81,7 @@ pub struct FilesystemData {
|
||||
pub usage_percent: f32,
|
||||
pub used_gb: f32,
|
||||
pub total_gb: f32,
|
||||
pub usage_status: Status,
|
||||
}
|
||||
|
||||
/// Storage pool (MergerFS, RAID, etc.)
|
||||
@@ -125,6 +133,7 @@ impl AgentData {
|
||||
Self {
|
||||
hostname,
|
||||
agent_version,
|
||||
build_version: None,
|
||||
timestamp: chrono::Utc::now().timestamp() as u64,
|
||||
system: SystemData {
|
||||
cpu: CpuData {
|
||||
@@ -133,6 +142,8 @@ impl AgentData {
|
||||
load_15min: 0.0,
|
||||
frequency_mhz: 0.0,
|
||||
temperature_celsius: None,
|
||||
load_status: Status::Unknown,
|
||||
temperature_status: Status::Unknown,
|
||||
},
|
||||
memory: MemoryData {
|
||||
usage_percent: 0.0,
|
||||
@@ -142,6 +153,7 @@ impl AgentData {
|
||||
swap_total_gb: 0.0,
|
||||
swap_used_gb: 0.0,
|
||||
tmpfs: Vec::new(),
|
||||
usage_status: Status::Unknown,
|
||||
},
|
||||
storage: StorageData {
|
||||
drives: Vec::new(),
|
||||
|
||||
@@ -131,6 +131,17 @@ impl HysteresisThresholds {
|
||||
}
|
||||
}
|
||||
|
||||
/// Evaluate value against thresholds to determine status
|
||||
pub fn evaluate(&self, value: f32) -> Status {
|
||||
if value >= self.critical_high {
|
||||
Status::Critical
|
||||
} else if value >= self.warning_high {
|
||||
Status::Warning
|
||||
} else {
|
||||
Status::Ok
|
||||
}
|
||||
}
|
||||
|
||||
pub fn with_custom_gaps(warning_high: f32, warning_gap: f32, critical_high: f32, critical_gap: f32) -> Self {
|
||||
Self {
|
||||
warning_high,
|
||||
|
||||
Reference in New Issue
Block a user