Module: check_mk
Branch: master
Commit: b7401aa83458297072518d12ba16f107afd0200a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7401aa8345829…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Mar 2 13:32:23 2015 +0100
#2049 FIX window agents: prevent errors with invalid plugin output
Plugins with invalid output no longer impair preceding (usually logwatch)
and following (usually local) sections.
---
.werks/2049 | 11 +++++++++++
ChangeLog | 1 +
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 212480 -> 300032 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 212480 -> 300032 bytes
agents/windows/check_mk_agent.cc | 3 +++
agents/windows/check_mk_agent.exe | Bin 181760 -> 181760 bytes
agents/windows/check_mk_agent.msi | Bin 628224 -> 716288 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 181760 -> 181760 bytes
agents/windows/install_agent-64.exe | Bin 162045 -> 177830 bytes
agents/windows/install_agent.exe | Bin 158775 -> 158790 bytes
11 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/.werks/2049 b/.werks/2049
new file mode 100644
index 0000000..cbc3982
--- /dev/null
+++ b/.werks/2049
@@ -0,0 +1,11 @@
+Title: window agents: prevent errors with invalid plugin output
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i1
+Date: 1425299233
+Class: fix
+
+Plugins with invalid output no longer impair preceding (usually logwatch)
+and following (usually local) sections.
+
diff --git a/ChangeLog b/ChangeLog
index a038452..7426576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -214,6 +214,7 @@
* 1224 FIX: Fixed rare Bug in case of clusterd network interfaces...
* 2079 FIX: freebsd agent: Was unable to find ntpq command with FreeBSD10...
* 2082 FIX: jolokia_metrics.mem: Fixed levels on total memory usage
+ * 2049 FIX: window agents: prevent errors with invalid plugin output...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/agents/windows/build_version b/agents/windows/build_version
index a57f6ce..c8b255f 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-131
+135
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 1c811db..8b2ce71 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 1a1f94b..47692f8 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 2ac7a08..b49497d 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -3229,8 +3229,11 @@ void section_local(SOCKET &out)
void section_plugins(SOCKET &out)
{
+ // Prevent errors from plugins with missing section
output(out, "<<<>>>\n");
output_external_programs(out, PLUGIN);
+ // Prevent errors from plugins with missing final newline
+ output(out, "<<<>>>\n");
}
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index d1093b3..36c527a 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 dd96fb7..c0f3b80 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 1422526..8593dd1 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 fe99923..812e260 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 eac4305..34ec659 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ