Module: check_mk
Branch: master
Commit: b92bf59c756a9d6e139b88fbd124e340c2e45b50
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b92bf59c756a9d…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Mon Feb 15 14:32:23 2016 +0100
#3074 FIX windows agent: fixed incorrect values for 32-bit performance counters
---
.werks/3074 | 10 ++++++++++
ChangeLog | 1 +
agents/windows/PerfCounter.cc | 2 +-
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 909824 -> 909824 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 909824 -> 909824 bytes
agents/windows/check_mk_agent.exe | Bin 835584 -> 835584 bytes
agents/windows/check_mk_agent.msi | Bin 2006016 -> 2006016 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 835584 -> 835584 bytes
agents/windows/install_agent-64.exe | Bin 418338 -> 418320 bytes
agents/windows/install_agent.exe | Bin 408688 -> 408684 bytes
11 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.werks/3074 b/.werks/3074
new file mode 100644
index 0000000..7758c1f
--- /dev/null
+++ b/.werks/3074
@@ -0,0 +1,10 @@
+Title: windows agent: fixed incorrect values for 32-bit performance counters
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1455543009
+
+
diff --git a/ChangeLog b/ChangeLog
index 4caf501..b3243d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
* 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an
Aruba Network WLAN Controller
* 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative
to the agent installation directory...
* 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin
+ * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters
Multisite:
* 3059 FIX: Fixed highlighting of availability timeline time slices
diff --git a/agents/windows/PerfCounter.cc b/agents/windows/PerfCounter.cc
index ddd3620..9e38471 100644
--- a/agents/windows/PerfCounter.cc
+++ b/agents/windows/PerfCounter.cc
@@ -117,7 +117,7 @@ ULONGLONG PerfCounter::extractValue(PERF_COUNTER_BLOCK *block) const
{
switch (_counter->CounterType & PERF_SIZE_MASK) {
case PERF_SIZE_DWORD:
- return static_cast<ULONGLONG>(*(DWORD *)block);
+ return static_cast<ULONGLONG>(*(DWORD *)pData);
case PERF_SIZE_LARGE:
return *(UNALIGNED ULONGLONG *)pData;
case PERF_SIZE_ZERO:
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 0718dd8..6f2c618 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-1320
+1335
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index c6190d3..4a7a922 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 af37d1f..cab6ca2 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 eb737d0..ff5ab48 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 179d2c9..b152115 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 3f7c0fc..bf7c2e2 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 4692be4..a30ce28 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 05a99e1..b86b2c7 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ