V21
This commit is contained in:
1 parent
01edc9dd4e
commit
45e1d972f7
1 file changed
+157
-5
+157
-5
@@ -17,6 +17,8 @@ UPDATE_STOPPED="${UPDATE_STOPPED:-no}"
|
|||||||
AUTO_REBOOT_HOST="${AUTO_REBOOT_HOST:-yes}"
|
AUTO_REBOOT_HOST="${AUTO_REBOOT_HOST:-yes}"
|
||||||
EXCLUDE_GUESTS="${EXCLUDE_GUESTS:-}"
|
EXCLUDE_GUESTS="${EXCLUDE_GUESTS:-}"
|
||||||
APT_LOCK_TIMEOUT="${APT_LOCK_TIMEOUT:-600}"
|
APT_LOCK_TIMEOUT="${APT_LOCK_TIMEOUT:-600}"
|
||||||
|
BACKUP_WAIT_TIMEOUT="${BACKUP_WAIT_TIMEOUT:-7200}"
|
||||||
|
BACKUP_WAIT_INTERVAL="${BACKUP_WAIT_INTERVAL:-60}"
|
||||||
LOG_FILE="${LOG_FILE:-/var/log/pve-guest-update.log}"
|
LOG_FILE="${LOG_FILE:-/var/log/pve-guest-update.log}"
|
||||||
|
|
||||||
# Proxmox Notification System
|
# Proxmox Notification System
|
||||||
@@ -33,6 +35,10 @@ NO_REBOOT="no"
|
|||||||
ERRORS=0
|
ERRORS=0
|
||||||
ERROR_DETAILS=()
|
ERROR_DETAILS=()
|
||||||
FULL_UPGRADE_HINTS=()
|
FULL_UPGRADE_HINTS=()
|
||||||
|
LXC_RESULT_DETAILS=()
|
||||||
|
VM_RESULT_DETAILS=()
|
||||||
|
BACKUP_WAITED="no"
|
||||||
|
REBOOT_BLOCKED_BY_BACKUP="no"
|
||||||
HOST_OK="not-run"
|
HOST_OK="not-run"
|
||||||
HOST_UPDATED="no"
|
HOST_UPDATED="no"
|
||||||
HOST_REBOOT_REQUIRED="no"
|
HOST_REBOOT_REQUIRED="no"
|
||||||
@@ -173,7 +179,127 @@ check_vm_full_upgrade_hint() {
|
|||||||
log "VM $id ($name): Hinweis - manuelle full-upgrade-Prüfung empfohlen."
|
log "VM $id ($name): Hinweis - manuelle full-upgrade-Prüfung empfohlen."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
add_guest_result() {
|
||||||
|
local type="$1" id="$2" name="$3" status="$4"
|
||||||
|
local line="$id ($name): $status"
|
||||||
|
if [[ "$type" == "LXC" ]]; then LXC_RESULT_DETAILS+=("$line"); else VM_RESULT_DETAILS+=("$line"); fi
|
||||||
|
}
|
||||||
|
|
||||||
|
proxmox_backup_running() {
|
||||||
|
pgrep -x vzdump >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
wait_for_proxmox_backup() {
|
||||||
|
local waited=0
|
||||||
|
|
||||||
|
if ! proxmox_backup_running; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
BACKUP_WAITED="yes"
|
||||||
|
log "Proxmox-Backup (vzdump) läuft. Warte mit dem Update (max. ${BACKUP_WAIT_TIMEOUT}s)."
|
||||||
|
|
||||||
|
while proxmox_backup_running; do
|
||||||
|
if (( waited >= BACKUP_WAIT_TIMEOUT )); then
|
||||||
|
log "Proxmox-Backup läuft nach ${BACKUP_WAIT_TIMEOUT}s weiterhin. Update-Lauf wird nicht gestartet."
|
||||||
|
add_error "Proxmox-Backup läuft weiterhin - Update-Lauf nicht gestartet"
|
||||||
|
ERRORS=$((ERRORS + 1))
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
sleep "$BACKUP_WAIT_INTERVAL"
|
||||||
|
waited=$((waited + BACKUP_WAIT_INTERVAL))
|
||||||
|
done
|
||||||
|
|
||||||
|
log "Proxmox-Backup beendet. Update-Lauf wird fortgesetzt."
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
backup_allows_reboot() {
|
||||||
|
if proxmox_backup_running; then
|
||||||
|
REBOOT_BLOCKED_BY_BACKUP="yes"
|
||||||
|
log "Proxmox-Backup (vzdump) läuft. Automatischer Neustart wird zurückgestellt."
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
collect_guest_result_details() {
|
||||||
|
LXC_RESULT_DETAILS=()
|
||||||
|
VM_RESULT_DETAILS=()
|
||||||
|
local line id name rest status type key entry i
|
||||||
|
local re_ct='CT[[:space:]]+([0-9]+)[[:space:]]+\(([^)]*)\):(.*)$'
|
||||||
|
local re_vm='VM[[:space:]]+([0-9]+)[[:space:]]+\(([^)]*)\):(.*)$'
|
||||||
|
|
||||||
|
while IFS= read -r line; do
|
||||||
|
type=""
|
||||||
|
if [[ "$line" =~ $re_ct ]]; then
|
||||||
|
type="LXC"; id="${BASH_REMATCH[1]}"; name="${BASH_REMATCH[2]}"; rest="${BASH_REMATCH[3]}"
|
||||||
|
elif [[ "$line" =~ $re_vm ]]; then
|
||||||
|
type="VM"; id="${BASH_REMATCH[1]}"; name="${BASH_REMATCH[2]}"; rest="${BASH_REMATCH[3]}"
|
||||||
|
else
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$rest" == *"bereits aktuell"* ]]; then
|
||||||
|
status="bereits aktuell"
|
||||||
|
elif [[ "$rest" == *"erfolgreich aktualisiert"* ]]; then
|
||||||
|
status="aktualisiert"
|
||||||
|
elif [[ "$rest" == *"FEHLER"* || "$rest" == *"fehlgeschlagen"* || "$rest" == *"nicht erreichbar"* ]]; then
|
||||||
|
status="fehlgeschlagen"
|
||||||
|
elif [[ "$rest" == *"übersprungen"* || "$rest" == *"ausgeschlossen"* ]]; then
|
||||||
|
status="übersprungen"
|
||||||
|
else
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
add_guest_result "$type" "$id" "$name" "$status"
|
||||||
|
done < <(tail -n +"${RUN_LOG_START_LINE:-1}" "$LOGFILE" 2>/dev/null)
|
||||||
|
|
||||||
|
# Last recognized result wins for a guest.
|
||||||
|
local -a out=()
|
||||||
|
for type in LXC VM; do
|
||||||
|
out=()
|
||||||
|
if [[ "$type" == "LXC" ]]; then
|
||||||
|
for entry in "${LXC_RESULT_DETAILS[@]}"; do
|
||||||
|
key="${entry%%:*}"
|
||||||
|
for ((i=${#out[@]}-1; i>=0; i--)); do
|
||||||
|
[[ "${out[i]%%:*}" == "$key" ]] && unset 'out[i]'
|
||||||
|
done
|
||||||
|
out+=("$entry")
|
||||||
|
done
|
||||||
|
LXC_RESULT_DETAILS=("${out[@]}")
|
||||||
|
else
|
||||||
|
for entry in "${VM_RESULT_DETAILS[@]}"; do
|
||||||
|
key="${entry%%:*}"
|
||||||
|
for ((i=${#out[@]}-1; i>=0; i--)); do
|
||||||
|
[[ "${out[i]%%:*}" == "$key" ]] && unset 'out[i]'
|
||||||
|
done
|
||||||
|
out+=("$entry")
|
||||||
|
done
|
||||||
|
VM_RESULT_DETAILS=("${out[@]}")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
send_update_notification() {
|
send_update_notification() {
|
||||||
|
collect_guest_result_details
|
||||||
|
|
||||||
|
local lxc_detail_text="Keine"
|
||||||
|
local vm_detail_text="Keine"
|
||||||
|
local guest_line
|
||||||
|
|
||||||
|
if (( ${#LXC_RESULT_DETAILS[@]} > 0 )); then
|
||||||
|
lxc_detail_text=""
|
||||||
|
for guest_line in "${LXC_RESULT_DETAILS[@]}"; do lxc_detail_text+="- ${guest_line}"$'\n'; done
|
||||||
|
lxc_detail_text="${lxc_detail_text%$'\n'}"
|
||||||
|
fi
|
||||||
|
if (( ${#VM_RESULT_DETAILS[@]} > 0 )); then
|
||||||
|
vm_detail_text=""
|
||||||
|
for guest_line in "${VM_RESULT_DETAILS[@]}"; do vm_detail_text+="- ${guest_line}"$'\n'; done
|
||||||
|
vm_detail_text="${vm_detail_text%$'\n'}"
|
||||||
|
fi
|
||||||
[[ "$NOTIFY_ENABLED" == "yes" ]] || return 0
|
[[ "$NOTIFY_ENABLED" == "yes" ]] || return 0
|
||||||
|
|
||||||
if ! ensure_notification_setup; then
|
if ! ensure_notification_setup; then
|
||||||
@@ -226,17 +352,25 @@ Host:
|
|||||||
Reboot erforderlich: $HOST_REBOOT_REQUIRED
|
Reboot erforderlich: $HOST_REBOOT_REQUIRED
|
||||||
Reboot geplant: $HOST_REBOOT_SCHEDULED
|
Reboot geplant: $HOST_REBOOT_SCHEDULED
|
||||||
|
|
||||||
|
Backup-Schutz:
|
||||||
|
Auf laufendes Proxmox-Backup gewartet: $BACKUP_WAITED
|
||||||
|
Neustart wegen laufendem Backup zurückgestellt: $REBOOT_BLOCKED_BY_BACKUP
|
||||||
|
|
||||||
LXC:
|
LXC:
|
||||||
Aktualisiert: $LXC_OK
|
Aktualisiert: $LXC_OK
|
||||||
Bereits aktuell: $LXC_CURRENT
|
Bereits aktuell: $LXC_CURRENT
|
||||||
Fehlgeschlagen: $LXC_FAILED
|
Fehlgeschlagen: $LXC_FAILED
|
||||||
Übersprungen: $LXC_SKIPPED
|
Übersprungen: $LXC_SKIPPED
|
||||||
|
Gäste:
|
||||||
|
$lxc_detail_text
|
||||||
|
|
||||||
VM:
|
VM:
|
||||||
Aktualisiert: $VM_OK
|
Aktualisiert: $VM_OK
|
||||||
Bereits aktuell: $VM_CURRENT
|
Bereits aktuell: $VM_CURRENT
|
||||||
Fehlgeschlagen: $VM_FAILED
|
Fehlgeschlagen: $VM_FAILED
|
||||||
Übersprungen: $VM_SKIPPED
|
Übersprungen: $VM_SKIPPED
|
||||||
|
Gäste:
|
||||||
|
$vm_detail_text
|
||||||
|
|
||||||
Fehler gesamt: $ERRORS
|
Fehler gesamt: $ERRORS
|
||||||
|
|
||||||
@@ -1100,6 +1234,10 @@ reboot_pending_guests() {
|
|||||||
local id
|
local id
|
||||||
local name
|
local name
|
||||||
|
|
||||||
|
if ! backup_allows_reboot; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
if (( ${#LXC_REBOOT_PENDING[@]} == 0 && ${#VM_REBOOT_PENDING[@]} == 0 )); then
|
if (( ${#LXC_REBOOT_PENDING[@]} == 0 && ${#VM_REBOOT_PENDING[@]} == 0 )); then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@@ -1161,6 +1299,8 @@ list_vms() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
log ""
|
log ""
|
||||||
|
RUN_LOG_START_LINE=$(( $(wc -l < "$LOGFILE" 2>/dev/null || echo 0) + 1 ))
|
||||||
|
|
||||||
log "============================================================"
|
log "============================================================"
|
||||||
log " Proxmox Guest Updater"
|
log " Proxmox Guest Updater"
|
||||||
log "============================================================"
|
log "============================================================"
|
||||||
@@ -1170,6 +1310,13 @@ log "Proxmox: $(pveversion)"
|
|||||||
log "Modus: $MODE"
|
log "Modus: $MODE"
|
||||||
log "============================================================"
|
log "============================================================"
|
||||||
|
|
||||||
|
if [[ "$MODE" == "update" ]]; then
|
||||||
|
if ! wait_for_proxmox_backup; then
|
||||||
|
send_update_notification
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -n "$ONLY_CT" ]]; then
|
if [[ -n "$ONLY_CT" ]]; then
|
||||||
|
|
||||||
if ! pct config "$ONLY_CT" >/dev/null 2>&1; then
|
if ! pct config "$ONLY_CT" >/dev/null 2>&1; then
|
||||||
@@ -1320,13 +1467,18 @@ if [[ "$MODE" == "update" ]]; then
|
|||||||
log "Automatischer Neustart in 1 Minute."
|
log "Automatischer Neustart in 1 Minute."
|
||||||
log "Proxmox fährt die laufenden Gäste geordnet herunter."
|
log "Proxmox fährt die laufenden Gäste geordnet herunter."
|
||||||
|
|
||||||
HOST_REBOOT_SCHEDULED="yes"
|
if backup_allows_reboot; then
|
||||||
MAIL_STATUS_DETAIL="Host-Neustart in 1 Minute geplant; notwendige Gast-Neustarts werden dadurch mit erledigt."
|
HOST_REBOOT_SCHEDULED="yes"
|
||||||
|
MAIL_STATUS_DETAIL="Host-Neustart in 1 Minute geplant; notwendige Gast-Neustarts werden dadurch mit erledigt."
|
||||||
|
|
||||||
sync
|
sync
|
||||||
|
|
||||||
shutdown -r +1 \
|
shutdown -r +1 \
|
||||||
"Proxmox Guest Updater: Neustart nach erfolgreichem Systemupdate"
|
"Proxmox Guest Updater: Neustart nach erfolgreichem Systemupdate"
|
||||||
|
else
|
||||||
|
HOST_REBOOT_SCHEDULED="no"
|
||||||
|
MAIL_STATUS_DETAIL="Host-Neustart erforderlich, aber wegen eines laufenden Proxmox-Backups zurückgestellt."
|
||||||
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
# Kein automatischer Host-Neustart: notwendige Gast-Neustarts jetzt
|
# Kein automatischer Host-Neustart: notwendige Gast-Neustarts jetzt
|
||||||
|
|||||||
Reference in new issue
Block a user