Testing

agent/src/collectors/backup.rs

@@ -12,7 +12,6 @@ use super::{AgentType, Collector, CollectorError, CollectorOutput};
 
 #[derive(Debug, Clone)]
 pub struct BackupCollector {
-    pub enabled: bool,
     pub interval: Duration,
     pub restic_repo: Option<String>,
     pub backup_service: String,
@@ -21,13 +20,12 @@ pub struct BackupCollector {
 
 impl BackupCollector {
     pub fn new(
-        enabled: bool,
+        _enabled: bool,
         interval_ms: u64,
         restic_repo: Option<String>,
         backup_service: String,
     ) -> Self {
         Self {
-            enabled,
             interval: Duration::from_millis(interval_ms),
             restic_repo,
             backup_service,
@@ -300,13 +298,6 @@ impl Collector for BackupCollector {
         self.interval
     }
 
-    fn is_enabled(&self) -> bool {
-        self.enabled
-    }
-
-    fn requires_root(&self) -> bool {
-        false // Depends on restic repo permissions
-    }
 
     async fn collect(&self) -> Result<CollectorOutput, CollectorError> {
         // Try to get borgbackup metrics first, fall back to restic if not available
@@ -383,9 +374,17 @@ impl Collector for BackupCollector {
                 last_message: None,
             });
 
+        // Convert BackupStatus to standardized string format
+        let status_string = match overall_status {
+            BackupStatus::Healthy => "ok",
+            BackupStatus::Warning => "warning", 
+            BackupStatus::Failed => "critical",
+            BackupStatus::Unknown => "unknown",
+        };
+
         // Add disk information if available from borgbackup metrics
         let mut backup_json = json!({
-            "overall_status": overall_status,
+            "overall_status": status_string,
             "backup": backup_info,
             "service": service_data,
             "timestamp": Utc::now()
@@ -407,7 +406,6 @@ impl Collector for BackupCollector {
         Ok(CollectorOutput {
             agent_type: AgentType::Backup,
             data: backup_metrics,
-            timestamp: Utc::now(),
         })
     }
 }
@@ -457,39 +455,25 @@ struct JournalEntry {
 // Borgbackup metrics structure from backup script
 #[derive(Debug, Deserialize)]
 struct BorgbackupMetrics {
-    backup_name: String,
-    start_time: String,
-    end_time: String,
-    duration_seconds: i64,
     status: String,
-    exit_codes: ExitCodes,
     repository: Repository,
     backup_disk: BackupDisk,
     timestamp: i64,
 }
 
-#[derive(Debug, Deserialize)]
-struct ExitCodes {
-    global: i32,
-    backup: i32,
-    prune: i32,
-    compact: i32,
-}
-
 #[derive(Debug, Deserialize)]
 struct Repository {
     total_archives: i32,
     latest_archive_size_bytes: i64,
     total_repository_size_bytes: i64,
-    path: String,
 }
 
+
 #[derive(Debug, Deserialize)]
 struct BackupDisk {
     device: String,
     health: String,
     total_bytes: i64,
     used_bytes: i64,
-    available_bytes: i64,
     usage_percent: f32,
 }