[checkmk-commits] #2661 FIX windows agent: fixed incomplete process list

Module: check_mk Branch: master Commit: 595e8a35b38f4ea1cbb9275c8324eee0882b9d58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=595e8a35b38f4e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Oct 16 17:03:38 2015 +0200 #2661 FIX windows agent: fixed incomplete process list in 1.2.7i3p0 and 1.2.7i3p1 the process list of the windows agent is cut off after a few entries unless wmi is activated for that check. --- .werks/2661 | 10 ++++++++++ ChangeLog | 3 +++ agents/windows/Makefile | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 830464 -> 830464 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 830464 -> 830464 bytes agents/windows/check_mk_agent.cc | 3 ++- agents/windows/check_mk_agent.exe | Bin 748032 -> 748032 bytes agents/windows/check_mk_agent.msi | Bin 1836544 -> 1836544 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 748032 -> 748032 bytes agents/windows/crash.exe | Bin 20024 -> 101058 bytes agents/windows/install_agent-64.exe | Bin 379562 -> 383233 bytes agents/windows/install_agent.exe | Bin 370503 -> 374175 bytes agents/windows/nowin.exe | Bin 22511 -> 103194 bytes 14 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/2661 b/.werks/2661 new file mode 100644 index 0000000..c141258 --- /dev/null +++ b/.werks/2661 @@ -0,0 +1,10 @@ +Title: windows agent: fixed incomplete process list +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1445007640 +Class: fix + +in 1.2.7i3p0 and 1.2.7i3p1 the process list of the windows agent is cut off after a few entries +unless wmi is activated for that check. diff --git a/ChangeLog b/ChangeLog index 56bf526..e51b3ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ 1.2.7i4: Checks & Agents: + * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... + NOTE: Please refer to the migration notes! * 2695 hp_msa_disk, hp_msa_volume: these checks now report more information about disks and volumes of a HP MSA 2040 Storage System * 2663 knuerr_rms_temp: switch to new generic temperature logic, allow e.g. lower levels... NOTE: Please refer to the migration notes! * 2660 FIX: fixed windows agent using the wrong working directory... + * 2661 FIX: windows agent: fixed incomplete process list... Multisite: * 2680 FIX: LDAP: Fixed exception when syncing groups using configurations from previous versions... diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 70b88ed..29f932a 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -122,7 +122,7 @@ check_mk_agent-64.exe.versioned: %.exe: %.unversioned.exe %.exe.versioned - + # ----------------------------------------------------------------------------- # NSIS installer will be removed and replaced by multiarch MSI installer diff --git a/agents/windows/build_version b/agents/windows/build_version index 30ce115..6962904 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -559 +569 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 27960e7..adf3fe7 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 4ae052b..05d2887 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 fbf7c47..3e9ac26 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1509,6 +1509,7 @@ void section_ps(SOCKET &out) if (hProcessSnap != INVALID_HANDLE_VALUE) { pe32.dwSize = sizeof(PROCESSENTRY32); + if (Process32First(hProcessSnap, &pe32)) { do @@ -1534,7 +1535,7 @@ void section_ps(SOCKET &out) DWORD processHandleCount = 0; // GetProcessHandleCount is only available winxp upwards - typedef BOOL (*GetProcessHandleCount_type)(HANDLE, PDWORD); + typedef BOOL WINAPI (*GetProcessHandleCount_type)(HANDLE, PDWORD); DYNAMIC_FUNC(GetProcessHandleCount, L"kernel32.dll"); if (GetProcessHandleCount_dyn != NULL) { GetProcessHandleCount_dyn(hProcess, &processHandleCount); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b6be7e2..60e5b8d 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 64bc0f3..748ab3d 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.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index aeb6a49..7e4ab5f 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/crash.exe b/agents/windows/crash.exe index 6527e43..d956227 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2de1e5b..7076414 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 0006199..402b1c3 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index bc419b6..6fa7286 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ