diff --git a/src/modules/admin-servers/admin-servers.service.ts b/src/modules/admin-servers/admin-servers.service.ts index fd3c9f1..dc74dab 100644 --- a/src/modules/admin-servers/admin-servers.service.ts +++ b/src/modules/admin-servers/admin-servers.service.ts @@ -107,9 +107,9 @@ export class AdminServersService { echo "==IP==" && hostname -I | awk '{print \$1}' echo "==LOAD==" && cat /proc/loadavg | awk '{print \$1}' echo "==CORES==" && cat /proc/cpuinfo | grep processor | wc -l -echo "==MEM==" && free -m | awk '/Mem/{printf \"%.1fG,%.1fG,%.1fG,%d\",\$2/1024,\$3/1024,\$4/1024,int(\$3/\$2*100)}' -echo "==DISKROOT==" && df -h / | awk 'NR==2{print \$2\",\"\$3\",\"\$4\",\"int(\$5)}' -echo "==DISKDATA==" && df -h /data 2>/dev/null | awk 'NR==2{print \$2\",\"\$3\",\"\$4\",\"int(\$5)}' +echo "==MEM==" && free -m | awk '/Mem/{printf "%.1fG,%.1fG,%.1fG,%d\n",\$2/1024,\$3/1024,\$4/1024,int(\$3/\$2*100)}' +echo "==DISKROOT==" && df -h / | awk 'NR==2{printf "%s,%s,%s,%d\n",\$2,\$3,\$4,int(\$5)}' +echo "==DISKDATA==" && df -h /data 2>/dev/null | awk 'NR==2{printf "%s,%s,%s,%d\n",\$2,\$3,\$4,int(\$5)}' echo "==UPTIME==" && uptime -p | sed 's/up //' echo "==PROCS==" && ps auxww --sort=-%mem --no-headers 2>/dev/null | head -8`;