diff --git a/app/app.rb b/app/app.rb index 30c4489..069bd4e 100644 --- a/app/app.rb +++ b/app/app.rb @@ -30,4 +30,11 @@ baktainer = Baktainer::Runner.new( } ) -baktainer.run \ No newline at end of file +if options[:now] + LOGGER.info('Running backup immediately (--now flag)') + baktainer.perform_backup + LOGGER.info('Backup completed, exiting') + exit 0 +else + baktainer.run +end \ No newline at end of file diff --git a/app/lib/baktainer/backup_monitor.rb b/app/lib/baktainer/backup_monitor.rb index f625fa7..12c02c8 100644 --- a/app/lib/baktainer/backup_monitor.rb +++ b/app/lib/baktainer/backup_monitor.rb @@ -15,6 +15,9 @@ class Baktainer::BackupMonitor @start_times = Concurrent::Hash.new @backup_history = Concurrent::Array.new @mutex = Mutex.new + + # Load historical backups on startup + load_historical_backups end def start_backup(container_name, engine) @@ -162,12 +165,75 @@ class Baktainer::BackupMonitor private + def load_historical_backups + backup_dir = ENV['BT_BACKUP_DIR'] || '/backups' + + unless Dir.exist?(backup_dir) + @logger.debug("Backup directory #{backup_dir} does not exist, skipping historical backup loading") + return + end + + @logger.info("Loading historical backup data from #{backup_dir}") + + begin + # Find all .meta files recursively + meta_files = Dir.glob(File.join(backup_dir, '**', '*.meta')) + loaded_count = 0 + + meta_files.each do |meta_file| + begin + # Read and parse metadata + metadata = JSON.parse(File.read(meta_file)) + + # Convert to backup history format + backup_record = { + container_name: metadata['container_name'], + timestamp: metadata['timestamp'], + duration: estimate_backup_duration(metadata['file_size']), + file_size: metadata['file_size'], + file_path: File.join(File.dirname(meta_file), metadata['backup_file']), + status: File.exist?(File.join(File.dirname(meta_file), metadata['backup_file'])) ? 'success' : 'failed' + } + + # Add to history + @backup_history << backup_record + loaded_count += 1 + + rescue JSON::ParserError => e + @logger.warn("Failed to parse metadata file #{meta_file}: #{e.message}") + rescue => e + @logger.warn("Error loading backup metadata from #{meta_file}: #{e.message}") + end + end + + # Sort by timestamp and keep only the most recent 1000 records + @backup_history.sort_by! { |backup| backup[:timestamp] } + @backup_history = @backup_history.last(1000) + + @logger.info("Loaded #{loaded_count} historical backups from #{meta_files.size} metadata files") + + rescue => e + @logger.error("Error loading historical backups: #{e.message}") + @logger.debug(e.backtrace.join("\n")) + end + end + + def estimate_backup_duration(file_size) + # Estimate duration based on file size + # Assume ~1MB/second processing speed as a reasonable estimate + return 1.0 if file_size.nil? || file_size <= 0 + + size_mb = file_size.to_f / (1024 * 1024) + [size_mb, 1.0].max # Minimum 1 second + end + def record_backup_metrics(backup_record) @mutex.synchronize do @backup_history << backup_record - # Keep only last 1000 records to prevent memory bloat - @backup_history.shift if @backup_history.size > 1000 + # Sort by timestamp and keep only last 1000 records to prevent memory bloat + @backup_history.sort_by! { |backup| backup[:timestamp] } + @backup_history = @backup_history.last(1000) # Check for performance issues check_performance_alerts(backup_record) diff --git a/app/lib/baktainer/dashboard.html b/app/lib/baktainer/dashboard.html index fe52dd4..3b26c96 100644 --- a/app/lib/baktainer/dashboard.html +++ b/app/lib/baktainer/dashboard.html @@ -86,6 +86,7 @@ color: #27ae60; } + .success { color: #27ae60; } .error { color: #e74c3c; } .warning { color: #f39c12; } @@ -132,6 +133,38 @@ .loading { display: none; color: #7f8c8d; + } + + .pagination-container { + display: flex; + justify-content: center; + align-items: center; + margin-top: 1rem; + gap: 0.5rem; + } + + .pagination-button { + padding: 0.5rem 1rem; + background: #3498db; + color: white; + border: none; + border-radius: 4px; + cursor: pointer; + font-size: 0.9rem; + } + + .pagination-button:hover { + background: #2980b9; + } + + .pagination-button:disabled { + background: #bdc3c7; + cursor: not-allowed; + } + + .pagination-info { + color: #666; + font-size: 0.9rem; font-style: italic; } @@ -204,6 +237,9 @@
Loading health data...
+
+
Loading next backup time...
+
@@ -223,21 +259,22 @@ - -
-

📋 Recent Backups

-
-
Loading recent backups...
-
-
- -
+

🐳 Discovered Containers

Loading containers...
+ + +
+

📋 Recent Backups

+
+
Loading recent backups...
+
+
+
\ No newline at end of file diff --git a/app/lib/baktainer/file_system_operations.rb b/app/lib/baktainer/file_system_operations.rb index 53afc69..8fd6bc6 100644 --- a/app/lib/baktainer/file_system_operations.rb +++ b/app/lib/baktainer/file_system_operations.rb @@ -168,15 +168,22 @@ class Baktainer::FileSystemOperations stat.bavail * stat.frsize else # Fallback: use df command for cross-platform compatibility - df_output = `df -k #{path} 2>/dev/null | tail -1` - if $?.success? && df_output.match(/\s+(\d+)\s+\d+%?\s*$/) - # Convert from 1K blocks to bytes - $1.to_i * 1024 - else - @logger.warn("Could not determine disk space for #{path} using df command") - # Return a large number to avoid blocking on disk space check failure - 1024 * 1024 * 1024 # 1GB + df_output = `df -k "#{path}" 2>/dev/null | tail -1` + if $?.success? + # Parse df output: filesystem size used available use% mount + # Example: /dev/sda1 715822476 574981716 104405460 85% /backups + parts = df_output.split(/\s+/) + if parts.length >= 4 + # Available space is the 4th column (index 3) + available_kb = parts[3].to_i + # Convert from 1K blocks to bytes + return available_kb * 1024 + end end + + @logger.warn("Could not determine disk space for #{path} using df command") + # Return a large number to avoid blocking on disk space check failure + 1024 * 1024 * 1024 * 1024 # 1TB instead of 1GB end rescue SystemCallError => e @logger.warn("Could not determine disk space for #{path}: #{e.message}") diff --git a/app/lib/baktainer/health_check_server.rb b/app/lib/baktainer/health_check_server.rb index 5e9ee32..8189f7d 100644 --- a/app/lib/baktainer/health_check_server.rb +++ b/app/lib/baktainer/health_check_server.rb @@ -111,7 +111,8 @@ class Baktainer::HealthCheckServer < Sinatra::Base all_databases: container.all_databases?, container_id: container.docker_container.id, created: container.docker_container.info['Created'], - state: container.docker_container.info['State'] + state: container.running? ? 'running' : 'stopped', + running: container.running? } end @@ -131,6 +132,43 @@ class Baktainer::HealthCheckServer < Sinatra::Base end end + # Next backup time endpoint + get '/next-backup' do + content_type :json + + begin + cron_schedule = ENV['BT_CRON'] || '0 0 * * *' + + # Parse cron schedule + require 'cron_calc' + cron = CronCalc.new(cron_schedule) + + now = Time.now + next_runs = cron.next(now) + next_run = next_runs.is_a?(Array) ? next_runs.first : next_runs + next_run = Time.at(next_run) if next_run.is_a?(Numeric) + + time_until = next_run - now + + { + next_backup_time: next_run.iso8601, + time_until_seconds: time_until.to_i, + time_until_human: format_time_until(time_until), + next_backup_formatted: next_run.strftime('%I:%M%p').downcase, + cron_schedule: cron_schedule, + timestamp: Time.now.iso8601 + }.to_json + rescue => e + @logger.error("Next backup endpoint error: #{e.message}") + status 500 + { + status: 'error', + message: e.message, + timestamp: Time.now.iso8601 + }.to_json + end + end + # Configuration endpoint (sanitized for security) get '/config' do content_type :json @@ -300,6 +338,21 @@ class Baktainer::HealthCheckServer < Sinatra::Base nil end + def format_time_until(seconds) + if seconds < 60 + "#{seconds.to_i} seconds" + elsif seconds < 3600 + minutes = (seconds / 60).to_i + "#{minutes} minute#{'s' if minutes != 1}" + elsif seconds < 86400 + hours = (seconds / 3600).to_i + "#{hours} hour#{'s' if hours != 1}" + else + days = (seconds / 86400).to_i + "#{days} day#{'s' if days != 1}" + end + end + def generate_prometheus_metrics metrics = []