diff --git a/TODO.md b/TODO.md index 014ead2b82d94fc94bbc9efb690582a33a7a592e..69c5cfa52d93a12230ab1ee3c53326bff2488ff6 100644 --- a/TODO.md +++ b/TODO.md @@ -14,7 +14,7 @@ was ich so sehe ... ✅ Test auf gesetzte Metadaten -⬜ für alle Checks einen Test schreiben +✅ für alle Checks einen Test schreiben ✅ ApacheProcesses ✅ Cert --> Hostname bei Wildcard-Zertifikat wird nicht erkannt @@ -32,11 +32,11 @@ was ich so sehe ... ✅ Simple ✅ SqliteConnect -⬜ parent Option testen +✅ parent Option testen -⬜ group testen +✅ group testen -⬜ worstresult Option testen +✅ worstresult Option testen ## Done diff --git a/src/amcli.php b/src/amcli.php index b9b4e19d3bdff21b92f034d0ff42180abcd3da15..be44ad22c4c315b75be954e5955901936daf18c4 100755 --- a/src/amcli.php +++ b/src/amcli.php @@ -197,6 +197,7 @@ $aChecks = $aIni; unset($aChecks["meta"]); unset($aChecks["notifications"]); +$aArray=[]; foreach ($aChecks as $sKey => $aCheck) { $aChecks[$sKey]['name'] = $aCheck['name'] ?? $sKey; if ($aCheck['params']) { @@ -208,15 +209,22 @@ foreach ($aChecks as $sKey => $aCheck) { } } - _wd("Execute Check '$sKey' with params: " . print_r($aArray ?? [], 1)); - $oMonitor->addCheck([ + $aAddCheck=[ "name" => $aCheck['name'] ?? $sKey, "description" => $aCheck['description'], "check" => [ "function" => $aCheck['function'], - "params" => $aArray, + "params" => $aArray ?? [], ], - ]); + ]; + foreach(["group", "parent", "worstresult"] as $sCustomKey) { + if (isset($aCheck[$sCustomKey])) { + $aAddCheck[$sCustomKey] = $aCheck[$sCustomKey]; + } + } + _wd("Execute Check '$sKey': " . print_r($aAddCheck, 1)); + + $oMonitor->addCheck($aAddCheck); /* $oMonitor->addCheck(