V24
This commit is contained in:
1 parent
3ee6479320
commit
14d5b9e2f0
1 file changed
+22
-14
+22
-14
@@ -322,6 +322,14 @@ collect_guest_result_details() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
de_ja_nein() {
|
||||||
|
case "$1" in
|
||||||
|
yes) echo "Ja" ;;
|
||||||
|
no) echo "Nein" ;;
|
||||||
|
*) echo "$1" ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
send_update_notification() {
|
send_update_notification() {
|
||||||
local lxc_detail_text="Keine"
|
local lxc_detail_text="Keine"
|
||||||
local vm_detail_text="Keine"
|
local vm_detail_text="Keine"
|
||||||
@@ -384,14 +392,14 @@ Host: $(hostname)
|
|||||||
Zeit: $(date '+%d.%m.%Y %H:%M:%S')
|
Zeit: $(date '+%d.%m.%Y %H:%M:%S')
|
||||||
|
|
||||||
Host:
|
Host:
|
||||||
Prüfung/Update erfolgreich: $HOST_OK
|
Prüfung/Update erfolgreich: $(de_ja_nein "$HOST_OK")
|
||||||
Pakete aktualisiert: $HOST_UPDATED
|
Pakete aktualisiert: $(de_ja_nein "$HOST_UPDATED")
|
||||||
Reboot erforderlich: $HOST_REBOOT_REQUIRED
|
Neustart erforderlich: $(de_ja_nein "$HOST_REBOOT_REQUIRED")
|
||||||
Reboot geplant: $HOST_REBOOT_SCHEDULED
|
Neustart geplant: $(de_ja_nein "$HOST_REBOOT_SCHEDULED")
|
||||||
|
|
||||||
Backup-Schutz:
|
Backup-Schutz:
|
||||||
Auf laufendes Proxmox-Backup gewartet: $BACKUP_WAITED
|
Auf laufendes Proxmox-Backup gewartet: $(de_ja_nein "$BACKUP_WAITED")
|
||||||
Neustart wegen laufendem Backup zurückgestellt: $REBOOT_BLOCKED_BY_BACKUP
|
Neustart wegen laufendem Backup zurückgestellt: $(de_ja_nein "$REBOOT_BLOCKED_BY_BACKUP")
|
||||||
|
|
||||||
LXC:
|
LXC:
|
||||||
Aktualisiert: $LXC_OK
|
Aktualisiert: $LXC_OK
|
||||||
@@ -783,7 +791,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"
|
add_guest_result "LXC" "$id" "$name" "übersprungen – ausgeschlossen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -791,7 +799,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"
|
add_guest_result "LXC" "$id" "$name" "übersprungen – ausgeschlossen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -818,7 +826,7 @@ update_lxc() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
LXC_SKIPPED=$((LXC_SKIPPED + 1))
|
||||||
add_guest_result "LXC" "$id" "$name" "übersprungen"
|
add_guest_result "LXC" "$id" "$name" "übersprungen – nicht für automatische Aktualisierung vorgesehen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1066,7 +1074,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"
|
add_guest_result "VM" "$id" "$name" "übersprungen – ausgeschlossen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1079,7 +1087,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"
|
add_guest_result "VM" "$id" "$name" "übersprungen – Windows-VM"
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -1088,7 +1096,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"
|
add_guest_result "VM" "$id" "$name" "übersprungen – Gast ist gestoppt"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1162,7 +1170,7 @@ update_vm() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
VM_SKIPPED=$((VM_SKIPPED + 1))
|
VM_SKIPPED=$((VM_SKIPPED + 1))
|
||||||
add_guest_result "VM" "$id" "$name" "übersprungen"
|
add_guest_result "VM" "$id" "$name" "übersprungen – nicht für automatische Aktualisierung vorgesehen"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1507,7 +1515,7 @@ fi
|
|||||||
log "- $error_detail"
|
log "- $error_detail"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
log "Host Lauf erfolgreich: $HOST_OK"
|
log "Host Lauf erfolgreich: $(de_ja_nein "$HOST_OK")"
|
||||||
log "Host aktualisiert: $HOST_UPDATED"
|
log "Host aktualisiert: $HOST_UPDATED"
|
||||||
log "Host Reboot nötig: $HOST_REBOOT_REQUIRED"
|
log "Host Reboot nötig: $HOST_REBOOT_REQUIRED"
|
||||||
log "============================================================"
|
log "============================================================"
|
||||||
|
|||||||
Reference in new issue
Block a user