Module: check_mk
Branch: master
Commit: b45d153f5888b2172cdb594a2778466abf03f91a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b45d153f5888b2…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Dec 12 10:28:54 2016 +0100
4000 FIX Windows Agent: fixed broken mrpe section
This section did actually never work in 1.4.0 since the output formatting was broken...
---
.werks/4000 | 9 +++++++++
ChangeLog | 1 +
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 1326592 -> 1326592 bytes
agents/windows/check_mk_agent-64.unstripped.exe | Bin 15499902 -> 15500414 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 1326592 -> 1326592 bytes
agents/windows/check_mk_agent.exe | Bin 1302016 -> 1302016 bytes
agents/windows/check_mk_agent.msi | Bin 2898432 -> 2898432 bytes
agents/windows/check_mk_agent.unstripped.exe | Bin 13400795 -> 13400795 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 1302016 -> 1302016 bytes
agents/windows/install_agent-64.exe | Bin 585388 -> 585417 bytes
agents/windows/install_agent.exe | Bin 582214 -> 582211 bytes
agents/windows/sections/SectionMRPE.cc | 2 +-
13 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.werks/4000 b/.werks/4000
new file mode 100644
index 0000000..b680ad7
--- /dev/null
+++ b/.werks/4000
@@ -0,0 +1,9 @@
+Title: Windows Agent: fixed broken mrpe section
+Level: 2
+Component: checks
+Compatible: compat
+Version: 1.4.0i3
+Date: 1481534871
+Class: fix
+
+This section did actually never work in 1.4.0 since the output formatting was broken...
diff --git a/ChangeLog b/ChangeLog
index 6c7c35e..85e2f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@
* 4126 FIX: apache_status: Handle https requests lo localhost in case of certificate
mismatch...
* 4099 FIX: msexch_rpcclientaccess: Previously nonfunctional WATO rule and default
parameters now work...
NOTE: Please refer to the migration notes!
+ * 4000 FIX: Windows Agent: fixed broken mrpe section...
Multisite:
* 4070 Added a painter for the service check period
diff --git a/agents/windows/build_version b/agents/windows/build_version
index adcf4b8..317509b 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-2158
+2160
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index aafb5ec..025fe27 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 73c4b2d..d605670 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 249afa6..4384b94 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 f4de2cd..9acf885 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 45451d3..4c407b5 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 04ccdb8..f40765d 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 3127386..6ca635d 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 a68c464..19224a5 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 f7ef050..68fa24e 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ
diff --git a/agents/windows/sections/SectionMRPE.cc
b/agents/windows/sections/SectionMRPE.cc
index 2a334fd..6db231a 100644
--- a/agents/windows/sections/SectionMRPE.cc
+++ b/agents/windows/sections/SectionMRPE.cc
@@ -121,7 +121,7 @@ bool SectionMRPE::produceOutputInner(std::ostream &out,
_included_entries.end());
for (mrpe_entry *entry : all_entries) {
- out << "(" << entry->plugin_name << ") "
<< entry->service_description;
+ out << "(" << entry->plugin_name << ") "
<< entry->service_description << " ";
crash_log("%s (%s) %s ", entry->run_as_user, entry->plugin_name,
entry->service_description);