Fix total space logic and rename TOTAL_AVAILABLE_SPACE to TOTAL_USED_SPACE

This commit is contained in:
Wes
2023-05-26 13:19:45 +00:00
parent 5de59a879a
commit ce114a2601

View File

@@ -8,9 +8,9 @@
. /usr/sbin/so-common . /usr/sbin/so-common
{% from 'vars/globals.map.jinja' import GLOBALS %} {% from 'vars/globals.map.jinja' import GLOBALS %}
TOTAL_AVAILABLE_SPACE=0 TOTAL_USED_SPACE=0
# Iterate through the output of _cat/allocation for each node in the cluster to determine the total available space # Iterate through the output of _cat/allocation for each node in the cluster to determine the total used space
{% if GLOBALS.role == 'so-manager' %} {% if GLOBALS.role == 'so-manager' %}
# Get total disk space - disk.total # Get total disk space - disk.total
for i in $(/usr/sbin/so-elasticsearch-query _cat/allocation | grep -v {{ GLOBALS.manager }} | awk '{print $3}'); do for i in $(/usr/sbin/so-elasticsearch-query _cat/allocation | grep -v {{ GLOBALS.manager }} | awk '{print $3}'); do
@@ -21,10 +21,18 @@ for i in $(/usr/sbin/so-elasticsearch-query _cat/allocation | awk '{print $2}');
size=$(echo $i | grep -oE '[0-9].*' | awk '{print int($1+0.5)}') size=$(echo $i | grep -oE '[0-9].*' | awk '{print int($1+0.5)}')
unit=$(echo $i | grep -oE '[A-Za-z]+') unit=$(echo $i | grep -oE '[A-Za-z]+')
if [ $unit = "tb" ]; then if [ $unit = "tb" ]; then
size=$(( size * 1024 * 1024 * 1024 * 1024 ))
elif [ $unit = "gb" ]; then
size=$(( size * 1024 * 1024 * 1024 ))
elif [ $unit = "mb" ]; then
size=$(( size * 1024 * 1024 ))
elif [ $unit = "kb" ]; then
size=$(( size * 1024 )) size=$(( size * 1024 ))
elif [ $unit = "b" ]; then
size=size
fi fi
TOTAL_AVAILABLE_SPACE=$(( TOTAL_AVAILABLE_SPACE + size )) TOTAL_USED_SPACE=$(( TOTAL_USED_SPACE + size ))
done done
# Calculate the percentage of available space based on our previously defined value # Calculate the percentage of used space based on our previously defined value
echo "$TOTAL_AVAILABLE_SPACE" echo "$TOTAL_USED_SPACE"