[checkmk-commits] 4842 FIX Windows Agent / Exchange Monitoring: fixed broken MSExchange checks

Module: check_mk Branch: master Commit: d8284da6e5ba610b588fae26e823dd2898efaf3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8284da6e5ba61… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 4 14:48:42 2017 +0200 4842 FIX Windows Agent / Exchange Monitoring: fixed broken MSExchange checks All MSExchange Checks were missing in the latest version, due to an incorrect performance counter query. Change-Id: I5068fdb193bfeb1ad61c8dd185cb7f1ff35f7236 --- .werks/4842 | 12 ++++++++++++ agents/windows/SectionManager.cc | 14 +++++++------- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1339904 -> 1340416 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15823277 -> 15823789 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1339904 -> 1340416 bytes agents/windows/check_mk_agent.exe | Bin 1317888 -> 1318400 bytes agents/windows/check_mk_agent.msi | Bin 2927616 -> 2928640 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13681693 -> 13682205 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1317888 -> 1318400 bytes agents/windows/install_agent-64.exe | Bin 591863 -> 591866 bytes agents/windows/install_agent.exe | Bin 589498 -> 589524 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10088419 -> 10106761 bytes 13 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.werks/4842 b/.werks/4842 new file mode 100644 index 0000000..75a3432 --- /dev/null +++ b/.werks/4842 @@ -0,0 +1,12 @@ +Title: Windows Agent / Exchange Monitoring: fixed broken MSExchange checks +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499172445 +Class: fix + +All MSExchange Checks were missing in the latest version, due to an incorrect performance counter query. + + diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index 3643880..bd195b1 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -112,19 +112,19 @@ void SectionManager::loadStaticSections(Configuration &config, (new SectionGroup("msexch")) ->withToggleIfMissing() ->withSubSection((new SectionWMI("msexch_activesync")) - ->withObject(L"MSExchangeActiveSync")) + ->withObject(L"Win32_PerfRawData_MSExchangeActiveSync_MSExchangeActiveSync")) ->withSubSection((new SectionWMI("msexch_availability")) - ->withObject(L"MSExchangeAvailabilityService")) + ->withObject(L"Win32_PerfRawData_MSExchangeAvailabilityService")) ->withSubSection( - (new SectionWMI("msexch_owa"))->withObject(L"MSExchangeOWA")) + (new SectionWMI("msexch_owa"))->withObject(L"Win32_PerfRawData_MSExchangeOWA_MSExchangeOWA")) ->withSubSection((new SectionWMI("msexch_autodiscovery")) - ->withObject(L"MSExchangeAutodiscover")) + ->withObject(L"Win32_PerfRawData_MSExchangeAutodiscover_MSExchangeAutodiscover")) ->withSubSection((new SectionWMI("msexch_isclienttype")) - ->withObject(L"MSExchangeISClientType")) + ->withObject(L"Win32_PerfRawData_MSExchangeISClientType_MSExchangeISClientType")) ->withSubSection((new SectionWMI("msexch_isstore")) - ->withObject(L"MSExchangeISStore")) + ->withObject(L"Win32_PerfRawData_MSExchangeISStore_MSExchangeISStore")) ->withSubSection((new SectionWMI("msexch_rpcclientaccess")) - ->withObject(L"MSExchangeRpcClientAccess")) + ->withObject(L"Win32_PerfRawData_MSExchangeRpcClientAccess_MSExchangeRpcClientAccess")) ->withHiddenHeader() ->withSeparator(',')); diff --git a/agents/windows/build_version b/agents/windows/build_version index 07dcacc..f06c1c5 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2800 +2806 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 9842480..55424fc 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 6a6935d..24c8ff0 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 288d4bf..909f567 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 855f556..e2dd34d 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 800596e..28b83e5 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 cb22bb3..6193098 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 3baaa64..06b2cc2 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 2f47628..d127af0 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 45e8927..c0f102b 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index 553422b..2fdcbfc 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ