diff --git a/check_ceph_status b/check_ceph_status index 59a40227fc83dc98e0ca6dc2792527801b7de38f..d2e25fede66d627877316427150e731b19366209 100755 --- a/check_ceph_status +++ b/check_ceph_status @@ -22,11 +22,12 @@ # 2023-06-19 v1.5 <axel.hahn@unibe.ch> add help and param support; no more tmpfile # 2023-07-27 v1.6 <axel.hahn@unibe.ch> update help page # 2023-10-20 v1.7 <axel.hahn@unibe.ch> harden sudo command execution +# 2024-02-29 v1.8 <axel.hahn@unibe.ch> show restore progress only for misplaed/ degraded objects # ====================================================================== . $(dirname $0)/inc_pluginfunctions -export self_APPVERSION=1.7 +export self_APPVERSION=1.8 initfile="/tmp/ceph-status-not-ok-start-$USER" @@ -114,6 +115,7 @@ fi iLastDeg=$iDeg iLastMis=$iMis +typeset -i iObjCount=$iDeg+$iMis sCephStatus=$(getCephStatus) @@ -130,9 +132,7 @@ fi ph.status "Ceph status is $sCephStatus" echo -while [ ! "$sCephStatus" = "HEALTH_OK" ] && [ $doLoop = 1 ]; do - - typeset -i iObjCount=$iDeg+$iMis +while [ ! "$sCephStatus" = "HEALTH_OK" ] && [ $iObjCount -gt 0 ] && [ $doLoop = 1 ]; do iTsNow=$( date +%s ) diff --git a/docs/20_Checks/check_ceph_status.md b/docs/20_Checks/check_ceph_status.md index abce980d43e84c3e90e291b6f1f7c8975c87805f..e4e8d41ee2372e28721fbbc7b5bf617babac9e49 100644 --- a/docs/20_Checks/check_ceph_status.md +++ b/docs/20_Checks/check_ceph_status.md @@ -19,7 +19,7 @@ icingaclient ALL=(ALL) NOPASSWD: /bin/ceph ______________________________________________________________________ CHECK_CEPH_STATUS -v1.7 +v1.8 (c) Institute for Medical Education - University of Bern Licence: GNU GPL 3