Update server_info.sh

server_info.sh

@@ -16,19 +16,34 @@ echo -e "Kernel: "`uname -r`
 echo -e "Architecture: "`arch`
 echo -e "Processor Name: "`awk -F':' '/^model name/ {print $2}' /proc/cpuinfo | uniq | sed -e 's/^[ \t]*//'`
 echo ""
-echo -e "HDD: "`lsblk -dio SIZE,KNAME,MODEL,TYPE | grep disk`
-echo -e "Memory(RAM): "`free -mht| awk '/Mem/{print $2 " |Used: " $3 " |Free: " $4}'`
-echo -e "Swap Memory: "`free -mht| awk '/Swap/{print $2 " |Used: " $3 " |Free: " $4}'`
-echo ""
+
 # echo -e "Operating System: "`hostnamectl | grep "Operating System" | cut -d ' ' -f5-`;
 echo -e "Operating System: "`cat /etc/*release | grep PRETTY_NAME | cut -d "=" -f 2 | tr -d '"'`
 echo -e "Using Systemd: "`pidof systemd && echo "True" || echo "False"`
 echo -e "Hostname: "`hostname`
+echo -e "Uptime: "`uptime | awk '{print $3,$4}' | sed 's/,//'`
 echo ""
+
 # echo -e "Server IP: "`hostname -I`
-echo -e "Server IP: "`/sbin/ip -4 a | grep "inet " | tail -n +2 | awk '{print $7 "=" $2}'`
+echo -e "Server IP: "`/sbin/ip -4 a | grep "inet " | tail -n +2 | awk '{print "["NR"] "$7 "=" $2}'`
 echo -e "Default Gateway: "`ip route show | sed 's/\(\S\+\s\+\)\?default via \(\S\+\).*/\2/p; d'`
-echo -e "Uptime: "`uptime | awk '{print $3,$4}' | sed 's/,//'`
+echo ""
+
+echo -e "HDD: "`lsblk -dio SIZE,KNAME,MODEL,TYPE | grep disk | awk {'print "["NR"] "$0'}`
+echo -e "Memory(RAM): "`free -mht| awk '/Mem/{print $2 " |Used: "$3 " |Free: "$4 " |Available: "$7}'`
+echo -e "Swap Memory: "`free -mht| awk '/Swap/{print $2 " |Used: "$3 " |Free: "$4}'`
+echo ""
+
+#echo -e "Disk Usage: "`df -h --total | grep "/dev/" | grep -v "loop" | grep -v "tmpfs" | sort`
+echo -e "== Disk Usage == "
+df -h --total | grep -v "loop" | grep -v "tmpfs" | grep -v "udev" | while read -r line ; do
+    if grep -q "Filesystem" <<< "$line" || grep -q "total" <<< "$line"; then
+        str="[_] $line"
+        echo "${str/total/Total}"
+    else
+        echo "[+] $line"
+    fi
+done
 echo ""
 
 echo -e "== Base Application =="
@@ -111,18 +126,18 @@ echo ""
 if dpkg --get-selections | grep -E '(^|\s)apache2($|\s)' &> /dev/null ; then
     #echo "== Sites Available ==";
     #echo -e `apache2ctl -S 2>&1 | grep "namevhost" | awk '{print "(" NR ") " $4}'`
-    
+
     SITES=$(echo `apache2ctl -S 2>&1 |grep "sites-en"|cut -d"/" -f5|cut -d ":" -f1|rev|cut -d"." -f2-|rev|grep -v "default"|uniq -u|sort`)
     if [ ! -z "$SITES" ] ; then
         echo "== Sites Available (Apache) ==";
-    
+
         SITES_CNT=1
         for SITE in $SITES
         do
             if curl -I -m 10 "$SITE" 2>&1 | grep -w "200\|301" > /dev/null ; then
-                echo "$SITES_CNT $SITE is up"
+                echo "[$SITES_CNT] $SITE is up"
             else
-                echo "$SITES_CNT $SITE is down"
+                echo "[$SITES_CNT] $SITE is down"
             fi
             SITES_CNT=$[$SITES_CNT +1]
         done
@@ -134,14 +149,14 @@ if dpkg --get-selections | grep -E '(^|\s)nginx($|\s)' &> /dev/null ; then
     SITES=$(echo `grep server_name /etc/nginx/sites-enabled/* -RiI|cut -d"/" -f5-|cut -d":" -f1|rev|cut -d"." -f2-|rev|grep -v "default"|sort|uniq`)
     if [ ! -z "$SITES" ] ; then
         echo "== Sites Available (Nginx) ==";
-    
+
         SITES_CNT=1
         for SITE in $SITES
         do
             if curl -I -m 10 "$SITE" 2>&1 | grep -w "200\|301" > /dev/null ; then
-                echo "$SITES_CNT $SITE is up"
+                echo "[$SITES_CNT] $SITE is up"
             else
-                echo "$SITES_CNT $SITE is down"
+                echo "[$SITES_CNT] $SITE is down"
             fi
             SITES_CNT=$[$SITES_CNT +1]
         done
@@ -155,4 +170,4 @@ if ! command -v curl &> /dev/null ; then
 fi
 
 echo "Last Check: "$(date '+%Y-%m-%d %H:%M')
-echo ""
\ No newline at end of file
+echo ""