This commit is contained in:
sharky committed 2026-10-04 16:50:22 +02:00
1 parent 992667ced0
commit c11e5e6c94
1 file changed
+98 -8
+98 -8
View File
@@ -20,10 +20,10 @@ APT_LOCK_TIMEOUT="${APT_LOCK_TIMEOUT:-600}"
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
NOTIFY_TARGET="${NOTIFY_TARGET:-iCloud-SMTP}" NOTIFY_TARGET="${NOTIFY_TARGET:-}"
NOTIFY_MATCHER="${NOTIFY_MATCHER:-proxmox-updater}" NOTIFY_MATCHER="${NOTIFY_MATCHER:-proxmox-updater}"
NOTIFY_TEMPLATE="${NOTIFY_TEMPLATE:-proxmox-updater}" NOTIFY_TEMPLATE="${NOTIFY_TEMPLATE:-proxmox-updater}"
NOTIFY_ENABLED="${NOTIFY_ENABLED:-yes}" NOTIFY_ENABLED="${NOTIFY_ENABLED:-no}"
MODE="update" MODE="update"
ONLY_CT="" ONLY_CT=""
@@ -42,11 +42,13 @@ LXC_REBOOT_PENDING=()
VM_REBOOT_PENDING=() VM_REBOOT_PENDING=()
LXC_OK=0 LXC_OK=0
LXC_CURRENT=0
LXC_FAILED=0 LXC_FAILED=0
LXC_SKIPPED=0 LXC_SKIPPED=0
LXC_CHECKED=0 LXC_CHECKED=0
VM_OK=0 VM_OK=0
VM_CURRENT=0
VM_FAILED=0 VM_FAILED=0
VM_SKIPPED=0 VM_SKIPPED=0
VM_CHECKED=0 VM_CHECKED=0
@@ -72,6 +74,11 @@ log() {
ensure_notification_setup() { ensure_notification_setup() {
[[ "$NOTIFY_ENABLED" == "yes" ]] || return 0 [[ "$NOTIFY_ENABLED" == "yes" ]] || return 0
if [[ -z "$NOTIFY_TARGET" ]]; then
log "WARNUNG: Benachrichtigungen aktiviert, aber kein Proxmox-Target konfiguriert; keine Mail."
return 1
fi
# Das konfigurierte Proxmox-Target muss existieren. # Das konfigurierte Proxmox-Target muss existieren.
if ! pvesh get /cluster/notifications/targets --output-format json 2>/dev/null | if ! pvesh get /cluster/notifications/targets --output-format json 2>/dev/null |
grep -Fq "\"name\":\"$NOTIFY_TARGET\"" grep -Fq "\"name\":\"$NOTIFY_TARGET\""
@@ -147,12 +154,14 @@ Host:
Reboot geplant: $HOST_REBOOT_SCHEDULED Reboot geplant: $HOST_REBOOT_SCHEDULED
LXC: LXC:
Erfolgreich: $LXC_OK Aktualisiert: $LXC_OK
Bereits aktuell: $LXC_CURRENT
Fehlgeschlagen: $LXC_FAILED Fehlgeschlagen: $LXC_FAILED
Übersprungen: $LXC_SKIPPED Übersprungen: $LXC_SKIPPED
VM: VM:
Erfolgreich: $VM_OK Aktualisiert: $VM_OK
Bereits aktuell: $VM_CURRENT
Fehlgeschlagen: $VM_FAILED Fehlgeschlagen: $VM_FAILED
Übersprungen: $VM_SKIPPED Übersprungen: $VM_SKIPPED
@@ -569,6 +578,43 @@ update_lxc() {
return return
fi fi
local simulation
local upgraded=0
local installed=0
local removed=0
if ! simulation="$(pct exec "$id" -- bash -lc 'LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get -s full-upgrade' 2>&1)"; then
printf '%s\n' "$simulation"
log "CT $id ($name): full-upgrade Simulation FEHLER."
LXC_FAILED=$((LXC_FAILED + 1))
ERRORS=$((ERRORS + 1))
if [[ "$started_by_us" == "yes" ]]; then
pct shutdown "$id" --timeout 60 || pct stop "$id"
fi
return
fi
upgraded="$(printf '%s\n' "$simulation" | sed -nE 's/^([0-9]+) upgraded, ([0-9]+) newly installed, ([0-9]+) to remove.*/\1/p' | tail -n1)"
installed="$(printf '%s\n' "$simulation" | sed -nE 's/^([0-9]+) upgraded, ([0-9]+) newly installed, ([0-9]+) to remove.*/\2/p' | tail -n1)"
removed="$(printf '%s\n' "$simulation" | sed -nE 's/^([0-9]+) upgraded, ([0-9]+) newly installed, ([0-9]+) to remove.*/\3/p' | tail -n1)"
if [[ -z "$upgraded" || -z "$installed" || -z "$removed" ]]; then
log "CT $id ($name): Simulation konnte nicht ausgewertet werden."
LXC_FAILED=$((LXC_FAILED + 1))
ERRORS=$((ERRORS + 1))
if [[ "$started_by_us" == "yes" ]]; then
pct shutdown "$id" --timeout 60 || pct stop "$id"
fi
return
fi
if (( upgraded == 0 && installed == 0 && removed == 0 )); then
log "CT $id ($name): bereits aktuell."
LXC_CURRENT=$((LXC_CURRENT + 1))
else
log "CT $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)."
if ! pct exec "$id" -- bash -lc \ if ! pct exec "$id" -- bash -lc \
'DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" full-upgrade' 'DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" full-upgrade'
then then
@@ -579,7 +625,6 @@ update_lxc() {
if [[ "$started_by_us" == "yes" ]]; then if [[ "$started_by_us" == "yes" ]]; then
pct shutdown "$id" --timeout 60 || pct stop "$id" pct shutdown "$id" --timeout 60 || pct stop "$id"
fi fi
return return
fi fi
@@ -591,6 +636,7 @@ update_lxc() {
fi fi
LXC_OK=$((LXC_OK + 1)) LXC_OK=$((LXC_OK + 1))
fi
if [[ "$started_by_us" == "yes" ]]; then if [[ "$started_by_us" == "yes" ]]; then
log "CT $id ($name): war vorher gestoppt -> wird wieder heruntergefahren." log "CT $id ($name): war vorher gestoppt -> wird wieder heruntergefahren."
@@ -834,6 +880,48 @@ update_vm() {
return return
fi fi
local simulation
local sim_rc
local upgraded=0
local installed=0
local removed=0
simulation="$(qm guest exec "$id" -- bash -lc \
'LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get -s full-upgrade | tail -n1' 2>&1)"
sim_rc=$?
if (( sim_rc != 0 )) || ! printf '%s\n' "$simulation" | grep -Eq '"exitcode"[[:space:]]*:[[:space:]]*0'; then
printf '%s\n' "$simulation"
log "VM $id ($name): full-upgrade Simulation FEHLER."
VM_FAILED=$((VM_FAILED + 1))
ERRORS=$((ERRORS + 1))
if [[ "$started_by_us" == "yes" ]]; then
qm shutdown "$id" --timeout 60 || qm stop "$id"
fi
return
fi
upgraded="$(printf '%s\n' "$simulation" | sed -nE 's/.*out-data"[[:space:]]*:[[:space:]]*"([0-9]+) upgraded, ([0-9]+) newly installed, ([0-9]+) to remove.*/\1/p' | head -n1)"
installed="$(printf '%s\n' "$simulation" | sed -nE 's/.*out-data"[[:space:]]*:[[:space:]]*"([0-9]+) upgraded, ([0-9]+) newly installed, ([0-9]+) to remove.*/\2/p' | head -n1)"
removed="$(printf '%s\n' "$simulation" | sed -nE 's/.*out-data"[[:space:]]*:[[:space:]]*"([0-9]+) upgraded, ([0-9]+) newly installed, ([0-9]+) to remove.*/\3/p' | head -n1)"
if [[ -z "$upgraded" || -z "$installed" || -z "$removed" ]]; then
printf '%s\n' "$simulation"
log "VM $id ($name): Simulation konnte nicht ausgewertet werden."
VM_FAILED=$((VM_FAILED + 1))
ERRORS=$((ERRORS + 1))
if [[ "$started_by_us" == "yes" ]]; then
qm shutdown "$id" --timeout 60 || qm stop "$id"
fi
return
fi
if (( upgraded == 0 && installed == 0 && removed == 0 )); then
log "VM $id ($name): bereits aktuell."
VM_CURRENT=$((VM_CURRENT + 1))
else
log "VM $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)."
if ! vm_exec "$id" \ if ! vm_exec "$id" \
'DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" full-upgrade' 'DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" full-upgrade'
then then
@@ -844,7 +932,6 @@ update_vm() {
if [[ "$started_by_us" == "yes" ]]; then if [[ "$started_by_us" == "yes" ]]; then
qm shutdown "$id" --timeout 60 || qm stop "$id" qm shutdown "$id" --timeout 60 || qm stop "$id"
fi fi
return return
fi fi
@@ -856,6 +943,7 @@ update_vm() {
fi fi
VM_OK=$((VM_OK + 1)) VM_OK=$((VM_OK + 1))
fi
if [[ "$started_by_us" == "yes" ]]; then if [[ "$started_by_us" == "yes" ]]; then
log "VM $id ($name): war vorher gestoppt -> wird wieder heruntergefahren." log "VM $id ($name): war vorher gestoppt -> wird wieder heruntergefahren."
@@ -1031,11 +1119,13 @@ if [[ "$MODE" == "check" ]]; then
log "VM fehlgeschlagen: $VM_FAILED" log "VM fehlgeschlagen: $VM_FAILED"
log "VM übersprungen: $VM_SKIPPED" log "VM übersprungen: $VM_SKIPPED"
else else
log "LXC erfolgreich: $LXC_OK" log "LXC aktualisiert: $LXC_OK"
log "LXC bereits aktuell: $LXC_CURRENT"
log "LXC fehlgeschlagen: $LXC_FAILED" log "LXC fehlgeschlagen: $LXC_FAILED"
log "LXC übersprungen: $LXC_SKIPPED" log "LXC übersprungen: $LXC_SKIPPED"
log "" log ""
log "VM erfolgreich: $VM_OK" log "VM aktualisiert: $VM_OK"
log "VM bereits aktuell: $VM_CURRENT"
log "VM fehlgeschlagen: $VM_FAILED" log "VM fehlgeschlagen: $VM_FAILED"
log "VM übersprungen: $VM_SKIPPED" log "VM übersprungen: $VM_SKIPPED"
fi fi