[checkmk-commits] Check_MK Git: check_mk: #1110 FIX windows agent: fixed missing agent section problem if a cached script ran into a timeout

Module: check_mk Branch: master Commit: 2132af7799816aba34d4dc45347edc655e9c6e78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2132af7799816a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 11 14:18:54 2014 +0200 #1110 FIX windows agent: fixed missing agent section problem if a cached script ran into a timeout If a cache_age was set for a local or plugin script and the script ran into a timeout, no data was reported by this script until the cache_age was expired. This lead to missing agent sections. --- .werks/1110 | 11 +++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 178176 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 178176 bytes agents/windows/install_agent-64.exe | Bin 160065 -> 160067 bytes agents/windows/install_agent.exe | Bin 156986 -> 156984 bytes 10 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/1110 b/.werks/1110 new file mode 100644 index 0000000..109b8c5 --- /dev/null +++ b/.werks/1110 @@ -0,0 +1,11 @@ +Title: windows agent: fixed missing agent section problem if a cached script ran into a timeout +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410437655 +Class: fix + +If a cache_age was set for a local or plugin script and the script ran into a timeout, +no data was reported by this script until the cache_age was expired. +This lead to missing agent sections. diff --git a/ChangeLog b/ChangeLog index 5098f31..ddd3a5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * 1393 FIX: casa_cpu_temp, casa_cpu_util: Change service description to standard... NOTE: Please refer to the migration notes! * 1104 FIX: winperf_if: Improved matching of data from wmic_if.bat / wmic_if.ps1 scripts... + * 1110 FIX: windows agent: fixed missing agent section problem if a cached script ran into a timeout... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/agents/windows/build_version b/agents/windows/build_version index 8643cf6..7fe4e49 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -89 +91 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 2262cd3..9cda56e 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 752375a..6fa477c 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index dd9569b..7cae6c1 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2809,6 +2809,7 @@ DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) cont->status = SCRIPT_FINISHED; cont->last_problem = SCRIPT_NONE; cont->retry_count = cont->max_retries; + cont->buffer_time = time(0); break; case 1: cont->status = SCRIPT_ERROR; @@ -2858,7 +2859,6 @@ void run_script_container(script_container *cont) if (cont->status == SCRIPT_COLLECT || cont->status == SCRIPT_FINISHED) { return; } - cont->buffer_time = time(0); cont->status = SCRIPT_COLLECT; if (cont->worker_thread != INVALID_HANDLE_VALUE) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 1ff882a..27826ec 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index c27128f..8a10df5 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index fc4de25..e7e29ec 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index dff5540..a018288 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ