github-mirror/project-nomad
1
0
Fork 0
mirror of https://github.com/Crosstalk-Solutions/project-nomad.git synced 2026-03-28 03:29:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: fix collect-disk-info output

Browse Source
This commit is contained in:
Jake Turner 2026-03-15 00:51:32 +00:00 committed by Jake Turner
parent a4e6a9bd9f
commit fb05ab53e2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install/sidecar-disk-collector/collect-disk-info.sh
View File

@ -12,16 +12,27 @@ log() {
log "disk-collector sidecar starting..." log "disk-collector sidecar starting..."
# Write a valid placeholder immediately so admin has something to parse if the
# file is missing (first install, user deleted it, etc.). The real data from the
# first full collection cycle below will overwrite this within seconds.
if [[ ! -f /storage/nomad-disk-info.json ]]; then
echo '{"diskLayout":{"blockdevices":[]},"fsSize":[]}' > /storage/nomad-disk-info.json
log "Created initial placeholder — will be replaced after first collection."
fi
while true; do while true; do
# Get disk layout # Get disk layout (-b outputs SIZE in bytes as a number rather than a human-readable string)
DISK_LAYOUT=$(lsblk --sysroot /host --json -o NAME,SIZE,TYPE,MODEL,SERIAL,VENDOR,ROTA,TRAN 2>/dev/null) DISK_LAYOUT=$(lsblk --sysroot /host --json -b -o NAME,SIZE,TYPE,MODEL,SERIAL,VENDOR,ROTA,TRAN 2>/dev/null)
if [[ -z "$DISK_LAYOUT" ]]; then if [[ -z "$DISK_LAYOUT" ]]; then
log "WARNING: lsblk --sysroot /host failed, using empty block devices" log "WARNING: lsblk --sysroot /host failed, using empty block devices"
DISK_LAYOUT='{"blockdevices":[]}' DISK_LAYOUT='{"blockdevices":[]}'
fi fi
# Get filesystem usage by parsing /host/proc/mounts and running df on each mountpoint # Get filesystem usage by parsing /host/proc/1/mounts (PID 1 = host init = root mount namespace)
# /host/proc/mounts is a symlink to /proc/self/mounts, which always reflects the CURRENT
# process's mount namespace (the container's), not the host's. /proc/1/mounts reflects the
# host init process's namespace, giving us the true host mount table.
FS_JSON="[" FS_JSON="["
FIRST=1 FIRST=1
while IFS=' ' read -r dev mountpoint fstype opts _rest; do while IFS=' ' read -r dev mountpoint fstype opts _rest; do
@ -38,7 +49,7 @@ while true; do
[[ "$FIRST" -eq 0 ]] && FS_JSON+="," [[ "$FIRST" -eq 0 ]] && FS_JSON+=","
FS_JSON+="{\"fs\":\"${dev}\",\"size\":${size},\"used\":${used},\"available\":${avail},\"use\":${pct},\"mount\":\"${mountpoint}\"}" FS_JSON+="{\"fs\":\"${dev}\",\"size\":${size},\"used\":${used},\"available\":${avail},\"use\":${pct},\"mount\":\"${mountpoint}\"}"
FIRST=0 FIRST=0
done < /host/proc/mounts done < /host/proc/1/mounts
FS_JSON+="]" FS_JSON+="]"
# Use a tmp file for atomic update # Use a tmp file for atomic update