From 234af166bac516a70070e523722d3db16c67022d Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Fri, 20 Oct 2023 16:04:48 +0200
Subject: [PATCH] update sudo handling in ceph checks
---
check_ceph_osd | 6 ++++--
check_ceph_status | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/check_ceph_osd b/check_ceph_osd
index 4838b58..8de5255 100755
--- a/check_ceph_osd
+++ b/check_ceph_osd
@@ -88,9 +88,11 @@ case "$1" in
*)
esac
+# --- check required tools
+ph.require ceph
+
if ! data=$( sudo -n /bin/ceph osd tree 2>&1 ); then
- echo "$data"
- ph.abort "UNKNOWN: ceph is not available or no sudo permissions to execute ceph commands."
+ ph.abort "UNKNOWN: No sudo permissions to execute ceph commands."
fi
# set default / override from command line params
diff --git a/check_ceph_status b/check_ceph_status
index 33b567e..59a4022 100755
--- a/check_ceph_status
+++ b/check_ceph_status
@@ -67,8 +67,7 @@ EOF
function readCephStatus(){
if ! data=$( sudo -n /bin/ceph status 2>&1 ); then
- echo "$data"
- ph.abort "UNKNOWN: ceph is not available or no sudo permissions to execute ceph commands."
+ ph.abort "UNKNOWN: No sudo permissions to execute ceph commands."
fi
}
function getCephStatus(){
@@ -98,6 +97,9 @@ case "$1" in
*)
esac
+# --- check required tools
+ph.require ceph
+
readCephStatus
if [ ! -f $initfile ]; then
echo "
--
GitLab