Module: check_mk
Branch: master
Commit: 5ee336a0085f3647a4eb052b0fd8a3e3485d3c2f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ee336a0085f36…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Mar 14 13:43:46 2016 +0100
3008 FIX Fixed logwatch exception in config generation when using Nagios
---
.werks/3008 | 9 +++++++++
ChangeLog | 1 +
modules/nagios.py | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/3008 b/.werks/3008
new file mode 100644
index 0000000..5c49298
--- /dev/null
+++ b/.werks/3008
@@ -0,0 +1,9 @@
+Title: Fixed exception in logwatch config generation when using Nagios
+Level: 1
+Component: core
+Compatible: compat
+Version: 1.2.9i1
+Date: 1457959319
+Class: fix
+
+The config generation failed when the logwatch item had special characters.
diff --git a/ChangeLog b/ChangeLog
index 0e4d81d..5f9308e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
* 3234 FIX: Make unixcat more robust...
* 3275 FIX: Piggyback based services were skipped on "No agent hosts"...
* 3286 FIX: Fixing possible logging issues when using datasource programs for
monitoring...
+ * 3008 FIX: Fixed exception in logwatch config generation when using Nagios...
Checks & Agents:
* 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an
Aruba Network WLAN Controller
diff --git a/modules/nagios.py b/modules/nagios.py
index 1bad72d..bc43972 100644
--- a/modules/nagios.py
+++ b/modules/nagios.py
@@ -308,7 +308,7 @@ define servicedependency {
# Hardcoded for logwatch check: Link to logwatch.php
if checkname == "logwatch":
- logwatch = " notes_url\t\t\t" + (logwatch_notes_url %
(urllib.quote(hostname), urllib.quote(item))) + "\n"
+ logwatch = " notes_url\t\t\t" + (logwatch_notes_url %
(urllib.quote(hostname), urllib.quote(make_utf8(item)))) + "\n"
else:
logwatch = "";