diff --git a/monitoring/scripts/homelab-audit.sh b/monitoring/scripts/homelab-audit.sh index 92d4609..7a247e1 100755 --- a/monitoring/scripts/homelab-audit.sh +++ b/monitoring/scripts/homelab-audit.sh @@ -5,7 +5,7 @@ # to collect system metrics, then generates a summary report. # # Usage: -# homelab-audit.sh [--output-dir DIR] +# homelab-audit.sh [--output-dir DIR] [--hosts label:ip,label:ip,...] # # Environment overrides: # STUCK_PROC_CPU_WARN CPU% at which a D-state process is flagged (default: 10) @@ -45,7 +45,7 @@ while [[ $# -gt 0 ]]; do ;; --hosts) if [[ $# -lt 2 ]]; then - echo "Error: --hosts requires an argument" >&2 + echo "Error: --hosts requires an argument (label:ip,label:ip,...)" >&2 exit 1 fi HOSTS_FILTER="$2" @@ -493,20 +493,24 @@ main() { if [[ -n "$HOSTS_FILTER" ]]; then # --hosts mode: audit specified hosts directly, skip Proxmox inventory + # Accepts comma-separated entries; each entry may be plain hostname or label:ip local check_proxmox=0 IFS=',' read -ra filter_hosts <<<"$HOSTS_FILTER" - for host in "${filter_hosts[@]}"; do - [[ "$host" == "proxmox" ]] && check_proxmox=1 + for entry in "${filter_hosts[@]}"; do + local label="${entry%%:*}" + [[ "$label" == "proxmox" ]] && check_proxmox=1 done if ((check_proxmox)); then echo " Checking Proxmox backup recency..." check_backup_recency fi - for host in "${filter_hosts[@]}"; do - echo " Auditing $host..." - parse_and_report "$host" "$host" - check_cert_expiry "$host" "$host" - AUDITED_HOSTS+=("$host") + for entry in "${filter_hosts[@]}"; do + local label="${entry%%:*}" + local addr="${entry#*:}" + echo " Auditing $label ($addr)..." + parse_and_report "$label" "$addr" + check_cert_expiry "$label" "$addr" + AUDITED_HOSTS+=("$label") ((host_count++)) || true done else diff --git a/monitoring/scripts/test-audit-collectors.sh b/monitoring/scripts/test-audit-collectors.sh index 149aa98..ef37103 100644 --- a/monitoring/scripts/test-audit-collectors.sh +++ b/monitoring/scripts/test-audit-collectors.sh @@ -93,6 +93,34 @@ else fail "disk_usage" "expected 'N /path', got: '$result'" fi +# --- --hosts flag parsing --- +echo "" +echo "=== --hosts argument parsing tests ===" + +# Single host +input="vm-115:10.10.0.88" +IFS=',' read -ra entries <<<"$input" +label="${entries[0]%%:*}" +addr="${entries[0]#*:}" +if [[ "$label" == "vm-115" && "$addr" == "10.10.0.88" ]]; then + pass "--hosts single entry parsed: $label $addr" +else + fail "--hosts single" "expected 'vm-115 10.10.0.88', got: '$label $addr'" +fi + +# Multiple hosts +input="vm-115:10.10.0.88,lxc-225:10.10.0.225" +IFS=',' read -ra entries <<<"$input" +label1="${entries[0]%%:*}" +addr1="${entries[0]#*:}" +label2="${entries[1]%%:*}" +addr2="${entries[1]#*:}" +if [[ "$label1" == "vm-115" && "$addr1" == "10.10.0.88" && "$label2" == "lxc-225" && "$addr2" == "10.10.0.225" ]]; then + pass "--hosts multi entry parsed: $label1 $addr1, $label2 $addr2" +else + fail "--hosts multi" "unexpected parse result" +fi + echo "" echo "=== Results: $PASS passed, $FAIL failed ===" ((FAIL == 0)) diff --git a/server-configs/proxmox/qemu/115.conf b/server-configs/proxmox/qemu/115.conf index 6474b44..4cf45c7 100644 --- a/server-configs/proxmox/qemu/115.conf +++ b/server-configs/proxmox/qemu/115.conf @@ -12,5 +12,5 @@ ostype: l26 scsi0: local-lvm:vm-115-disk-0,size=256G scsihw: virtio-scsi-pci smbios1: uuid=19be98ee-f60d-473d-acd2-9164717fcd11 -sockets: 2 +sockets: 1 vmgenid: 682dfeab-8c63-4f0b-8ed2-8828c2f808ef