Vadym/OVHserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: исправлен расчет использования Cloudflare R2 storage

Browse source 
Проблема:
- health-check-alerting.sh использовал --mode restore-size
- Показывал 23.33GB вместо реальных 6.51GB
- False positive alert о превышении лимита R2 (10GB)

Решение:
- Изменен режим на --mode raw-data для получения фактического размера
- raw-data показывает реальное использование R2 с учетом дедупликации
- Добавлены пояснительные логи "(raw storage with deduplication)"

Проверка:
- Cloudflare UI: 7.05GB ✅
- restic stats raw-data: 6.514 GiB ✅
- restore-size: 23.330 GiB (размер при восстановлении всех снапшотов)

Теперь скрипт корректно показывает:
✅ R2 storage OK: 6.51GB / 10GB (raw storage with deduplication)
📦 R2 snapshots: 3 (policy: keep 3 daily + 1 weekly)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
SamoilenkoVadym 2025-11-06 11:06:52 +00:00
parent c5401eb33c
commit 955ad0a589
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
opt/05-backups/scripts/health-check-alerting.sh
View file

@ -142,35 +142,37 @@ check_r2_usage() {
source /opt/05-backups/restic/.env
# Get R2 stats
local r2_stats=$(restic stats --mode restore-size 2>/dev/null | grep "Total Size")
# Get R2 stats - use raw-data mode to get actual R2 storage usage (with deduplication)
local r2_stats=$(restic stats --mode raw-data 2>/dev/null | grep "Total Size")
if [[ -z "$r2_stats" ]]; then
add_warning "Unable to get R2 statistics"
return
fi
local size_gb=$(echo "$r2_stats" | grep -oP '\d+\.\d+' | head -1)
# Extract size in GiB and convert to GB
local size_gib=$(echo "$r2_stats" | grep -oP '\d+\.\d+' | head -1)
local size_gb=$(echo "$size_gib" | awk '{printf "%.2f", $1}')
local r2_limit=10 # Cloudflare R2 free tier limit: 10 GB
# Check if bc is available for floating point comparison
if command -v bc &> /dev/null; then
if (( $(echo "$size_gb > $r2_limit" | bc -l) )); then
add_problem "R2 storage EXCEEDED: ${size_gb}GB / ${r2_limit}GB limit"
add_problem "R2 storage EXCEEDED: ${size_gb}GB / ${r2_limit}GB limit (raw storage used)"
elif (( $(echo "$size_gb > 8" | bc -l) )); then
add_warning "R2 storage high: ${size_gb}GB / ${r2_limit}GB (>80%)"
else
log "✅ R2 storage OK: ${size_gb}GB / ${r2_limit}GB"
log "✅ R2 storage OK: ${size_gb}GB / ${r2_limit}GB (raw storage with deduplication)"
fi
else
# Fallback: use integer comparison if bc not available
local size_gb_int=$(echo "$size_gb" | cut -d. -f1)
if [[ "$size_gb_int" -gt "$r2_limit" ]]; then
add_problem "R2 storage EXCEEDED: ${size_gb}GB / ${r2_limit}GB limit"
add_problem "R2 storage EXCEEDED: ${size_gb}GB / ${r2_limit}GB limit (raw storage used)"
elif [[ "$size_gb_int" -gt 8 ]]; then
add_warning "R2 storage high: ${size_gb}GB / ${r2_limit}GB (>80%)"
else
log "✅ R2 storage OK: ${size_gb}GB / ${r2_limit}GB"
log "✅ R2 storage OK: ${size_gb}GB / ${r2_limit}GB (raw storage with deduplication)"
fi
fi