diff --git a/release_version.txt b/release_version.txt index a584aef..ee94dd8 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -0.8.2.2 +0.8.3 diff --git a/scripts/healthcheck/storage_health_check.sh b/scripts/healthcheck/storage_health_check.sh index 6f376ea..b7fd573 100755 --- a/scripts/healthcheck/storage_health_check.sh +++ b/scripts/healthcheck/storage_health_check.sh @@ -38,20 +38,13 @@ Metrics=() TempFiles= function cleanup { + echo Cleaing up temporary files: ${TempFiles} if [ "" != "${TempFiles}" ]; then - echo rm -f ${TempFiles} rm -f ${TempFiles} fi } trap cleanup EXIT - -function new_tempfile { - tmpfile=$(mktemp) - TempFiles="${TempFiles} ${tmpfile}" - echo ${tmpfile} -} - function space_alert() { ALERT_USAGE=75% for metric in "${Metrics[@]}" @@ -105,8 +98,12 @@ function storage_check() { done } -tmpfile=$(new_tempfile) -tmpfile2=$(new_tempfile) +tmpfile=$(mktemp) +TempFiles="${TempFiles} ${tmpfile}" + +tmpfile2=$(mktemp) +TempFiles="${TempFiles} ${tmpfile2}" + storage_check > ${tmpfile2} echo "## :card_file_box: STORAGE HEALTH CHECK" >> ${tmpfile} @@ -116,8 +113,9 @@ echo "| --- | --- | --- |" >> ${tmpfile} cat ${tmpfile2} | sort -h -r | awk -F'%' '{printf "%s%%%s\n",$2,$3}' >> ${tmpfile} cat ${tmpfile} | ${Sender} ${StatusChannel} -Measurements=() -tmpfile=$(new_tempfile) +tmpfile=$(mktemp) +TempFiles="${TempFiles} ${tmpfile}" + space_alert > ${tmpfile} if [ -s ${tmpfile} ] then