Update formatting on ghe-host-check

Added:
- Recommended Disk requirement
- Updated formatting of checks

Author: xN4P4LM

bin/ghe-host-check

@@ -157,9 +157,10 @@ if [[ "$CALLING_SCRIPT" == "ghe-backup" ]]; then
   . "$(dirname "${BASH_SOURCE[0]}")/../share/github-backup-utils/ghe-rsync-size"
 
   #Display dir requirements for repositories and mysql
+  echo "" 1>&2
   echo "Checking host for sufficient space for a backup..." 1>&2
   available_space=$(df -B 1k $GHE_DATA_DIR | awk 'END{printf "%.0f", $4 * 1024}') 
-  echo "We recommend allocating at least 5x the amount of storage allocated to the primary GitHub appliance for historical snapshots and growth over time." 1>&2
+  echo "  We recommend allocating at least 5x the amount of storage allocated to the primary GitHub appliance for historical snapshots and growth over time." 1>&2
 
   repos_disk_size=$(transfer_size repositories /tmp)
   pages_disk_size=$(transfer_size pages /tmp)
@@ -171,20 +172,24 @@ if [[ "$CALLING_SCRIPT" == "ghe-backup" ]]; then
   mssql_disk_size=$(transfer_size mssql /tmp)
 
   min_disk_req=$((repos_disk_size + pages_disk_size + es_disk_size + stor_disk_size + minio_disk_size + mysql_disk_size + actions_disk_size + mssql_disk_size))
-  echo "Available space: $((available_space / (1024 ** 2))) MB" 1>&2
-  echo -e "Min Disk required for this backup is at least $min_disk_req MB\n" 1>&2
+  recommended_disk_req=$((min_disk_req * 5))
+  echo "   - Available space: $((available_space / (1024 ** 2))) MB" 1>&2
+  echo "   - Min Disk required for this backup is at least $min_disk_req MB" 1>&2
+  echo "   - Recommended Disk requirement is $recommended_disk_req MB" 1>&2
+  echo "" 1>&2
 
-cat <<DATA_TRANSFER_SIZE 1>&2
+  cat <<DATA_TRANSFER_SIZE 1>&2
 ### Data Transfer Sizes 
-repositories: $repos_disk_size MB
-pages: $pages_disk_size MB
-elasticsearch: $es_disk_size MB
-storage: $stor_disk_size MB
-minio: $minio_disk_size MB
-mysql: $mysql_disk_size MB
-actions: $actions_disk_size MB
-mssql: $mssql_disk_size MB
+ - repositories: $repos_disk_size MB
+ - pages: $pages_disk_size MB
+ - elasticsearch: $es_disk_size MB
+ - storage: $stor_disk_size MB
+ - minio: $minio_disk_size MB
+ - mysql: $mysql_disk_size MB
+ - actions: $actions_disk_size MB
+ - mssql: $mssql_disk_size MB
 DATA_TRANSFER_SIZE
+  echo "" 1>&2
 
   if [[ $((available_space / (1024 * 1024))) -lt $min_disk_req ]]; then
     echo "There is not enough disk space for the backup. Please allocate more space and continue." 1>&2
@@ -223,15 +228,15 @@ You can disable this warning by changing RSYNC_WARNING to 'no' in your backup.co
    
 WARN_MSG
   fi
-  echo "rsync ${rsync_version} >= required ($min_rsync)" 1>&2
+  echo " - rsync ${rsync_version} >= required ($min_rsync)" 1>&2
 
   ssh_version=$(ssh -V 2>&1 | awk '{print $1}'|grep -oPm 1 '[\d\.]+' |head -1 | tr -cd '[:digit:].\n')
   if awk "BEGIN {exit !($ssh_version < $min_openssh)}" &> /dev/null; then
     echo "openSSH version $ssh_version in backup-host does not meet minimum requirements." 1>&2
     echo "Please make sure the minimum required version of openSSH: $min_openssh is installed" 1>&2
     exit 1
   else
-    echo "openSSH ${ssh_version} >= required ($min_openssh)" 1>&2
+    echo " - openSSH ${ssh_version} >= required ($min_openssh)" 1>&2
   fi
 
   jq_version=$(jq --version |awk -F\- '{print $2}' | tr -cd '[:digit:].\n')
@@ -240,8 +245,8 @@ WARN_MSG
     echo "Please make sure you have the minimum required version of jq: $min_jq installed" 1>&2
     exit 1
   else
-    echo "jq ${jq_version} >= required ($min_jq)" 1>&2
+    echo " - jq ${jq_version} >= required ($min_jq)" 1>&2
   fi
 fi
-
+echo "" 1>&2
 echo "Connect $hostname:$port OK (v$version)"