From ec5b7c5b65105945df2347c1d1635428b91b0506 Mon Sep 17 00:00:00 2001
From: m8in <m8in@gmx.de>
Date: Sat, 18 Apr 2026 21:01:33 +0200
Subject: [PATCH] monitoring fixed

---
 .gitignore                                                   | 3 +++
 .../default}/monitor/checks/EXAMPLE_CHECK.off                | 2 +-
 script/monitor/check.sh                                      | 2 +-
 script/monitor/generic/CIS_OWN_DOMAIN_CHECK.sh               | 5 +++--
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename {script => definitions/default}/monitor/checks/EXAMPLE_CHECK.off (73%)
 mode change 100644 => 100755

diff --git a/.gitignore b/.gitignore
index fe2ab41..e14fcf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@
 !/definitions/default/core/
 /definitions/default/core/*
 !/definitions/default/core/all/
+!/definitions/default/monitor/
+/definitions/default/monitor/*
+!/definitions/default/monitor/checks/
 
 # 2.) Ignore all content of 'states', except file README.md
 /states/*
diff --git a/script/monitor/checks/EXAMPLE_CHECK.off b/definitions/default/monitor/checks/EXAMPLE_CHECK.off
old mode 100644
new mode 100755
similarity index 73%
rename from script/monitor/checks/EXAMPLE_CHECK.off
rename to definitions/default/monitor/checks/EXAMPLE_CHECK.off
index 527c3a2..72fa71f
--- a/script/monitor/checks/EXAMPLE_CHECK.off
+++ b/definitions/default/monitor/checks/EXAMPLE_CHECK.off
@@ -6,4 +6,4 @@ _CHECK="$(readlink -f "${0}" 2> /dev/null)"
 _CIS_ROOT="${_CHECK%%/definitions/*}/"             #Removes longest  matching pattern '/definitions/*' from the end
 _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]"
diff --git a/script/monitor/check.sh b/script/monitor/check.sh
index e21ee9b..45035c0 100755
--- a/script/monitor/check.sh
+++ b/script/monitor/check.sh
@@ -43,7 +43,7 @@ function doChecks(){
 }
 
 function usage(){
-    printf "\nUsage: /monitoring/check.sh <command> <options>"
+    printf "\nUsage: /monitor/check.sh <command> <options>"
     echo
     echo "possible commands:"
     echo
diff --git a/script/monitor/generic/CIS_OWN_DOMAIN_CHECK.sh b/script/monitor/generic/CIS_OWN_DOMAIN_CHECK.sh
index 48810d1..e178f86 100755
--- a/script/monitor/generic/CIS_OWN_DOMAIN_CHECK.sh
+++ b/script/monitor/generic/CIS_OWN_DOMAIN_CHECK.sh
@@ -32,13 +32,14 @@ function testDomain(){
     checkOrStartSSHMaster \
         || 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}" ] \
         && echo "OK" \
         && 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
 }