From 8a99c356bc2c7675809b8481d60acc4c68c129a8 Mon Sep 17 00:00:00 2001 From: CREATIVE_tg1 Date: Wed, 15 Apr 2026 11:16:18 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20server/motd-info.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/motd-info.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/motd-info.sh b/server/motd-info.sh index d3e462a..1d8cae9 100644 --- a/server/motd-info.sh +++ b/server/motd-info.sh @@ -1,5 +1,6 @@ #!/bin/bash +# Скрипт установки кастомного sysinfo MOTD TARGET_PATH="/etc/update-motd.d/zzzzz-motd-sysinfo" cat > "$TARGET_PATH" <<"EOF" @@ -9,7 +10,6 @@ RED="\033[0;31m" GREEN="\033[0;32m" YELLOW="\033[1;33m" BLUE="\033[1;34m" -CYAN="\033[0;36m" RESET="\033[0m" # ---------------------------- @@ -22,13 +22,13 @@ MEM_TOTAL=$(free -m | awk '/^Mem:/{print $2}') MEM_PERCENT=$(( MEM_USED * 100 / MEM_TOTAL )) MEM_STAT="${MEM_USED}/${MEM_TOTAL} МБ (${MEM_PERCENT}%)" -# Нагрузка: считаем как процент относительно количества ядер +# Нагрузка: проценты относительно всех ядер (Windows-стиль) CPU_CORES=$(nproc) read LOAD1 LOAD5 LOAD15 < /proc/loadavg LOAD1P=$(( $(awk "BEGIN {printf \"%.0f\", $LOAD1/$CPU_CORES*100}") )) LOAD5P=$(( $(awk "BEGIN {printf \"%.0f\", $LOAD5/$CPU_CORES*100}") )) LOAD15P=$(( $(awk "BEGIN {printf \"%.0f\", $LOAD15/$CPU_CORES*100}") )) -LOAD_AVG="${LOAD1} ${LOAD5} ${LOAD15} (${LOAD1P}% ${LOAD5P}% ${LOAD15P}% от всех ядер)" +LOAD_AVG="${LOAD1P}% ${LOAD5P}% ${LOAD15P}% (1мин 5мин 15мин)" # CPU температура if command -v sensors &>/dev/null && sensors | grep -iP "Core|temp1" >/dev/null; then @@ -85,7 +85,7 @@ RECENT_LOG=$(get_recent_logs) # 1. Неудачные попытки FAILED_IPS=$(echo "$RECENT_LOG" | grep "Failed " | awk '{for(i=1;i