Everbrent/cis
9
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2025-12-06 15:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

-p added and GENERIC_ZFSPOOL_USAGE_CHECK uses ssh

Browse Source
This commit is contained in:
Martin Berghaus
2025-03-26 00:55:51 +01:00
parent f92251e409
commit 9597e32b62
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
script/monitor/checks/GENERIC_NGINX_CHECK.sh
View File

@@ -26,10 +26,10 @@ function checkViaHTTPS() {
} }
function checkOrStartSSHMaster() { function checkOrStartSSHMaster() {
timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} ${_REMOTE_USER}@${_REMOTE_HOST}" &> /dev/null \ timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOST}" &> /dev/null \
&& return 0 && return 0
ssh -O stop -S ${_SOCKET} ${_REMOTE_USER}@${_REMOTE_HOST} &> /dev/null ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOST} &> /dev/null
ssh -o ControlMaster=auto \ ssh -o ControlMaster=auto \
-o ControlPath=${_SOCKET} \ -o ControlPath=${_SOCKET} \
-o ControlPersist=65 \ -o ControlPersist=65 \
@@ -51,7 +51,7 @@ function checkViaSSH() {
checkOrStartSSHMaster \ checkOrStartSSHMaster \
|| return 1 || return 1
_RESULT=$(ssh -S ${_SOCKET} ${_REMOTE_USER}@${_REMOTE_HOST} 'systemctl status nginx.service' | grep -E 'Active:.*\(running\)' | cut -d';' -f2) _RESULT=$(ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOST} 'systemctl status nginx.service' | grep -E 'Active:.*\(running\)' | cut -d';' -f2)
! [ -z "${_RESULT}" ] && echo "INFO#UPTIME:${_RESULT}" || echo "FAIL" ! [ -z "${_RESULT}" ] && echo "INFO#UPTIME:${_RESULT}" || echo "FAIL"
} }

31
script/monitor/checks/GENERIC_ZFSPOOL_USAGE_CHECK.sh
View File

@@ -1,9 +1,32 @@
#!/bin/bash #!/bin/bash
SERVER="${1:?"FQDN of server missing"}" _REMOTE_HOST="${1:?"FQDN of server missing"}"
_REMOTE_PORT="${2:-"22"}"
_REMOTE_USER="monitoring"
_SOCKET='~/.ssh/%r@%h:%p'
function checkOrStartSSHMaster() {
timeout --preserve-status 1 "ssh -O check -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOST}" &> /dev/null \
&& echo "master checked" \
&& return 0
ssh -O stop -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOST} &> /dev/null
ssh -o ControlMaster=auto \
-o ControlPath=${_SOCKET} \
-o ControlPersist=65 \
-p ${_REMOTE_PORT} \
-f ${_REMOTE_USER}@${_REMOTE_HOST} exit &> /dev/null \
&& return 0
echo "Fail: checkOrStartMaster()"
return 1
}
function testSpace(){ function testSpace(){
local _RESULT=$(/sbin/zpool list -H -o capacity,name | /usr/bin/sort) checkOrStartSSHMaster \
|| return 1
local _RESULT="$(ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOST} 'zpool list -H -o capacity,name')"
local _SPACE_USED=$(echo "${_RESULT}" | /usr/bin/tail -n 1 | /usr/bin/cut -f1) local _SPACE_USED=$(echo "${_RESULT}" | /usr/bin/tail -n 1 | /usr/bin/cut -f1)
local _POOL=$(echo "${_RESULT}" | /usr/bin/tail -n 1 | /usr/bin/cut -f2) local _POOL=$(echo "${_RESULT}" | /usr/bin/tail -n 1 | /usr/bin/cut -f2)
@@ -23,4 +46,6 @@ function testSpace(){
return 0 return 0
} }
testSpace 80 90 testSpace 80 90 && exit 0
exit 1