Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

Check_MK Git: check_mk: Fix bulk notifications: would call non-bulk, too

by Mathias Kettner

Module: check_mk Branch: master Commit: 6350f2b4ef62bfe7e535f724fd8da4340d6a79b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6350f2b4ef62bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 7 11:14:04 2014 +0100 Fix bulk notifications: would call non-bulk, too --- modules/notify.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index bc30f0f..aae996d 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -479,7 +479,8 @@ def notify_rulebased(raw_context, analyse=False): do_bulk_notify(contact, plugin, params, plugin_context, bulk) elif notification_spooling: create_spoolfile({"context": plugin_context, "plugin": plugin}) - call_notification_script(plugin, plugin_context) + else: + call_notification_script(plugin, plugin_context) except Exception, e: if opt_debug: @@ -862,7 +863,8 @@ def notify_flexible(raw_context, notification_table): if notification_spooling: create_spoolfile({"context": plugin_context, "plugin": plugin}) - call_notification_script(plugin, plugin_context) + else: + call_notification_script(plugin, plugin_context) # may return # 0 : everything fine -> proceed @@ -1392,6 +1394,12 @@ def notify_bulk(dirname, uuids): for varname, value in context.items(): bulk_context.append("%s=%s\n" % (varname, value)) + # Do not forget to add this to the monitoring log. We create + # a single entry for each notification contained in the bulk. + # It is important later to have this precise information. + plugin_name = "bulk " + (plugin or "plain email") + core_notification_log(plugin_name, context) + parameter_context = [ "PARAMETERS=" + " ".join(old_params) + "\n" ] for nr, param in enumerate(old_params): parameter_context.append("PARAMETER_%d=%s\n" % (nr + 1, param))

10 years, 4 months

Check_MK Git: check_mk: Notifications: added actual notifications to monitoring history

by Mathias Kettner

Module: check_mk Branch: master Commit: 26629e69a30a91e879f950dc9e670a4cb9e52a8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26629e69a30a91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 7 11:00:29 2014 +0100 Notifications: added actual notifications to monitoring history --- modules/notify.py | 88 ++++++++++++++++++++++++++++++----------- web/htdocs/wato.py | 1 + web/plugins/views/builtin.py | 5 +++ web/plugins/views/painters.py | 6 +++ 4 files changed, 77 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26629e69a3…

10 years, 4 months

Check_MK Git: check_mk: BI: Added option ignore stataes to worst/ best aggregation functions (only internal atm)

by Lars Michelsen

Module: check_mk Branch: master Commit: c11a9c8455f62e016e50fba21c3dec6288907490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c11a9c8455f62e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 7 09:05:14 2014 +0100 BI: Added option ignore stataes to worst/best aggregation functions (only internal atm) --- web/htdocs/bi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 0e2063c..1ac5558 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1202,8 +1202,8 @@ def x_best_state(l, x): return ll[n-1][1] -def aggr_nth_state(nodelist, n, worst_state): - states = [ i[0]["state"] for i in nodelist ] +def aggr_nth_state(nodelist, n, worst_state, ignore_states = None): + states = [ i[0]["state"] for i in nodelist if not ignore_states or i[0]["state"] not in ignore_states ] state = x_best_state(states, n) # limit to worst state @@ -1212,11 +1212,11 @@ def aggr_nth_state(nodelist, n, worst_state): return { "state" : state, "output" : "" } -def aggr_worst(nodes, n = 1, worst_state = CRIT): - return aggr_nth_state(nodes, -int(n), int(worst_state)) +def aggr_worst(nodes, n = 1, worst_state = CRIT, ignore_states = None): + return aggr_nth_state(nodes, -int(n), int(worst_state), ignore_states) -def aggr_best(nodes, n = 1, worst_state = CRIT): - return aggr_nth_state(nodes, int(n), int(worst_state)) +def aggr_best(nodes, n = 1, worst_state = CRIT, ignore_states = None): + return aggr_nth_state(nodes, int(n), int(worst_state), ignore_states) config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best

10 years, 4 months

Check_MK Git: check_mk: RBN: implement throttling of periodic notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 1e6f0062e09af1fd5ab58c6c80ad1e08074a5620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e6f0062e09af1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 6 18:31:21 2014 +0100 RBN: implement throttling of periodic notifications --- modules/notify.py | 37 +++++++++++++++++++++++++------------ web/htdocs/wato.py | 30 ++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 14 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 058b278..caef69f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -583,18 +583,19 @@ def rbn_match_rule(rule, context): return "This rule is disabled" return \ - rbn_match_folder(rule, context) or \ - rbn_match_hosttags(rule, context) or \ - rbn_match_hosts(rule, context) or \ - rbn_match_exclude_hosts(rule, context) or \ - rbn_match_services(rule, context) or \ - rbn_match_exclude_services(rule, context) or \ - rbn_match_plugin_output(rule, context) or \ - rbn_match_checktype(rule, context) or \ - rbn_match_timeperiod(rule) or \ - rbn_match_escalation(rule, context) or \ - rbn_match_servicelevel(rule, context) or \ - rbn_match_host_event(rule, context) or \ + rbn_match_folder(rule, context) or \ + rbn_match_hosttags(rule, context) or \ + rbn_match_hosts(rule, context) or \ + rbn_match_exclude_hosts(rule, context) or \ + rbn_match_services(rule, context) or \ + rbn_match_exclude_services(rule, context) or \ + rbn_match_plugin_output(rule, context) or \ + rbn_match_checktype(rule, context) or \ + rbn_match_timeperiod(rule) or \ + rbn_match_escalation(rule, context) or \ + rbn_match_escalation_throtte(rule, context) or \ + rbn_match_servicelevel(rule, context) or \ + rbn_match_host_event(rule, context) or \ rbn_match_service_event(rule, context) @@ -708,6 +709,18 @@ def rbn_match_escalation(rule, context): return "The notification number %d does not lie in range %d ... %d" % ( notification_number, from_number, to_number) +def rbn_match_escalation_throtte(rule, context): + if "match_escalation_throttle" in rule: + from_number, rate = rule["match_escalation_throttle"] + if context["WHAT"] == "HOST": + notification_number = int(context.get("HOSTNOTIFICATIONNUMBER", 1)) + else: + notification_number = int(context.get("SERVICENOTIFICATIONNUMBER", 1)) + if notification_number <= from_number: + return + if (notification_number - from_number) % rate != 0: + return "This notification is being skipped due to throttling. The next number will be %d" % \ + (notification_number + rate - ((notification_number - from_number) % rate)) def rbn_match_servicelevel(rule, context): if "match_sl" in rule: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8c04161..1839917 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7574,6 +7574,30 @@ def vs_notification_rule(userid = None): ], ), ), + ( "match_escalation_throttle", + Tuple( + title = _("Throttle periodic notifications"), + help = _("This match option allows you to throttle periodic notifications after " + "a certain number of notifications have been created by the monitoring " + "core. If you for example select 10 as the beginning and 5 as the rate " + "then you will receive the notification 1 through 10 and then 15, 20, " + "25.. and so on."), + orientation = "float", + elements = [ + Integer( + label = _("beginning from notifcation number"), + default_value = 10, + minvalue = 1, + ), + Integer( + label = _("send only every"), + default_value = 5, + unit = _("th notification"), + minvalue = 1, + ) + ], + ) + ), ( "match_sl", Tuple( title = _("Match service level"), @@ -7702,7 +7726,8 @@ def vs_notification_rule(userid = None): ], optional_keys = [ "match_folder", "match_hosttags", "match_hosts", "match_exclude_hosts", "match_services", "match_exclude_services", "match_plugin_output", - "match_timeperiod", "match_escalation", "match_sl", "match_host_event", "match_service_event", + "match_timeperiod", "match_escalation", "match_escalation_throttle", + "match_sl", "match_host_event", "match_service_event", "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails" ], headers = [ ( _("General Properties"), [ "description", "disabled", "allow_disable" ] ), @@ -7712,7 +7737,8 @@ def vs_notification_rule(userid = None): ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hosts", "match_exclude_hosts", "match_services", "match_exclude_services", "match_plugin_output", "match_checktype", "match_timeperiod", - "match_escalation", "match_sl", "match_host_event", "match_service_event" ] ), + "match_escalation", "match_escalation_throttle", + "match_sl", "match_host_event", "match_service_event" ] ), ], render = "form", form_narrow = True,

10 years, 4 months

Check_MK Git: check_mk: FIX cmc: fixed bug displaying logentries after a logfile rotation

by Andreas Boesl

Module: check_mk Branch: master Commit: d825effcc58fcef0ff4f390e45038adfef90902d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d825effcc58fce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 6 16:56:26 2014 +0100 FIX cmc: fixed bug displaying logentries after a logfile rotation The Check_MK microcore didn't cleanup cached logfiles correctly. Thus caused missing logentries, when accessing views like "Host and Service Events" or "Search global logfile". The logentries itself were not lost, just unavailable in views. The problem could be fixed by restarting (not reloading) the cmc. --- .werks/730 | 14 ++++++++++++++ ChangeLog | 1 + livestatus/src/LogCache.cc | 14 +++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/730 b/.werks/730 new file mode 100644 index 0000000..4fe49e4 --- /dev/null +++ b/.werks/730 @@ -0,0 +1,14 @@ +Title: cmc: fixed bug displaying logentries after a logfile rotation +Level: 2 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1394120989 + +The Check_MK microcore didn't cleanup cached logfiles correctly. +Thus caused missing logentries, when accessing views like +"Host and Service Events" or "Search global logfile". + +The logentries itself were not lost, just unavailable in views. +The problem could be fixed by restarting (not reloading) the cmc. diff --git a/ChangeLog b/ChangeLog index 9dd39a4..5559426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 0682 FIX: Allow overriding of active and custom checks by more specific rule... * 0267 FIX: Fixed auth.serials permission problem in check_mk standalone installation... * 0282 FIX: TIMEPERIOD TRANSITION messages no longer cut at 64 bytes... + * 0730 FIX: cmc: fixed bug displaying logentries after a logfile rotation... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 9261be8..900ce25 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -38,10 +38,18 @@ #include "LogEntry.h" #include "LogCache.h" +#ifdef CMC +#include "Core.h" +extern Core *g_core; +#else +extern time_t last_log_rotation; +#endif // CMC + + + #define CHECK_MEM_CYCLE 1000 /* Check memory every N'th new message */ // watch nagios' logfile rotation -extern time_t last_log_rotation; extern int g_debug_level; extern char *log_archive_path; extern char *log_file; @@ -108,7 +116,11 @@ bool LogCache::logCachePreChecks() // Has Nagios rotated logfiles? => Update // our file index. And delete all memorized // log messages. + #ifdef CMC + if (g_core->_last_logfile_rotation > _last_index_update) { + #else if (last_log_rotation > _last_index_update) { + #endif logger(LG_INFO, "Nagios has rotated logfiles. Rebuilding logfile index"); forgetLogfiles(); updateLogfileIndex();

10 years, 4 months

Check_MK Git: check_mk: Removed obsolete draft ( because now it is implemented)

by Mathias Kettner

Module: check_mk Branch: master Commit: 67fcafe8529d4aa461d152101dacad9ed75b9e20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67fcafe8529d4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 6 16:56:34 2014 +0100 Removed obsolete draft (because now it is implemented) --- doc/drafts/README.bulk_notifications | 102 ---------------------------------- 1 file changed, 102 deletions(-) diff --git a/doc/drafts/README.bulk_notifications b/doc/drafts/README.bulk_notifications deleted file mode 100644 index ac4b76a..0000000 --- a/doc/drafts/README.bulk_notifications +++ /dev/null @@ -1,102 +0,0 @@ -BULK NOTIFICATIONS ------------------- -The idea of "bulk notifications" or "notification aggregation" is to cut -down the number of notifications in cases where some general problem causes -hundreds or thousands of similar alerts at the same time. In some cases this -problem can be tackled with Nagios "service dependencies". The problem is -that this is very tedious to configure and includes the risk of blocking -critical notification per mistake. - -The bulk notification feature would collect all notifications of the same -channel and target user for a certain time into a pool and then send *one* -notification email/sms/whatever that contains all those notifications. A -typical time frame of such a pooling could be 1 minute. Assuming that your -check period is one minute, that would mean that all alerts that origin from -the same problem would be packed into one single notification. - -In order to make you not blind to *other* problems that happen during such a -burst of alerts the pooling could be done on a per-checktype or per-hostgroup -or per-whatever base. It also could take the service level of objects into -account so that e.g. all alerts of the level "Tier 3" is bulked by 5 minutes, -the alerts of "Tier 1" would not be bulked by sent independently. - -The configuration of the notification aggregation could be done as a parameter -to the notification rules. Example: - -Condition: -- Service Level <= 10 (Tier 3) - -Notification: -- Send to all configured monitoring contacts -- Send via Email - -Aggregation: - - time range (e.g. collect notifications up to 2 minutes) - - force separate notification bulks for different - [ ] hosts - [ ] check types - [ ] states (WARN, CRIT, etc.) - [ ] service descriptions - [ ] service levels - - -OVERRIDING ----------- -If there is a global rule that configures a notification without aggregation, -then a later rule can override that and add an aggregation. That way a user -can enable bulk notifications for otherwise un-bulked ones. - -Vice versa: if in a rule notifications are aggregated and a later rule -(e.g. one of a user) has aggregation disabled, that setting has precedence. - - -IMPLEMENTATION --------------- -We implement the bulk notifications as an addition to the "rule -based notifications." - -A) WATO - -[1] Each positive notification rule has some new options for bulking - [x] Enable bulk notifications - - Bulk up to [__0] days [_0] hours [10] minutes [_0] seconds - - Bulk up to [__100] notifications - - Force separate notifications for different - [X] Hosts - [ ] Check types - [ ] Service Levels - -[2] Complain if the selected plugin does not support bulking. - -[3] Extend the API of the notification plugins so that bulking - ability can be detected by WATO. - -B) NOTIFICATION - -[11] The bulk options are stored as an additional parameter in the notification - table. Later rules that trigger the same check plugin override these options. - That way a user can enable bulking if its globally turned off or vice versa. - -[12] If a plugin is being called with bulk notifications on, then - a) compute a unique name for the bulk. This takes into account - the separation options. - b) compute the path of a directory below var/check_mk/notify/bulk/$USER and - create it if its missing - c) add a file into that directory that contains the notification context - d) If the directory was new then also add some general information needed later - -C) NOTIFICATION SPOOLER -The bulk notifications require the notification spooler, since asynchronous -actions need to be done (i.e. sending the actual notification after the timeout) - -[21] Create a regular scan of the bulk directories - -[22] Detect wheter a bulk is "ripe". - -[23] In that case call the notification plugin matching the bulk and send the notification - context via stdin - -D) NOTIFICATION PLUGINS - -[31] Implement bulking for the HTML emails -

10 years, 4 months

Check_MK Git: check_mk: RBN: Fix rule anaysis, allow disable bulking by later rule

by Mathias Kettner

Module: check_mk Branch: master Commit: 885c2ba5211dfe9bc65e81d1cddce865741c9f5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=885c2ba5211dfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 6 16:49:57 2014 +0100 RBN: Fix rule anaysis, allow disable bulking by later rule --- doc/treasures/mknotifyd | 5 ----- modules/notify.py | 13 +++++++------ web/htdocs/wato.py | 31 +++++++++++++++++++++++-------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index b60f791..215c8cb 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -573,8 +573,3 @@ try: except Exception, e: bail_out(e) - - - - - diff --git a/modules/notify.py b/modules/notify.py index f57e5be..058b278 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -216,7 +216,7 @@ def notify_notify(raw_context, analyse=False): if not also_local: return - locally_deliver_raw_context(raw_context, analyse=analyse) + return locally_deliver_raw_context(raw_context, analyse=analyse) # Here we decide which notification implementation we are using. @@ -239,8 +239,7 @@ def locally_deliver_raw_context(raw_context, analyse=False): if not contactname or contactname == "check-mk-notify": # 1. RULE BASE NOTIFICATIONS notify_log("Preparing rule based notifications") - notify_rulebased(raw_context, analyse=analyse) - return + return notify_rulebased(raw_context, analyse=analyse) if analyse: return # Analysis only possible when rule based notifications are enabled @@ -283,7 +282,7 @@ def notification_analyse_backlog(nr): global notify_mode notify_mode = "replay" raw_context = raw_context_from_backlog(nr) - notify_notify(raw_context, analyse=True) + return notify_notify(raw_context, analyse=True) #. @@ -432,7 +431,7 @@ def notify_rulebased(raw_context, analyse=False): key = contact, plugin plugintxt = plugin or "plain email" if key in notifications: - locked, method, bulk = notifications[key] + locked, method, old_bulk = notifications[key] if locked and "contact" in rule: notify_log(" - cannot modify notification of %s via %s: it is locked" % (contact, plugintxt)) continue @@ -466,7 +465,9 @@ def notify_rulebased(raw_context, analyse=False): verb = "would notify" else: verb = "notifying" - notify_log(" * %s %s via %s, parameters: %s" % (verb, contact, (plugin or "plain email"), ", ".join(params))) + notify_log(" * %s %s via %s, parameters: %s, bulk: %s" % ( + verb, contact, (plugin or "plain email"), params and ", ".join(params) or "(no parameters)", + bulk and "yes" or "no")) plugin_info.append((contact, plugin, params, bulk)) # for analysis try: rbn_add_contact_information(raw_context, contact) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index da05672..8c04161 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7735,7 +7735,8 @@ def validate_notification_rule(rule, varprefix): _("The plain emails currently do not support bulking.")) -def render_notification_rules(rules, userid="", show_title=False, show_buttons=True, analyse=False, start_nr=0, profilemode=False): +def render_notification_rules(rules, userid="", show_title=False, show_buttons=True, + analyse=False, start_nr=0, profilemode=False): if not rules: html.message(_("You have not created any rules yet.")) @@ -7779,12 +7780,12 @@ def render_notification_rules(rules, userid="", show_title=False, show_buttons=T listmode = "notifications" if show_buttons: - analyse = html.var("analyse", "") + anavar = html.var("analyse", "") delete_url = make_action_link([("mode", listmode), ("user", userid), ("_delete", nr)]) - top_url = make_action_link([("mode", listmode), ("analyse", analyse), ("user", userid), ("_move", nr), ("_where", 0)]) - bottom_url = make_action_link([("mode", listmode), ("analyse", analyse), ("user", userid), ("_move", nr), ("_where", len(rules)-1)]) - up_url = make_action_link([("mode", listmode), ("analyse", analyse), ("user", userid), ("_move", nr), ("_where", nr-1)]) - down_url = make_action_link([("mode", listmode), ("analyse", analyse), ("user", userid), ("_move", nr), ("_where", nr+1)]) + top_url = make_action_link([("mode", listmode), ("analyse", anavar), ("user", userid), ("_move", nr), ("_where", 0)]) + bottom_url = make_action_link([("mode", listmode), ("analyse", anavar), ("user", userid), ("_move", nr), ("_where", len(rules)-1)]) + up_url = make_action_link([("mode", listmode), ("analyse", anavar), ("user", userid), ("_move", nr), ("_where", nr-1)]) + down_url = make_action_link([("mode", listmode), ("analyse", anavar), ("user", userid), ("_move", nr), ("_where", nr+1)]) suffix = profilemode and "_p" or "" edit_url = make_link([("mode", "notification_rule" + suffix), ("edit", nr), ("user", userid)]) clone_url = make_link([("mode", "notification_rule" + suffix), ("clone", nr), ("user", userid)]) @@ -8027,7 +8028,7 @@ def mode_notifications(phase): table.end() # Do analysis - if html.has_var("analyse"): + if html.var("analyse"): nr = int(html.var("analyse")) analyse = check_mk_local_automation("notification-analyse", [str(nr)], None) else: @@ -14432,7 +14433,8 @@ def page_user_profile(): def create_sample_config(): if os.path.exists(multisite_dir + "hosttags.mk") \ or os.path.exists(root_dir + "rules.mk") \ - or os.path.exists(root_dir + "groups.mk"): + or os.path.exists(root_dir + "groups.mk") \ + or os.path.exists(root_dir + "notifications.mk"): return # A contact group where everyone is member of @@ -14500,6 +14502,19 @@ def create_sample_config(): save_rulesets(g_root_folder, rulesets) + notification_rules = [{ + 'allow_disable' : True, + 'contact_all' : False, + 'contact_all_with_email' : False, + 'contact_object' : True, + 'description' : 'Notify all contacts of a host/service via HTML email', + 'disabled' : False, + 'notify_method' : [], + 'notify_plugin' : 'mail' + }] + save_notification_rules(notification_rules) + + # Make sure the host tag attributes are immediately declared! config.wato_host_tags = wato_host_tags config.wato_aux_tags = wato_aux_tags

10 years, 4 months

Check_MK Git: check_mk: Major internal cleanup of notification code

by Mathias Kettner

Module: check_mk Branch: master Commit: 09fad9b4b9b08134d594f4731d241de62d108b59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09fad9b4b9b081… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 6 15:13:01 2014 +0100 Major internal cleanup of notification code --- doc/Notifications.png | Bin 0 -> 64105 bytes doc/Notifications.svg | 800 +++++++++++++++++ doc/treasures/mknotifyd | 28 +- mkeventd/web/plugins/wato/mkeventd.py | 28 +- modules/notify.py | 1591 ++++++++++++++++----------------- notifications/mail | 4 + notifications/sms | 7 +- web/htdocs/wato.py | 16 +- web/plugins/wato/mknotifyd.py | 15 +- 9 files changed, 1638 insertions(+), 851 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=09fad9b4b9…

10 years, 4 months

Check_MK Git: check_mk: Fix remote spooling with RBN

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a796a4ce657aadd7e9b0e5b4a0519f5838bc442 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a796a4ce657aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 6 16:16:04 2014 +0100 Fix remote spooling with RBN --- doc/treasures/mknotifyd | 9 +++++---- modules/notify.py | 12 ++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 4b75d8a..b60f791 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -239,6 +239,7 @@ class TcpServer: client_data = "" chunk_count = 0 client_socket, addr_info = s.accept() + from_name = "%s:%s" % addr_info while True: try: data_ready = select.select([client_socket], [], [], 2)[0] @@ -254,21 +255,21 @@ class TcpServer: break # Error while reading if opt_verbose > 1: - verbose("Received notification %d from %s in %d chunks" % ( handled_connections, pprint.pformat(addr_info), chunk_count), 2) + verbose("Received notification %d from %s in %d chunks" % ( handled_connections, from_name, chunk_count), 2) handled_connections = handled_connections + 1 try: content = pickle.loads(client_data) - del content["forward"] if not os.path.exists(g_spool_dir): os.makedirs(g_spool_dir) - spoolfile = "%s/%s" % uuid.uuid1() + spoolfile = "%s/%s" % (g_spool_dir, uuid.uuid1()) file(spoolfile,"w").write(pprint.pformat(content)) verbose("client data processed - sending OK", 2) client_socket.send("OK") except Exception, e: - log("Error processing data from %s" % pprint.pformat(addr_info)) + + log("Error processing data from %s: %s\n%s" % (from_name, e, format_exception())) try: if client_socket: client_socket.send("ERROR") diff --git a/modules/notify.py b/modules/notify.py index 590058f..f57e5be 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -544,7 +544,15 @@ def rbn_add_contact_information(raw_context, contact): if key[0] == '_': raw_context["CONTACT" + key.upper()] = contact[key] else: - contact_dict = contacts.get(contact, { "name" : contact, "alias" : contact }) + if contact.startswith("mailto:"): # Fake contact + contact_dict = { + "name" : contact[7:].split("@")[0], + "alias" : "Email address " + contact, + "email" : contact[7:], + "pager" : "" } + else: + contact_dict = contacts.get(contact, { "name" : contact, "alias" : contact }) + rbn_add_contact_information(raw_context, contact_dict) @@ -1186,7 +1194,7 @@ def handle_spoolfile(spoolfile): # several or no actual plugins. notify_log("Got spool file from remote host for local delivery.") raw_context = data["context"] - locally_deliver_plugin_context(data["context"]) + locally_deliver_raw_context(data["context"]) return 0 # No error handling for async delivery except Exception, e:

10 years, 4 months

Check_MK Git: check_mk: FIX ldap sync: syncing if rules against ldap is not longer case sensitiv

by Bastian Kuhn

Module: check_mk Branch: master Commit: d9505a504ec082a6c4dba542c03fb089bc18855d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9505a504ec082… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 6 15:26:14 2014 +0100 FIX ldap sync: syncing if rules against ldap is not longer case sensitiv --- .werks/139 | 9 +++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/139 b/.werks/139 new file mode 100644 index 0000000..067499e --- /dev/null +++ b/.werks/139 @@ -0,0 +1,9 @@ +Title: ldap sync: syncing if rules against ldap is not longer case sensitiv +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1394115867 + + diff --git a/ChangeLog b/ChangeLog index dfb73c0..9dd39a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -306,6 +306,7 @@ * 0559 FIX: WATO snapshots: improved validation of (uploaded) snapshots... * 0709 FIX: Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO * 0728 FIX: mem.win: fixed bug in WATO configuration rule... + * 0139 FIX: ldap sync: syncing if rules against ldap is not longer case sensitiv Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 31e1ced..3351bb2 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -875,7 +875,7 @@ ldap_attribute_plugins['groups_to_contactgroups'] = { def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): # Load the needed LDAP groups, which match the DNs mentioned in the role sync plugin config - ldap_groups = dict(ldap_group_members([ dn for role_id, dn in params.items() if isinstance(dn, str) ], + ldap_groups = dict(ldap_group_members([ dn.lower() for role_id, dn in params.items() if isinstance(dn, str) ], filt_attr = 'distinguishedname', nested = params.get('nested', False))) roles = set([])

10 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014