Merge pull request 'Script für S3 Setup aufgeräumt.' (#3) from master into main

Reviewed-on: #3

capacity-report-s3-ssd.sh

@@ -24,7 +24,7 @@ function ConvertOnlyToTB () {
 }
 
 function GetRepoCapacity () {
-    getRepoValue=$(df -BM --output=$1,target | grep -w -m 1 $2 | sed 's/[[:blank:]]*//' |  sed s'/\G.*//');  \
+    getRepoValue=$(df -BM --output=$1,target | grep -w -m 1 $2 | sed 's/[[:blank:]]*//' |  sed s'/\M.*//');  \
     getRepoValue=$(ConvertToTB $getRepoValue)
     echo $getRepoValue $3; \
 }
@@ -34,21 +34,6 @@ license_number=$(grep -w 'license_number' /etc/filescale/cluster.ansible.yml | g
 sender=$(grep -w sender /etc/filescale/cluster.yml | grep -o -P '(?<=sender: ).*(?=)')
 recipient=$(grep -w recipient /etc/filescale/cluster.yml | grep -o -P '(?<=recipient: ).*(?=)')
 
-# RAW capacity
-raw_capacity=$(ansible -b -i /etc/filescale/cluster.ansible.yml storage_nodes -m shell -a "ssacli ctrl all show config | grep -o -P '(?<=SSD, ).*(?= TB)' | awk '{sum+=\$1} END {print sum}'" | awk '{sum+=$1} END {print sum}')
-
-# usable total
-usable_total_bytes=$(influx -precision rfc3339 -database telegraf -execute 'SELECT last(minio_cluster_capacity_usable_total_bytes) as usable_total_bytes FROM telegraf.autogen.ec_s3_space_metrics' | grep -o -P '(?<=Z ).*(?=)')
-usable_total_TB=$(echo $usable_total_bytes | awk '{printf "%.1f\n", $usable_total_bytes / 1000 / 1000 / 1000 / 1000}')  # is technically TiB
-
-# Available Capacity
-available_capacity_bytes=$(influx -precision rfc3339 -database telegraf -execute 'SELECT last(minio_cluster_capacity_usable_free_bytes) as usable_free_bytes FROM telegraf.autogen.ec_s3_space_metrics' | grep -o -P '(?<=Z ).*(?=)')
-available_capacity_TB=$(echo $available_capacity_bytes | awk '{printf "%.1f\n", $available_capacity_bytes / 1000 / 1000 / 1000 / 1000}')  # is technically TiB
-
-# Used Capacity
-used_capacity=$(echo $usable_total_bytes - $available_capacity_bytes | bc)
-used_capacity_TB=$(echo $used_capacity | awk '{printf "%.1f\n", $used_capacity / 1000 / 1000 / 1000 / 1000}')  # is technically TiB
-
 (
   echo "To: ${recipient}"
   echo "From: ${sender}"
@@ -108,9 +93,20 @@ used_capacity_TB=$(echo $used_capacity | awk '{printf "%.1f\n", $used_capacity /
         <tr>"
 
 echo   "<td> ${license_number} </td>"
+# RAW capacity
+raw_capacity=$(ansible -b -i /etc/filescale/cluster.ansible.yml storage_nodes -m shell -a "ssacli ctrl all show config | grep -o -P '(?<=SSD, ).*(?= TB)' | awk '{sum+=\$1} END {print sum}'" | awk '{sum+=$1} END {print sum}')
 echo   "<td> ${raw_capacity} TB </td>"
+# usable total
+usable_total_bytes=$(influx -precision rfc3339 -database telegraf -execute 'SELECT last(minio_cluster_capacity_usable_total_bytes) as usable_total_bytes FROM telegraf.autogen.ec_s3_space_metrics' | grep -o -P '(?<=Z ).*(?=)')
+usable_total_TB=$(echo $usable_total_bytes | awk '{printf "%.1f\n", $usable_total_bytes / 1000 / 1000 / 1000 / 1000}')  # is technically TiB
 echo   "<td> ${usable_total_TB} TB </td>"
+# Available Capacity
+available_capacity_bytes=$(influx -precision rfc3339 -database telegraf -execute 'SELECT last(minio_cluster_capacity_usable_free_bytes) as usable_free_bytes FROM telegraf.autogen.ec_s3_space_metrics' | grep -o -P '(?<=Z ).*(?=)')
+available_capacity_TB=$(echo $available_capacity_bytes | awk '{printf "%.1f\n", $available_capacity_bytes / 1000 / 1000 / 1000 / 1000}')  # is technically TiB
 echo   "<td> ${available_capacity_TB} TB </td>"
+# Used Capacity
+used_capacity=$(echo $usable_total_bytes - $available_capacity_bytes | bc)
+used_capacity_TB=$(echo $used_capacity | awk '{printf "%.1f\n", $used_capacity / 1000 / 1000 / 1000 / 1000}')  # is technically TiB
 echo   "<td> ${used_capacity_TB} TB </td>
         </tr>
         <tr>
@@ -153,4 +149,3 @@ echo   "<tr>
 </html>
 "
 ) | sudo sendmail -t -f $sender
-