Skip to content

fix(monitor-cpu-load): attribute CPU correctly when run from cron #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
locus313 merged 1 commit into from
Oct 10, 2026
Merged

fix(monitor-cpu-load): attribute CPU correctly when run from cron #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion monitor-cpu-load/monitor-cpu-load.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ fi
# MAIN SCRIPT CONFIGURATION
###############################################################################

# Cron's default PATH lacks /usr/sbin and /usr/local/sbin, where plesk and fail2ban-client live
PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
export PATH

EMAIL_TO="${EMAIL_TO:-}"
LOAD_THRESHOLD_FACTOR="${LOAD_THRESHOLD_FACTOR:-1.0}"
WINDOW_MINUTES="${WINDOW_MINUTES:-30}"
Expand Down Expand Up @@ -466,7 +470,7 @@ collect_cpu() {
log_message "WARNING: plesk CLI not found, CPU cannot be attributed to subscriptions"
fi

awk -F'\t' 'FNR == NR { owner[$1] = $2; next }
awk -F'\t' 'FILENAME == ARGV[1] { owner[$1] = $2; next }
{ split($0, f, " "); name = (f[1] in owner) ? owner[f[1]] : f[1]; cpu[name] += f[2]; mapped[name] = (f[1] in owner) }
END { for (k in cpu) printf "%s %.1f %d\n", k, cpu[k], mapped[k] }' \
"${WORK}/login2sub" "${WORK}/proc_user_cpu" | sort -k2,2nr > "${WORK}/sub_cpu"
Expand Down
Loading