10 Nov
2017
10 Nov
'17
9 a.m.
Module: check_mk
Branch: master
Commit: 5b6abd681062410815f582aba92912c0caa6c177
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b6abd68106241…
Author: Jukka Aro <ja(a)mathias-kettner.de>
Date: Fri Nov 10 14:47:05 2017 +0100
5410 FIX Windows agent: handle section Skype correctly
Windows agent was giving empty output for section Skype for a number of
reasons for all agent versions since 1.4.0:
* Windows registry was queried with an illegal parameter REG_MULTI_SZ
passed to RegOpenKeyExW. Starting from Windows Server 2016, this
illegal parameter caused the query to fail with "access denied".
* Werk #4007 fix (commit b89af681c90) caused the entire Skype section
to fall out if querying any of the subsection queries to Windows
registry failed. Werk #4007 was fixed based on the incorrect
assumption that Skype performance counters were queried over WMI.
In fact, they query Windows registry PerfLib instead of WMI.
* The perf counter name "LS:JoinLauncher - Join Launcher Service
Failures" was misspelled in singular, causing also this query to
fail. This subsection had never been working correctly.
* On master branch, the refactoring done in
16d8a0f1affed78bbe910dcb62dc73c06ee14508 broke the resolving of
counter base numbers based on their names.
These causes of failure are now fixed in Windows agent. The spelling of
LS:JoinLauncher is also corrected in Skype check code.
The performance of Skype perf counter queries got awkward after
reverting Werk #4007, that is, executing all of the subsection
queries even if some of them failed due to missing perf counters.
This is now fixed by mapping the perf counters names to their counter
base numbers once and reusing this mapping for all desired perf
counters. This avoids the unnecessary looping through Windows registry
for each perf counter separately.
New log entries are now being made for functionality related to perf
counters in order to make debugging easier.
Change-Id: I861f28f0efa39629c9dd9dbef649f452d2eac11b
---
.werks/5410 | 46 +++++++
agents/windows/PerfCounter.cc | 183 ++------------------------
agents/windows/PerfCounter.h | 15 +--
agents/windows/PerfCounterCommon.cc | 71 +++-------
agents/windows/PerfCounterCommon.h | 118 +++++++++++++++--
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent.cc | 26 ++--
agents/windows/sections/SectionGroup.cc | 8 --
agents/windows/sections/SectionGroup.h | 1 -
agents/windows/sections/SectionPS.cc | 3 +-
agents/windows/sections/SectionPerfcounter.cc | 21 ++-
agents/windows/sections/SectionPerfcounter.h | 5 +-
agents/windows/sections/SectionSkype.cc | 107 +++++++++------
agents/windows/sections/SectionWinperf.cc | 2 +-
agents/windows/types.cc | 5 +-
checks/skype | 6 +-
16 files changed, 289 insertions(+), 330 deletions(-)
Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5b6abd6810…