Module: check_mk
Branch: master
Commit: e983bfcbb1b67d25f9fd2a06d59f59fd48c3a9ae
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e983bfcbb1b67d…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Fri Oct 10 11:41:31 2014 +0200
FIX for case when disk is removed from the device, thanks to Marcel Schulte
---
checks/diskstat.include | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/checks/diskstat.include b/checks/diskstat.include
index a095b8a..6543833 100644
--- a/checks/diskstat.include
+++ b/checks/diskstat.include
@@ -234,7 +234,9 @@ def check_diskstat_generic(item, params, this_time, info, mode='sectors'):
result = check_diskstat_line(this_time, item, params, line, mode)
else:
result = (2, "more than one device found in cluster")
- return result
+
+ if result != "":
+ return result
return (3, "device missing")
Module: check_mk
Branch: master
Commit: 6856f5fcb4584feb1363ac1f95ac6d9b4ce378a5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6856f5fcb4584f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 10 11:36:44 2014 +0200
#1125 FIX EC actions couldn't get saved when a EC rule had "Send monitoring notification" set
This lead to the warning<br>
<tt>You are missing the action with the ID @NOTIFY which is still used in some rules</tt>
---
.werks/1125 | 10 ++++++++++
ChangeLog | 1 +
mkeventd/web/plugins/wato/mkeventd.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1125 b/.werks/1125
new file mode 100644
index 0000000..05e6dc2
--- /dev/null
+++ b/.werks/1125
@@ -0,0 +1,10 @@
+Title: EC actions couldn't get saved when a EC rule had "Send monitoring notification" set
+Level: 1
+Component: ec
+Compatible: compat
+Version: 1.2.5i6
+Date: 1412933594
+Class: fix
+
+This lead to the warning<br>
+<tt>You are missing the action with the ID @NOTIFY which is still used in some rules</tt>
diff --git a/ChangeLog b/ChangeLog
index b38b8cc..3e77fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,6 +157,7 @@
* 1399 FIX: Fix left-over tac processes when showing Event Console history...
* 1402 FIX: Fixed cased where counting events did not reach required count...
* 1124 FIX: WATO EC configuration: no longer raises an exception when user has restricted WATO access...
+ * 1125 FIX: EC actions couldn't get saved when a EC rule had "Send monitoring notification" set...
HW/SW-Inventory:
* 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path...
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index 6ea1e41..81304c4 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -88,7 +88,7 @@ class ActionList(ListOf):
rules = load_mkeventd_rules()
for rule in rules:
for action_id in rule.get("actions", []):
- if action_id not in action_ids:
+ if action_id not in action_ids + ["@NOTIFY"]:
raise MKUserError(varprefix, _("You are missing the action with the ID <b>%s</b>, "
"which is still used in some rules.") % action_id)
Module: check_mk
Branch: master
Commit: 9dcfe7b5bd842fd821b375664e03ac6f2faf2b9f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dcfe7b5bd842f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Oct 9 16:38:57 2014 +0200
#1124 FIX WATO EC configuration: no longer raises an exception when user has restricted WATO access
An exception happened, when a user had restricted WATO permissions, but was allowed to edit the WATO EC configuration.
The following role settings caused this error:<br>
<br>
<tt>WATO - Check_MK's Web Administration Tool -> Read access to all modules.... -> No</tt><br>
and<br>
<tt>Event Console -> Configuration of event rules -> Yes</tt>
---
.werks/1124 | 14 ++++++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 4 +++-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/.werks/1124 b/.werks/1124
new file mode 100644
index 0000000..f27ae7c
--- /dev/null
+++ b/.werks/1124
@@ -0,0 +1,14 @@
+Title: WATO EC configuration: no longer raises an exception when user has restricted WATO access
+Level: 1
+Component: ec
+Compatible: compat
+Version: 1.2.5i6
+Date: 1412864930
+Class: fix
+
+An exception happened, when a user had restricted WATO permissions, but was allowed to edit the WATO EC configuration.
+The following role settings caused this error:<br>
+<br>
+<tt>WATO - Check_MK's Web Administration Tool -> Read access to all modules.... -> No</tt><br>
+and<br>
+<tt>Event Console -> Configuration of event rules -> Yes</tt>
diff --git a/ChangeLog b/ChangeLog
index 5bc5c41..b38b8cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -156,6 +156,7 @@
* 1007 FIX: check_mkevents: fix case where events contain binary zeroes
* 1399 FIX: Fix left-over tac processes when showing Event Console history...
* 1402 FIX: Fixed cased where counting events did not reach required count...
+ * 1124 FIX: WATO EC configuration: no longer raises an exception when user has restricted WATO access...
HW/SW-Inventory:
* 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a4cf757..b0fea5a 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -214,7 +214,9 @@ def page_handler():
# Check general permission for this mode
if modeperms != None and not config.may("wato.seeall"):
for pname in modeperms:
- config.need_permission("wato." + pname)
+ if '.' not in pname:
+ pname = "wato." + pname
+ config.need_permission(pname)
# Do actions (might switch mode)
action_message = None