V23
This commit is contained in:
1 parent
7f8577b70b
commit
e2e6bba06a
1 file changed
+40
-3
+40
-3
@@ -208,7 +208,22 @@ guest_failed() {
|
|||||||
add_guest_result() {
|
add_guest_result() {
|
||||||
local type="$1" id="$2" name="$3" status="$4"
|
local type="$1" id="$2" name="$3" status="$4"
|
||||||
local line="$id ($name): $status"
|
local line="$id ($name): $status"
|
||||||
if [[ "$type" == "LXC" ]]; then LXC_RESULT_DETAILS+=("$line"); else VM_RESULT_DETAILS+=("$line"); fi
|
local -a out=()
|
||||||
|
local entry
|
||||||
|
|
||||||
|
if [[ "$type" == "LXC" ]]; then
|
||||||
|
for entry in "${LXC_RESULT_DETAILS[@]}"; do
|
||||||
|
[[ "${entry%%:*}" == "$id ($name)" ]] || out+=("$entry")
|
||||||
|
done
|
||||||
|
out+=("$line")
|
||||||
|
LXC_RESULT_DETAILS=("${out[@]}")
|
||||||
|
else
|
||||||
|
for entry in "${VM_RESULT_DETAILS[@]}"; do
|
||||||
|
[[ "${entry%%:*}" == "$id ($name)" ]] || out+=("$entry")
|
||||||
|
done
|
||||||
|
out+=("$line")
|
||||||
|
VM_RESULT_DETAILS=("${out[@]}")
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
proxmox_backup_running() {
|
proxmox_backup_running() {
|
||||||
@@ -308,8 +323,6 @@ collect_guest_result_details() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
send_update_notification() {
|
send_update_notification() {
|
||||||
collect_guest_result_details
|
|
||||||
|
|
||||||
local lxc_detail_text="Keine"
|
local lxc_detail_text="Keine"
|
||||||
local vm_detail_text="Keine"
|
local vm_detail_text="Keine"
|
||||||
local guest_line
|
local guest_line
|
||||||
@@ -770,6 +783,7 @@ update_lxc() {
|
|||||||
if is_excluded "$id"; then
|
if is_excluded "$id"; then
|
||||||
log "CT $id ($name): ausgeschlossen."
|
log "CT $id ($name): ausgeschlossen."
|
||||||
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "übersprungen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -777,6 +791,7 @@ update_lxc() {
|
|||||||
if [[ "$UPDATE_STOPPED" != "yes" ]]; then
|
if [[ "$UPDATE_STOPPED" != "yes" ]]; then
|
||||||
log "CT $id ($name): gestoppt -> übersprungen."
|
log "CT $id ($name): gestoppt -> übersprungen."
|
||||||
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "übersprungen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -786,6 +801,7 @@ update_lxc() {
|
|||||||
log "CT $id ($name): Start fehlgeschlagen."
|
log "CT $id ($name): Start fehlgeschlagen."
|
||||||
mark_guest_failed "LXC" "$id"
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@@ -802,6 +818,7 @@ update_lxc() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "übersprungen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -814,6 +831,7 @@ update_lxc() {
|
|||||||
add_error "CT $id ($name): apt-get update fehlgeschlagen"
|
add_error "CT $id ($name): apt-get update fehlgeschlagen"
|
||||||
mark_guest_failed "LXC" "$id"
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -834,6 +852,7 @@ update_lxc() {
|
|||||||
add_error "CT $id ($name): upgrade Simulation fehlgeschlagen"
|
add_error "CT $id ($name): upgrade Simulation fehlgeschlagen"
|
||||||
mark_guest_failed "LXC" "$id"
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -851,6 +870,7 @@ update_lxc() {
|
|||||||
add_error "CT $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
add_error "CT $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
||||||
mark_guest_failed "LXC" "$id"
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
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"
|
||||||
@@ -861,6 +881,7 @@ update_lxc() {
|
|||||||
if (( upgraded == 0 && installed == 0 && removed == 0 )); then
|
if (( upgraded == 0 && installed == 0 && removed == 0 )); then
|
||||||
log "CT $id ($name): bereits aktuell."
|
log "CT $id ($name): bereits aktuell."
|
||||||
LXC_CURRENT=$((LXC_CURRENT + 1))
|
LXC_CURRENT=$((LXC_CURRENT + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "bereits aktuell"
|
||||||
else
|
else
|
||||||
log "CT $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)."
|
log "CT $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)."
|
||||||
|
|
||||||
@@ -871,6 +892,7 @@ update_lxc() {
|
|||||||
add_error "CT $id ($name): upgrade fehlgeschlagen"
|
add_error "CT $id ($name): upgrade fehlgeschlagen"
|
||||||
mark_guest_failed "LXC" "$id"
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -900,6 +922,7 @@ update_lxc() {
|
|||||||
LXC_OK=$((LXC_OK - 1))
|
LXC_OK=$((LXC_OK - 1))
|
||||||
mark_guest_failed "LXC" "$id"
|
mark_guest_failed "LXC" "$id"
|
||||||
LXC_FAILED=$((LXC_FAILED + 1))
|
LXC_FAILED=$((LXC_FAILED + 1))
|
||||||
|
add_guest_result "LXC" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -1043,6 +1066,7 @@ update_vm() {
|
|||||||
if is_excluded "$id"; then
|
if is_excluded "$id"; then
|
||||||
log "VM $id ($name): ausgeschlossen."
|
log "VM $id ($name): ausgeschlossen."
|
||||||
VM_SKIPPED=$((VM_SKIPPED + 1))
|
VM_SKIPPED=$((VM_SKIPPED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "übersprungen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1055,6 +1079,7 @@ update_vm() {
|
|||||||
win10|win11|win7|win8|wvista|wxp|w2k|w2k3|w2k8)
|
win10|win11|win7|win8|wvista|wxp|w2k|w2k3|w2k8)
|
||||||
log "VM $id ($name): Windows-VM -> übersprungen."
|
log "VM $id ($name): Windows-VM -> übersprungen."
|
||||||
VM_SKIPPED=$((VM_SKIPPED + 1))
|
VM_SKIPPED=$((VM_SKIPPED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "übersprungen"
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -1063,6 +1088,7 @@ update_vm() {
|
|||||||
if [[ "$UPDATE_STOPPED" != "yes" ]]; then
|
if [[ "$UPDATE_STOPPED" != "yes" ]]; then
|
||||||
log "VM $id ($name): gestoppt -> übersprungen."
|
log "VM $id ($name): gestoppt -> übersprungen."
|
||||||
VM_SKIPPED=$((VM_SKIPPED + 1))
|
VM_SKIPPED=$((VM_SKIPPED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "übersprungen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1072,6 +1098,7 @@ update_vm() {
|
|||||||
log "VM $id ($name): Start fehlgeschlagen."
|
log "VM $id ($name): Start fehlgeschlagen."
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@@ -1090,6 +1117,7 @@ update_vm() {
|
|||||||
|
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@@ -1107,6 +1135,7 @@ update_vm() {
|
|||||||
|
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@@ -1120,6 +1149,7 @@ update_vm() {
|
|||||||
|
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@@ -1132,6 +1162,7 @@ update_vm() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
VM_SKIPPED=$((VM_SKIPPED + 1))
|
VM_SKIPPED=$((VM_SKIPPED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "übersprungen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1144,6 +1175,7 @@ update_vm() {
|
|||||||
add_error "VM $id ($name): apt-get update fehlgeschlagen"
|
add_error "VM $id ($name): apt-get update fehlgeschlagen"
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -1181,6 +1213,7 @@ update_vm() {
|
|||||||
add_error "VM $id ($name): upgrade Simulation fehlgeschlagen"
|
add_error "VM $id ($name): upgrade Simulation fehlgeschlagen"
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
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"
|
||||||
@@ -1206,6 +1239,7 @@ update_vm() {
|
|||||||
add_error "VM $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
add_error "VM $id ($name): upgrade Simulation konnte nicht ausgewertet werden"
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
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"
|
||||||
@@ -1218,6 +1252,7 @@ update_vm() {
|
|||||||
if (( upgraded == 0 && installed == 0 && removed == 0 )); then
|
if (( upgraded == 0 && installed == 0 && removed == 0 )); then
|
||||||
log "VM $id ($name): bereits aktuell."
|
log "VM $id ($name): bereits aktuell."
|
||||||
VM_CURRENT=$((VM_CURRENT + 1))
|
VM_CURRENT=$((VM_CURRENT + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "bereits aktuell"
|
||||||
else
|
else
|
||||||
log "VM $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)."
|
log "VM $id ($name): $upgraded Upgrade(s), $installed Neuinstallation(en), $removed Entfernung(en)."
|
||||||
|
|
||||||
@@ -1228,6 +1263,7 @@ update_vm() {
|
|||||||
add_error "VM $id ($name): upgrade fehlgeschlagen"
|
add_error "VM $id ($name): upgrade fehlgeschlagen"
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
|
|
||||||
if [[ "$started_by_us" == "yes" ]]; then
|
if [[ "$started_by_us" == "yes" ]]; then
|
||||||
@@ -1257,6 +1293,7 @@ update_vm() {
|
|||||||
VM_OK=$((VM_OK - 1))
|
VM_OK=$((VM_OK - 1))
|
||||||
mark_guest_failed "VM" "$id"
|
mark_guest_failed "VM" "$id"
|
||||||
VM_FAILED=$((VM_FAILED + 1))
|
VM_FAILED=$((VM_FAILED + 1))
|
||||||
|
add_guest_result "VM" "$id" "$name" "fehlgeschlagen"
|
||||||
ERRORS=$((ERRORS + 1))
|
ERRORS=$((ERRORS + 1))
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in new issue
Block a user