Harden the four monitoring scripts
set -euo pipefail across all four, but added deliberately rather than pasted in -- each script needed the places where a non-zero exit is normal handled first, or strict mode would have made them worse: - sys_monitor / process_monitor: `ps | head -n 6` is a latent SIGPIPE. head closes the pipe after six lines, and on a host with enough processes ps fills the buffer and exits 141, which pipefail turns into a script abort -- on exactly the busy machine you wanted to inspect. Confirmed the mechanism (a large producer into head returns 141) and those pipelines now tolerate it. - security_audit: find exits non-zero when it cannot read a directory, which is routine when walking the whole filesystem. Without handling, set -e aborted the audit part way while still looking complete. Also notes that a clean report as non-root means little, since find cannot descend where it may not read. - network_info: iptables needs root, so the last section aborted the script for ordinary users. Now reports the failure, and falls back to nft where iptables is absent. process_monitor also no longer kills on sight. `pkill -x` by name can match several processes at once, and as root that is an easy way to take down more than intended. It now prints what it matched and asks, with FORCE=1 for unattended use and a refusal rather than a hang when there is no tty. All four run clean; the kill path was tested against a live process and left it alive.
This commit is contained in:
+32
-8
@@ -17,24 +17,48 @@
|
||||
#
|
||||
# Usage: process_monitor.sh [kill <process_name|PID>]
|
||||
# Description: Without args, shows top CPU & memory processes. With "kill", terminates process by name or PID.
|
||||
|
||||
if [ "$1" = "kill" ]; then
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ "${1:-}" = "kill" ]; then
|
||||
target="$2"
|
||||
if [ -z "$target" ]; then
|
||||
echo "Usage: $0 kill <process_name|PID>"; exit 1
|
||||
fi
|
||||
# If target is numeric (PID), kill that PID, else kill by name
|
||||
# Show what will be signalled and confirm first. pkill -x by name can
|
||||
# match several processes at once, and as root that is an easy way to
|
||||
# take down more than intended with no warning.
|
||||
if [[ "$target" =~ ^[0-9]+$ ]]; then
|
||||
kill "$target" && echo "Process $target killed." || echo "Failed to kill process $target."
|
||||
if ! ps -p "$target" -o pid,user,comm >/dev/null 2>&1; then
|
||||
echo "No process with PID $target."; exit 1
|
||||
fi
|
||||
ps -p "$target" -o pid,user,comm
|
||||
else
|
||||
# Use pkill to kill by name (match full process name)
|
||||
pkill -x "$target" && echo "Processes named '$target' killed." || echo "No process '$target' found or kill failed."
|
||||
if ! pgrep -x "$target" >/dev/null 2>&1; then
|
||||
echo "No process named '$target'."; exit 1
|
||||
fi
|
||||
pgrep -x -a "$target"
|
||||
fi
|
||||
|
||||
if [ "${FORCE:-}" != "1" ]; then
|
||||
if [ ! -t 0 ]; then
|
||||
echo "Refusing to kill without confirmation; set FORCE=1 for unattended use." >&2
|
||||
exit 1
|
||||
fi
|
||||
read -r -p "Send SIGTERM to the above? (yes/NO): " reply
|
||||
[ "$reply" = "yes" ] || { echo "Cancelled."; exit 0; }
|
||||
fi
|
||||
|
||||
if [[ "$target" =~ ^[0-9]+$ ]]; then
|
||||
kill "$target" && echo "Process $target signalled." || echo "Failed to signal process $target."
|
||||
else
|
||||
pkill -x "$target" && echo "Processes named '$target' signalled." || echo "Failed to signal '$target'."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "==== Top 5 CPU-consuming processes ===="
|
||||
ps -eo pid,user,comm,%cpu --sort=-%cpu | head -n 6
|
||||
ps -eo pid,user,comm,%cpu --sort=-%cpu | head -n 6 || true
|
||||
|
||||
echo -e "\n==== Top 5 Memory-consuming processes ===="
|
||||
ps -eo pid,user,comm,%mem --sort=-%mem | head -n 6
|
||||
ps -eo pid,user,comm,%mem --sort=-%mem | head -n 6 || true
|
||||
|
||||
Reference in New Issue
Block a user