Skip to content
Snippets Groups Projects
Commit 4cf050d2 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch '7045-update-ceph-health' into 'master'

7045 update ceph health

See merge request !246
parents fcef6312 1f56b4cc
No related branches found
No related tags found
1 merge request!2467045 update ceph health
...@@ -22,11 +22,12 @@ ...@@ -22,11 +22,12 @@
# 2023-06-19 v1.5 <axel.hahn@unibe.ch> add help and param support; no more tmpfile # 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-07-27 v1.6 <axel.hahn@unibe.ch> update help page
# 2023-10-20 v1.7 <axel.hahn@unibe.ch> harden sudo command execution # 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 . $(dirname $0)/inc_pluginfunctions
export self_APPVERSION=1.7 export self_APPVERSION=1.8
initfile="/tmp/ceph-status-not-ok-start-$USER" initfile="/tmp/ceph-status-not-ok-start-$USER"
...@@ -114,6 +115,7 @@ fi ...@@ -114,6 +115,7 @@ fi
iLastDeg=$iDeg iLastDeg=$iDeg
iLastMis=$iMis iLastMis=$iMis
typeset -i iObjCount=$iDeg+$iMis
sCephStatus=$(getCephStatus) sCephStatus=$(getCephStatus)
...@@ -130,9 +132,7 @@ fi ...@@ -130,9 +132,7 @@ fi
ph.status "Ceph status is $sCephStatus" ph.status "Ceph status is $sCephStatus"
echo echo
while [ ! "$sCephStatus" = "HEALTH_OK" ] && [ $doLoop = 1 ]; do while [ ! "$sCephStatus" = "HEALTH_OK" ] && [ $iObjCount -gt 0 ] && [ $doLoop = 1 ]; do
typeset -i iObjCount=$iDeg+$iMis
iTsNow=$( date +%s ) iTsNow=$( date +%s )
......
...@@ -19,7 +19,7 @@ icingaclient ALL=(ALL) NOPASSWD: /bin/ceph ...@@ -19,7 +19,7 @@ icingaclient ALL=(ALL) NOPASSWD: /bin/ceph
______________________________________________________________________ ______________________________________________________________________
CHECK_CEPH_STATUS CHECK_CEPH_STATUS
v1.7 v1.8
(c) Institute for Medical Education - University of Bern (c) Institute for Medical Education - University of Bern
Licence: GNU GPL 3 Licence: GNU GPL 3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment