24 May
2016
24 May
'16
2:54 p.m.
Module: check_mk
Branch: master
Commit: 4b82dd8a783ccccb75f8db07be2d67a192a04b49
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b82dd8a783ccc…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Tue May 24 16:54:43 2016 +0200
windows agent: added output of additional skype perfcounters
---
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 1267712 -> 1268224 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 1267712 -> 1268224 bytes
agents/windows/check_mk_agent.cc | 7 +++++++
agents/windows/check_mk_agent.exe | Bin 1236480 -> 1236992 bytes
agents/windows/check_mk_agent.msi | Bin 2772992 -> 2774016 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 1236480 -> 1236992 bytes
agents/windows/crashhandling.cc | 2 +-
agents/windows/install_agent-64.exe | Bin 565279 -> 565457 bytes
agents/windows/install_agent.exe | Bin 559579 -> 559756 bytes
10 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 57bf58c..32bb421 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-1727
+1729
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index a333e61..d3967ef 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 4a980ca..9045168 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 f280bc4..935b8e9 100644
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -1660,26 +1660,33 @@ void section_skype(OutputProxy &out) {
bool any_section_valid = false;
for (const auto &data_source :
{L"LS:WEB - Address Book Web Query",
+ L"LS:WEB - Address Book File Download",
L"LS:WEB - Location Information Service",
L"LS:WEB - Distribution List Expansion",
L"LS:WEB - UCWA",
L"LS:WEB - Mobile Communication Service",
L"LS:WEB - Throttling and Authentication",
+ L"LS:WEB - Auth Provider related calls",
L"LS:SIP - Protocol",
L"LS:SIP - Responses",
L"LS:SIP - Peers",
L"LS:SIP - Load Management",
+ L"LS:SIP - Authentication",
+ L"LS:CAA - Operations",
L"LS:DATAMCU - MCU Health And Performance",
L"LS:AVMCU - MCU Health And Performance",
L"LS:AsMcu - MCU Health And Performance",
L"LS:ImMcu - MCU Health And Performance",
L"LS:USrv - DBStore",
+ L"LS:USrv - Conference Mcu Allocator",
+ L"LS:JoinLauncher - Join Launcher Service Failure",
L"LS:MediationServer - Health Indices",
L"LS:MediationServer - Global Counters",
L"LS:MediationServer - Global Per Gateway Counters",
L"LS:MediationServer - Media Relay",
L"LS:A/V Auth - Requests",
L"LS:DATAPROXY - Server Connections",
+ L"LS:XmppFederationProxy - Streams",
L"LS:A/V Edge - TCP Counters",
L"LS:A/V Edge - UDP Counters"}) {
any_section_valid |= output_perfcounter_table(
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index 63df0a3..1b153d1 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 91a5a3c..cd9c482 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 352fa93..bd487ea 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/crashhandling.cc b/agents/windows/crashhandling.cc
index b1f451e..c6e924f 100644
--- a/agents/windows/crashhandling.cc
+++ b/agents/windows/crashhandling.cc
@@ -147,7 +147,7 @@ LONG WINAPI exception_handler(LPEXCEPTION_POINTERS ptrs) {
log_backtrace(ptrs->ExceptionRecord->ExceptionAddress);
::SymCleanup(proc);
-#else // __x86_64
+#else // __x86_64
// on x86 the backtrace can't be implemented in the same way
#endif // __x86_64
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 81d5da9..ad52d80 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 1d7de95..64aeae5 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ