[checkmk-commits] Check_MK Git: check_mk: The windows agent was unable to output 64 bit counters.

Module: check_mk Branch: master Commit: 3fd6d0c8a9a0b30f8a9b46e5db1335621a538496 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fd6d0c8a9a0b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 9 14:23:00 2014 +0100 The windows agent was unable to output 64 bit counters. Those values were cut at 32 bit, which caused unwanted counter wraps in the checks. --- .werks/1659 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 209920 -> 209920 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 209920 -> 209920 bytes agents/windows/check_mk_agent.cc | 4 ++-- agents/windows/check_mk_agent.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178688 -> 178688 bytes agents/windows/install_agent-64.exe | Bin 160521 -> 160572 bytes agents/windows/install_agent.exe | Bin 157440 -> 157529 bytes 10 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/1659 b/.werks/1659 new file mode 100644 index 0000000..d7974d3 --- /dev/null +++ b/.werks/1659 @@ -0,0 +1,10 @@ +Title: windows agent: fixed output of 64 bit performance counters +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418131110 +Class: fix + +The windows agent was unable to output 64 bit performance counters. +Those values were cut at 32 bit, which caused unwanted counter wraps in the checks. diff --git a/ChangeLog b/ChangeLog index aed1044..e97e55d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 1729 FIX: apc_symmetra_test: Cleaned up check, fixed exception when self test date is zero * 1730 FIX: apc_symmetra: Fixed exception when last diagnose date was not known * 1731 FIX: ipmi_sensors: Fixed agent part when ipmi-sensors call on first agent run... + * 1659 FIX: windows agent: fixed output of 64 bit performance counters... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/windows/build_version b/agents/windows/build_version index b16e5f7..fe4afb0 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -104 +106 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e81bc5d..b7fec3e 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 8392ab5..e54c99f 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 cc73328..3ca45b5 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -988,10 +988,10 @@ void outputCounterValue(SOCKET &out, PERF_COUNTER_DEFINITION *counterPtr, PERF_C int size = counterPtr->CounterSize; BYTE *pData = ((BYTE *)counterBlockPtr) + offset; - if (counterPtr->CounterType | PERF_SIZE_DWORD) + if (counterPtr->CounterType & PERF_SIZE_DWORD) output(out, " %llu", (ULONGLONG)(*(DWORD*)pData)); - else if (counterPtr->CounterType | PERF_SIZE_LARGE) + else if (counterPtr->CounterType & PERF_SIZE_LARGE) output(out, " %llu", *(UNALIGNED ULONGLONG*)pData); // handle other data generically. This is wrong in some situation. diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ba7960a..718690a 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 f31adbb..075b92a 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 26d6bd5..72b7f39 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 247575e..d571f24 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ