[checkmk-commits] Check_MK Git: check_mk: Predefine some service levels in the defaut configuration

Module: check_mk Branch: master Commit: 7d92b33efbd2931a77d0c5ffc6447abec2050a53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d92b33efbd293… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 17:41:04 2014 +0100 Predefine some service levels in the defaut configuration --- .bugs/812 | 8 ++++++-- .bugs/818 | 7 +++++-- mkeventd/web/plugins/config/mkeventd.py | 6 ++++++ web/plugins/wato/globals_notification.py | 7 ++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.bugs/812 b/.bugs/812 index 50de5b9..704b99a 100644 --- a/.bugs/812 +++ b/.bugs/812 @@ -1,9 +1,9 @@ Title: Windows fileinfo gets invetorized without escaping backslashes Component: checks -State: open +Class: nastiness +State: done Date: 2012-11-20 15:16:48 Targetversion: 1.4.0 -Class: nastiness The fileinfo check does not escape backslashes upon inventory. resulting items would be i.e. c:\windows\test.ini WATO on the other hand does escape them, @@ -15,3 +15,7 @@ interprets texts as regular expressions (which again interprets backslashes!) Resolution: We put a nice icon into each text input that is being interpreted as regex. When you hover over the icon (or click on it?) you get a help page about regular expressions with nice examples etc. + +2014-12-05 17:20:07: changed state open -> done +When creating rules WATO now escapes regex-chars, so this should e +no problem. diff --git a/.bugs/818 b/.bugs/818 index 92a3d8e..8a9565d 100644 --- a/.bugs/818 +++ b/.bugs/818 @@ -1,9 +1,9 @@ Title: check_mk_agent can incorrectly detect postfix on RHEL Component: core -State: open +Class: nastiness +State: done Date: 2012-10-24 10:19:40 Targetversion: 1.2.3 -Class: nastiness osTicket ID 443234 This probably happens on CentOS too, since it's so similar to RHEL. @@ -38,3 +38,6 @@ fi Resolution could be: use postqueue -p instead of mailq, check with 'which postqueue' + +2014-12-05 17:22:05: changed state open -> done +Should work now. mailq is not anylonger being used. diff --git a/mkeventd/web/plugins/config/mkeventd.py b/mkeventd/web/plugins/config/mkeventd.py index 92a60d2..9a3abd5 100644 --- a/mkeventd/web/plugins/config/mkeventd.py +++ b/mkeventd/web/plugins/config/mkeventd.py @@ -32,3 +32,9 @@ mkeventd_notify_remotehost = None mkeventd_connect_timeout = 10 debug_mkeventd_queries = False log_rulehits = False +mkeventd_service_levels = [ + (0, _("(no Service level)")), + (10, _("Silver")), + (20, _("Gold")), + (30, _("Platinum")), +] diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 3b4c930..0f73e7b 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -248,7 +248,12 @@ register_configvar(group, "Event Console when you forward notifications to it and will override the " "setting of the matching rule."), allow_empty = False, - default_value = [ (0, _("(no service level)")) ], + default_value = [ + (0, _("(no Service level)")), + (10, _("Silver")), + (20, _("Gold")), + (30, _("Platinum")), + ], ), domain = "multisite", allow_reset = False,