Module: check_mk Branch: master Commit: f00a9212fcdf55972be3f139083b73b4b2fb8679 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f00a9212fcdf55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 19 15:17:09 2017 +0200 4471 FIX Windows Agent Process Monitoring: ps section is no longer completely suppressed when only parts of the data is missing The ps section was skipped entirely when no performance information (memory usage) could be found for the process. This has been fixed. Change-Id: Iffd4e77affdeb6ed508bfec7d924bb9efc35529e --- .werks/4471 | 13 +++++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15811066 -> 15811066 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent.exe | Bin 1316864 -> 1316864 bytes agents/windows/check_mk_agent.msi | Bin 2926080 -> 2926080 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13672482 -> 13671970 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1316864 -> 1316864 bytes agents/windows/install_agent-64.exe | Bin 591627 -> 591608 bytes agents/windows/install_agent.exe | Bin 589033 -> 589024 bytes agents/windows/sections/SectionPS.cc | 1 - 12 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4471 b/.werks/4471 new file mode 100644 index 0000000..fb39dc4 --- /dev/null +++ b/.werks/4471 @@ -0,0 +1,13 @@ +Title: Windows Agent Process Monitoring: ps section is no longer completely suppressed when only parts of the data is missing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1492607121 +Class: fix + +The ps section was skipped entirely when no performance information (memory usage) could be found +for the process. This has been fixed. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 1826320..fd5e1fa 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2657 +2659 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b9e732b..be87804 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index cd60081..177b4a9 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4c18335..59030a6 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.exe b/agents/windows/check_mk_agent.exe index 0d3557c..cc0a487 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.msi b/agents/windows/check_mk_agent.msi index a715302..2435328 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 1e3bd72..bf42672 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 8673b4b..bfd2bdb 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 64b32d4..3a9fa82 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 de70f65..7967a77 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index d4cfc00..99236ce 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -253,7 +253,6 @@ bool SectionPS::outputNative(std::ostream &out) { // the most likely cause is that the wmi query fails, i.e. because the // service is currently offline. crash_log("Exception: Error while querying process perfdata: %s", e.what()); - return false; } WinHandle hProcessSnap(CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0));