Skip to content
Snippets Groups Projects
Commit 676be978 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'update-loop' into 'master'

reduce one log line per check

See merge request !47
parents 0e39c4f0 03d3fde7
No related branches found
No related tags found
1 merge request!47reduce one log line per check
...@@ -295,6 +295,7 @@ function processCheck(){ ...@@ -295,6 +295,7 @@ function processCheck(){
local iTsEnd; typeset -i iTsEnd local iTsEnd; typeset -i iTsEnd
local iTsStart; typeset -i iTsStart local iTsStart; typeset -i iTsStart
local httpcode;
iCheckStart=$(_getUnixTs) iCheckStart=$(_getUnixTs)
...@@ -392,7 +393,7 @@ function processCheck(){ ...@@ -392,7 +393,7 @@ function processCheck(){
slot="$(_getName4Svcathost ${checkName} | sed 's# #%20#g')" slot="$(_getName4Svcathost ${checkName} | sed 's# #%20#g')"
_log "${_logPrefix} starting POST of data to monitoring server" # _log "${_logPrefix} starting POST of data to monitoring server"
_echo POST actions/process-check-result?service=${MY_NAME}!${slot} "$data" _echo POST actions/process-check-result?service=${MY_NAME}!${slot} "$data"
_APIcall POST actions/process-check-result?service=${MY_NAME}!${slot} "$data" _APIcall POST actions/process-check-result?service=${MY_NAME}!${slot} "$data"
http.responseExport "$_response" http.responseExport "$_response"
...@@ -403,13 +404,13 @@ function processCheck(){ ...@@ -403,13 +404,13 @@ function processCheck(){
fi fi
# --- check if data were sent successfully # --- check if data were sent successfully
httpcode=$(http.getStatuscode)
if http.isOk >/dev/null; then if http.isOk >/dev/null; then
_log "${_logPrefix} rc=$rc - OK, response was sent to Icinga" _log "${_logPrefix} Icinga: $httpcode - POST of data was OK"
else else
local httpcode; httpcode=$(http.getStatuscode)
_rc=$_rc+1 _rc=$_rc+1
case $httpcode in case $httpcode in
404) _FoundErrors+="Icinga response $httpcode: host or service check was not created in Icinga yet ... " ;; 404) _FoundErrors+="Icinga: $httpcode: host or service check was not created in Icinga yet ... " ;;
*) _FoundErrors+="Icinga response was not sent to Icinga: $httpcode ... " ;; *) _FoundErrors+="Icinga response was not sent to Icinga: $httpcode ... " ;;
esac esac
_echo _echo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment