Module: check_mk
Branch: master
Commit: 8c1951e986f45eb59c986dcdaa414a799c5ddbc8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c1951e986f45e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed May 4 13:49:56 2016 +0200
3564 FIX logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set
to "No forwarding"
---
.werks/3564 | 10 ++++++++++
ChangeLog | 1 +
checks/logwatch | 5 +++--
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/3564 b/.werks/3564
new file mode 100644
index 0000000..31a0ca8
--- /dev/null
+++ b/.werks/3564
@@ -0,0 +1,10 @@
+Title: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to
"No forwarding"
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1462362572
+
+
diff --git a/ChangeLog b/ChangeLog
index 21ca68c..3d02302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -206,6 +206,7 @@
* 3456 FIX: bluecoat_diskcpu: Fixed visualization of graph
* 3467 FIX: logwatch: fix exception in case the logfile name contains non-ascii
characters
* 3563 FIX: fortigate_sslvpn: Fixed broken manpage
+ * 3564 FIX: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule
is set to "No forwarding"
Multisite:
* 3187 notification view: new filter for log command via regex
diff --git a/checks/logwatch b/checks/logwatch
index ea52ed3..89da133 100644
--- a/checks/logwatch
+++ b/checks/logwatch
@@ -634,8 +634,9 @@ def inventory_logwatch_ec(info, one_svc_per_log):
merged_rules = {}
for rule in forward_settings[-1::-1]:
- for key, value in rule.items():
- merged_rules[key] = value
+ if type(rule) == dict:
+ for key, value in rule.items():
+ merged_rules[key] = value
separate_checks = merged_rules.get("separate_checks", False)
if separate_checks != one_svc_per_log: