diff --git a/controller/internal/web/handlers.go b/controller/internal/web/handlers.go index 07a6f57..de9a9d5 100644 --- a/controller/internal/web/handlers.go +++ b/controller/internal/web/handlers.go @@ -56,10 +56,12 @@ func (s *Server) dashboardHandler(w http.ResponseWriter, _ *http.Request) { // Backup status data["BackupEnabled"] = s.cfg.Backup.Enabled if s.backupMgr != nil { - dbDump, backupSt := s.backupMgr.GetStatus() - data["DBDumpStatus"] = dbDump - data["BackupStatus"] = backupSt - data["BackupRunning"] = s.backupMgr.IsRunning() + nextDBDump := scheduler.NextDailyRun(s.cfg.Backup.DBDumpSchedule) + nextBackup := scheduler.NextDailyRun(s.cfg.Backup.ResticSchedule) + fullStatus := s.backupMgr.GetFullStatus(nextDBDump, nextBackup) + data["DBDumpStatus"] = fullStatus.LastDBDump + data["BackupStatus"] = fullStatus.LastBackup + data["BackupRunning"] = fullStatus.Running data["BackupMaxAgeHours"] = s.cfg.Monitoring.Thresholds.BackupMaxAgeHours }