diff --git a/icinga-cli.sh b/icinga-cli.sh index b5236053e6d188a1085400e7ffa418629287cf30..b2eba8f4b6c73abb8a6aa69dd52c6ea99f4f78d6 100755 --- a/icinga-cli.sh +++ b/icinga-cli.sh @@ -23,11 +23,12 @@ # 2023-11-01 v0.16 ah generate json with "jo" # 2023-11-02 v0.17 ah fix line breaks of sent output, shell check fixes # 2023-11-02 v0.18 ah fix quoting of perfdata in json +# 2023-11-02 v0.19 ah move _parseConfig # ====================================================================== _product="ICINGA PASSIVE CLIENT" -_version="0.18" +_version="0.19" _license="GNU GPL 3.0" _copyright='(c) Institute for Medical Education * University of Bern' @@ -271,6 +272,8 @@ function processCheck(){ local _myconfig=$1 local _force=$2 + _parseCheckConfig "${_myconfig}" + local iPipes; typeset -i iPipes local iCheckStart; typeset -i iCheckStart @@ -285,7 +288,6 @@ function processCheck(){ iCheckStart=$(_getUnixTs) - _parseCheckConfig "${_myconfig}" local _logPrefix="${checkName} |" _log "${_logPrefix} INFO: every ${checkInterval} sec: ${checkCommand}" @@ -322,7 +324,7 @@ function processCheck(){ # # --- this executes the check plugin ... # - _log "${_logPrefix} starting $myFullscript $myparams" + _log "${_logPrefix} starting $myFullscript $myparams - $_outfile" iTsStart=$(date +%s) eval $myFullscript $myparams > "$_outfile" rc=$?