monitoring fixed

This commit is contained in:
m8in
2026-04-18 21:01:33 +02:00
parent a0b8218698
commit ec5b7c5b65
4 changed files with 8 additions and 4 deletions
+3
View File
@@ -12,6 +12,9 @@
!/definitions/default/core/ !/definitions/default/core/
/definitions/default/core/* /definitions/default/core/*
!/definitions/default/core/all/ !/definitions/default/core/all/
!/definitions/default/monitor/
/definitions/default/monitor/*
!/definitions/default/monitor/checks/
# 2.) Ignore all content of 'states', except file README.md # 2.) Ignore all content of 'states', except file README.md
/states/* /states/*
@@ -6,4 +6,4 @@ _CHECK="$(readlink -f "${0}" 2> /dev/null)"
_CIS_ROOT="${_CHECK%%/definitions/*}/" #Removes longest matching pattern '/definitions/*' from the end _CIS_ROOT="${_CHECK%%/definitions/*}/" #Removes longest matching pattern '/definitions/*' from the end
_GENERIC_CHECKS="${_CIS_ROOT:?"Missing CIS_ROOT"}script/monitor/generic/" _GENERIC_CHECKS="${_CIS_ROOT:?"Missing CIS_ROOT"}script/monitor/generic/"
${_GENERIC_CHECKS:?"Missing GENERIC_CHECKS"}OVERRIDDEN_DOMAIN_CHECK.sh "your-host.your-domain.net" ${_GENERIC_CHECKS:?"Missing GENERIC_CHECKS"}CIS_OWN_DOMAIN_CHECK.sh "your-host.your-domain.net[:ssh_port]"
+1 -1
View File
@@ -43,7 +43,7 @@ function doChecks(){
} }
function usage(){ function usage(){
printf "\nUsage: /monitoring/check.sh <command> <options>" printf "\nUsage: /monitor/check.sh <command> <options>"
echo echo
echo "possible commands:" echo "possible commands:"
echo echo
@@ -32,13 +32,14 @@ function testDomain(){
checkOrStartSSHMaster \ checkOrStartSSHMaster \
|| return 1 || return 1
local _RESULT="$(ssh -S ${_SOCKET} -p ${_REMOTE_PORT} ${_REMOTE_USER}@${_REMOTE_HOSTNAME_FQDN} 'bash /cis/core/printOwnDomain.sh' 2>&1 1>/dev/null)" local _RESULT=$(ssh -S "${_SOCKET}" -p "${_REMOTE_PORT}" "${_REMOTE_USER}"@"${_REMOTE_HOSTNAME_FQDN}" 'bash /cis/core/printOwnDomain.sh' 2>&1 1>/dev/null)
[ -z "${_RESULT}" ] \ [ -z "${_RESULT}" ] \
&& echo "OK" \ && echo "OK" \
&& return 0 && return 0
echo "WARNING#Check hosts '/cis/core/printOwnDomain'" local _DOMAIN=$(ssh -S "${_SOCKET}" -p "${_REMOTE_PORT}" "${_REMOTE_USER}"@"${_REMOTE_HOSTNAME_FQDN}" 'bash /cis/core/printOwnDomain.sh' 2>/dev/null)
echo "WARNING#Overwritten to '${_DOMAIN}'"
return 0 return 0
} }