[checkmk-commits] 3827 FIX windows agent: fixed 3 bugs which broke the skype section

Module: check_mk Branch: master Commit: 6086d53058b7f9c3633adffaa44d1df490f4e9c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6086d53058b7f9… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Tue Oct 18 14:03:39 2016 +0200 3827 FIX windows agent: fixed 3 bugs which broke the skype section --- .werks/3827 | 9 +++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15382124 -> 15382636 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent.exe | Bin 1299456 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2893824 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13294903 -> 13295415 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1299456 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584706 -> 584767 bytes agents/windows/install_agent.exe | Bin 581396 -> 581457 bytes agents/windows/sections/SectionPerfcounter.cc | 2 +- agents/windows/sections/SectionSkype.cc | 3 ++- 14 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/3827 b/.werks/3827 new file mode 100644 index 0000000..0f64d0c --- /dev/null +++ b/.werks/3827 @@ -0,0 +1,9 @@ +Title: windows agent: fixed 3 bugs which broke the skype section +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476792181 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 61ed808..73cba57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 3825 FIX: local check: no longer cuts away any trailing "9" digits in P mode * 3964 FIX: df_zos: Fixed not working filesystemcheck for IBM z/OS... * 3826 FIX: netapp_api_connection: now removes duplicate warning messages + * 3827 FIX: windows agent: fixed 3 bugs which broke the skype section Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/agents/windows/build_version b/agents/windows/build_version index 4bc9790..4e14254 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2114 +2133 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 1999ec9..cf89279 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 424b7d0..ae7b078 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 eead573..16f1abd 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 95007b2..4315c37 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 95cd100..cd1849d 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 dc59afa..95f4318 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 87a232c..0a9de51 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 ba706ab..96a96f1 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 1dbe35a..2d53be3 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPerfcounter.cc b/agents/windows/sections/SectionPerfcounter.cc index 062a0e8..0190c7e 100644 --- a/agents/windows/sections/SectionPerfcounter.cc +++ b/agents/windows/sections/SectionPerfcounter.cc @@ -81,7 +81,7 @@ bool SectionPerfcounter::produceOutputInner(std::ostream &out, instance_name = instance_names[instance_values.first]; } out << to_utf8(instance_name.c_str()) << "," - << to_utf8(join(instance_values.second, L",").c_str()); + << to_utf8(join(instance_values.second, L",").c_str()) << "\n"; } } catch (const std::exception &e) { crash_log("Exception: %s", e.what()); diff --git a/agents/windows/sections/SectionSkype.cc b/agents/windows/sections/SectionSkype.cc index f6492da..a9cacd2 100644 --- a/agents/windows/sections/SectionSkype.cc +++ b/agents/windows/sections/SectionSkype.cc @@ -25,9 +25,10 @@ #include "SectionSkype.h" #include "SectionPerfcounter.h" -SectionSkype::SectionSkype() { +SectionSkype::SectionSkype() : SectionGroup("skype") { withToggleIfMissing(); withNestedSubtables(); + withSeparator(','); for (LPCWSTR data_source : {L"LS:WEB - Address Book Web Query",