aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Guégan <loic.guegan@mailbox.org>2024-07-05 17:23:29 +0200
committerLoïc Guégan <loic.guegan@mailbox.org>2024-07-05 17:23:29 +0200
commitdd033631cd58638d42fda46763e936a8d224d830 (patch)
treee12202ed3c8db3aa52b1e50561240a3ae18b02ac
parentaf6c739f85f4ca89de0c57fddd3d75aaea0e80b3 (diff)
Minor changes
-rwxr-xr-xsysdump.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/sysdump.sh b/sysdump.sh
index ae3090c..c0a39d9 100755
--- a/sysdump.sh
+++ b/sysdump.sh
@@ -196,6 +196,8 @@ then
CPU_INFO=$(cat "$file"|jq -r '.["/proc/cpuinfo"]'|base64 -d)
MEM_INFO=$(cat "$file"|jq -r '.["/proc/meminfo"]'|base64 -d)
PING_SUCCESS_COUNT=$(cat "$file"|jq -r '.["ping"]'|base64 -d|grep "packet loss"|cut -d, -f 2|awk '{print $1+0}')
+ IPADDR=$(cat "$file"|jq -r '.["ipaddr"]'|base64 -d)
+ INFO_DISKS=$(cat "$file"|jq -r '.["df"]'|base64 -d)
# Extract infos
INFO_OS_NAME=$(echo "$OS_RELEASE"|grep "^NAME=" | cut -d'"' -f 2)
@@ -206,18 +208,20 @@ then
INFO_CPU_CORE_N_VIRT=$(echo "$CPU_INFO"|grep -c ^processor /proc/cpuinfo)
[ "$INFO_CPU_CORE_N_PHY" -eq "$INFO_CPU_CORE_N_VIRT" ] && INFO_CPU_HYPERTHREADING="off" || INFO_CPU_HYPERTHREADING="on"
[ $PING_SUCCESS_COUNT -gt 0 ] && INFO_OTHER_NETWORK="on" || INFO_OTHER_NETWORK="off"
- INFO_INET4=$(cat "$file"|jq -r '.["ipaddr"]'|base64 -d|awk '/inet /{printf $2", "}'| sed 's/..$//')
- INFO_INET6=$(cat "$file"|jq -r '.["ipaddr"]'|base64 -d|awk '/inet6 /{printf $2", "}'| sed 's/..$//')
+ INFO_INET4=$(echo "$IPADDR"|awk '/inet /{printf $2", "}'| sed 's/..$//')
+ INFO_INET6=$(echo "$IPADDR"|awk '/inet6 /{printf $2", "}'| sed 's/..$//')
INFO_MEM_TOTAL=$(echo "$MEM_INFO"|awk '/MemTotal/{print $2/1000" MB"}')
INFO_MEM_FREE=$(echo "$MEM_INFO"|awk '/MemFree/{print $2/1000" MB"}')
INFO_MEM_SWAP_TOTAL=$(echo "$MEM_INFO"|awk '/SwapTotal/{print $2/1000" MB"}')
INFO_MEM_SWAP_FREE=$(echo "$MEM_INFO"|awk '/SwapFree/{print $2/1000" MB"}')
+ INFO_UPTIME=$(cat "$file"|jq -r '.["uptime"]'|base64 -d|cut -d, -f 1|awk '{$1=$1};1')
# Print Information
echo "====> System <===="
echo "OS Name: ${INFO_OS_NAME}"
echo "OS Version: ${INFO_OS_VERSION}"
echo "Hostname: ${INFO_HOSTNAME}"
+ echo "Uptime: ${INFO_UPTIME}"
echo
echo "====> CPU <===="
echo "Model: ${INFO_CPU_MODEL}"
@@ -235,5 +239,8 @@ then
echo "Network State: ${INFO_OTHER_NETWORK}"
echo "IPv4: ${INFO_INET4}"
echo "IPv6: ${INFO_INET6}"
+ echo
+ echo "====> Disk <===="
+ echo "${INFO_DISKS}"
fi