Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: FIX: fix new agent version check with precompiled checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 84524a4e5d6ce8cd836d68dc6e408db0995b1c62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84524a4e5d6ce8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 26 15:36:14 2014 +0100 FIX: fix new agent version check with precompiled checks Check_MK with precompiled host checks (using Nagios core) would completely fail otherwise --- modules/check_mk.py | 13 +++++++++++++ modules/check_mk_base.py | 15 +++------------ web/plugins/wato/check_mk_configuration.py | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6b05bf8..12a5a98 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -642,6 +642,16 @@ def check_interval_of(hostname, checkname): if match is None or match == checkname: return minutes # use first match +def agent_target_version(hostname): + agent_target_versions = host_extra_conf(hostname, check_mk_agent_target_versions) + if len(agent_target_versions) > 0: + if agent_target_versions[0] == "ignore": + return None + elif agent_target_versions[0] == "site": + return check_mk_version + else: + return agent_target_versions[0] + #. # .--SNMP----------------------------------------------------------------. # | ____ _ _ __ __ ____ | @@ -3404,6 +3414,9 @@ no_inventory_possible = None # Piggyback translations output.write("def get_piggyback_translation(hostname):\n return %r\n\n" % get_piggyback_translation(hostname)) + # Expected agent version + output.write("def agent_target_version(hostname):\n return %r\n\n" % agent_target_version(hostname)) + # SNMP character encoding output.write("def get_snmp_character_encoding(hostname):\n return %r\n\n" % get_snmp_character_encoding(hostname)) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d0939c1..1f502e3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -946,16 +946,7 @@ def do_check(hostname, ipaddress, only_check_types = None): start_time = time.time() - agent_target_versions = host_extra_conf(hostname, check_mk_agent_target_versions) - if len(agent_target_versions) > 0: - if agent_target_versions[0] == "ignore": - check_mk_agent_target_version = None - elif agent_target_versions[0] == "site": - check_mk_agent_target_version = check_mk_version - else: - check_mk_agent_target_version = agent_target_versions[0] - else: - check_mk_agent_target_version = None + expected_version = agent_target_version(hostname) # Exit state in various situations is confiugrable since 1.2.3i1 exit_spec = exit_code_spec(hostname) @@ -974,8 +965,8 @@ def do_check(hostname, ipaddress, only_check_types = None): elif num_errors > 0: output = "Got no information from host, " status = exit_spec.get("empty_output", 2) - elif check_mk_agent_target_version and agent_version != check_mk_agent_target_version: - output = "different agent version %s (should be %s), " % (agent_version, check_mk_agent_target_version) + elif expected_version and agent_version != expected_version: + output = "unexpected agent version %s (should be %s), " % (agent_version, expected_version) status = exit_spec.get("wrong_version", 1) elif agent_min_version and agent_version < agent_min_version: output = "old plugin version %s (should be at least %s), " % (agent_version, agent_min_version) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 13a7aa0..2f6faf7 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2228,10 +2228,10 @@ register_rule(group, " one specific version, you may set it by this rule. Agents running " " some different version return a none ok state then"), choices = [ - ("ignore", _("Ignore version")), + ("ignore", _("Ignore the version")), ("site", _("Same version as the monitoring site")), ], - otherlabel = _("Custom ->"), + otherlabel = _("Specific version"), explicit = TextAscii(allow_empty = False), default_value = "ignore", )

10 years, 6 months

Check_MK Git: check_mk: FIX Fixed printer_pages

by Bastian Kuhn

Module: check_mk Branch: master Commit: 50f27a9a08dd8254c86d0f53b64335682b76f75d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50f27a9a08dd82… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Feb 26 14:43:26 2014 +0100 FIX Fixed printer_pages The old version used a not exsisting OID who leads to a error when using inline snmp. --- .werks/137 | 9 +++++++++ ChangeLog | 1 + checks/printer_pages | 27 ++++++++------------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.werks/137 b/.werks/137 new file mode 100644 index 0000000..a2c95e2 --- /dev/null +++ b/.werks/137 @@ -0,0 +1,9 @@ +Title: Fixed printer_pages +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1393422115 + +The old version used a not exsisting OID who leads to a error when using inline snmp. diff --git a/ChangeLog b/ChangeLog index 827a421..0f87f1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -188,6 +188,7 @@ * 0584 FIX: agent_vsphere: special agent now handles non-standard https port correctly... * 0585 FIX: check_mk_agent.linux: more efficient handling of cups printer queues... * 0703 FIX: brocade_mlx: omit inventory of cpu and memory on more states... + * 0137 FIX: Fixed printer_pages... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/printer_pages b/checks/printer_pages index e4660ba..a063cbc 100644 --- a/checks/printer_pages +++ b/checks/printer_pages @@ -24,33 +24,22 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# +------------------------------------------------------------------+ -# | This file has been contributed by: | -# | | -# | Peter Lauk <lauk(a)stuttgart-airport.com> Copyright 2010 | -# +------------------------------------------------------------------+ - def inventory_printer_pages(info): - return [ (line[0], None ) for line in info ] + if len(info) > 0: + return [ (None, None) ] def check_printer_pages(item, params, info): - for line in info: - if line[0] == item: - infotext = "%d Pages printed" % int(line[1]) - perfdata = [ ( "pages", int(line[1]) ) ] - return (0, "%s" % infotext, perfdata) - - return (3, 'not found') - - - + pages = saveint(info[0][0]) + infotext = "%d Pages printed" % pages + perfdata = [ ( "pages", pages ) ] + return (0, "%s" % infotext, perfdata) check_info["printer_pages"] = { 'check_function': check_printer_pages, 'inventory_function': inventory_printer_pages, - 'service_description': 'Pages %s', + 'service_description': 'Pages', 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.2.1.43.10.2.1.4.1', [0, 1]), + 'snmp_info': ('.1.3.6.1.2.1.43.10.2.1.4.1', [ 1 ]), 'snmp_scan_function': \ lambda oid: oid(".1.3.6.1.2.1.43.10.2.1.4.1.1") != None, }

10 years, 6 months

Check_MK Git: check_mk: Updated bug entries #1091

by Mathias Kettner

Module: check_mk Branch: master Commit: 206cda8a4cfa525902caf842d47eb36324cdeca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=206cda8a4cfa52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 26 09:16:22 2014 +0100 Updated bug entries #1091 --- .bugs/1091 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1091 b/.bugs/1091 new file mode 100644 index 0000000..abb73c2 --- /dev/null +++ b/.bugs/1091 @@ -0,0 +1,11 @@ +Title: New button in host properties: "Save and add all autodetected services" +Component: core +State: open +Date: 2014-02-26 09:15:44 +Targetversion: 1.2.5i1 +Class: feature + +This button would save a few click: + +Save & Goto services +Save manual check configuration

10 years, 6 months

Check_MK Git: check_mk: RBN: Got notification through to stub function

by Mathias Kettner

Module: check_mk Branch: master Commit: e63e4dd518ce6f531b0f53d83c7029f0063143ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e63e4dd518ce6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 25 10:58:54 2014 +0100 RBN: Got notification through to stub function --- modules/notify.py | 57 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 34a07a2..95f445e 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -235,7 +235,11 @@ def handle_spoolfile(spoolfile): return 2 return 0 -def process_context(context, write_into_spoolfile, use_method = None): +def process_context(context, write_into_spoolfile): + # TODO: Do spooling right here, not on a per-plugin base + if enable_rulebased_notifications: + return notify_rulebased(context) + # Get notification settings for the contact in question - if available. method = "email" contact = contacts.get(context["CONTACTNAME"]) @@ -245,26 +249,6 @@ def process_context(context, write_into_spoolfile, use_method = None): else: method = 'email' - if use_method: - if use_method == "email": - method = "email" - elif method == "email": - # We are searching for a specific - # but this contact does not offer any - notify_log("ERROR: contact %r does not have any plugins (required: %s)" % (contact, use_method)) - return 2 - else: - found_plugin = {} - for item in method[1]: - if item["plugin"] == use_method: - found_plugin = item - break - if not found_plugin: - # Required plugin was not found for this contact - notify_log("ERROR: contact %r do not have plugin %s" % (contact, use_method)) - return 2 - method = ('flexible', [found_plugin]) - if type(method) == tuple and method[0] == 'flexible': notify_log("Preparing flexible notifications for %s" % context["CONTACTNAME"]) return notify_flexible(context, method[1], write_into_spoolfile) @@ -524,6 +508,14 @@ def add_rulebased_macros(context): if "NUM_CONTACTS" not in context: livestatus_fetch_contacts(context, context["HOSTNAME"], context.get("SERVICEDESC")) + # Add a pseudo contact name. This is needed for the correct creation + # of spool files. Spool files are created on a per-contact-base, as in classical + # notifications the core sends out one individual notification per contact. + # In the case of rule based notifications we do not make distinctions between + # the various contacts. + context["CONTACTNAME"] = "check-mk-notify" + + def livestatus_fetch_contacts(context, host, service): if service: @@ -553,6 +545,7 @@ def livestatus_fetch_contacts(context, host, service): count += 1 context["NUM_CONTACTS"] = str(count) + def livestatus_fetch_query(query): sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock.connect(livestatus_unix_socket) @@ -563,8 +556,6 @@ def livestatus_fetch_query(query): return response - - def notify_via_email(context, write_into_spoolfile): if write_into_spoolfile: notify_log("Spooled this notification.") @@ -742,8 +733,6 @@ def notify_flexible(context, notification_table, write_into_spoolfile): else: return 0 - - def call_notification_script(plugin, parameters, context, write_into_spoolfile): # Enter context into environment @@ -830,3 +819,21 @@ def format_exception(): t, v, tb = sys.exc_info() traceback.print_exception(t, v, tb, None, txt) return txt.getvalue() + +#. +# .--Rulebased-----------------------------------------------------------. +# | ____ _ _ _ | +# | | _ \ _ _| | ___| |__ __ _ ___ ___ __| | | +# | | |_) | | | | |/ _ \ '_ \ / _` / __|/ _ \/ _` | | +# | | _ <| |_| | | __/ |_) | (_| \__ \ __/ (_| | | +# | |_| \_\\__,_|_|\___|_.__/ \__,_|___/\___|\__,_| | +# | | +# +----------------------------------------------------------------------+ +# | Logic for rule based notifications | +# '----------------------------------------------------------------------' + +def notify_rulebased(context): + notify_log("RBN!") + + +

10 years, 6 months

Check_MK Git: check_mk: RBN: implement contact selection

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d46d21cd552779b3024f4f873511ff9e09d7a67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d46d21cd55277… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 25 11:51:13 2014 +0100 RBN: implement contact selection --- modules/.f12 | 2 +- modules/notify.py | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++- web/htdocs/wato.py | 2 +- 3 files changed, 117 insertions(+), 4 deletions(-) diff --git a/modules/.f12 b/modules/.f12 index f106c3a..a7c6c61 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -2,4 +2,4 @@ SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo cp -v *.py /omd/sites/$SITE/share/check_mk/modules/ -sudo su - $SITE -c "cmk --debug -U" +sudo su - $SITE -c "cmk --debug -R" diff --git a/modules/notify.py b/modules/notify.py index 95f445e..39b1bd8 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -833,7 +833,120 @@ def format_exception(): # '----------------------------------------------------------------------' def notify_rulebased(context): - notify_log("RBN!") - + notify_log("RBN2!") + + # First step: go through all rules and construct our table of + # notification plugins to call. This is a dict from (user, plugin) to + # a pair if (locked, parameters). If locked is True, then a user + # cannot cancel this notification via his personal notification rules. + # Example: + # notifications = { + # ( "hh", "email" ) : ( False, [] ), + # ( "hh", "sms" ) : ( True, [ "0171737337", "bar" ] ), + # } + + notifications = {} + + for rule in notification_rules: + notify_log(pprint.pformat(rule)) + notify_log("Trying rule '%s'..." % rule["description"]) + why_not = rbn_match_rule(rule, context) # also checks disabling + if why_not: + notify_log(" -> does not match: %s" % why_not) + else: + notify_log(" -> matches!") + contacts = rbn_rule_contacts(rule, context) + plugin = rule["notify_plugin"] + method = rule["notify_method"] + if method == None: # cancelling + for contact in contacts: + key = contact, plugin + if key in notifications: + notify_log(" - cancelling notification of %s via %s" % key) + del notifications[key] + # TODO: honor locked flag for user specific rules + else: + for contact in contacts: + key = contact, plugin + if key in notifications: + notify_log(" - modifying notification of %s via %s" % key) + else: + notify_log(" - adding notification of %s via %s" % key) + # Hint: method is the list of plugin parameters in this case + notifications[key] = ( not rule.get("allow_disable"), method ) + + notify_log("Resulting notification table:") + entries = notifications.items() + entries.sort() + for (contact, plugin), (locked, params) in entries: + notify_log(" * %s via %s, parameters: %s" % (contact, plugin, " ".join(params))) + + +def rbn_match_rule(rule, context): + if rule.get("disabled"): + return "This rule is disabled" + + +def rbn_rule_contacts(rule, context): + contacts = set([]) + if rule.get("contact_object"): + contacts.update(rbn_object_contacts(context).keys()) + if rule.get("contact_all"): + contacts.update(rbn_all_contacts().keys()) + if "contact_contacts" in rule: + contacts.update(rule["contact_contacts"]) + if "contact_groups" in rule: + contacts.update(rbn_groups_contacts(rule["contact_groups"])) + if "contact_emails" in rule: + contacts.update(rbn_emails_contacts(rule["contact_emails"])) + return contacts + + +def rbn_object_contacts(context): + contacts = {} + for key, value in context.iteritems(): + if key.startswith("CONTACTALIAS["): + name = key[13:-1] + contacts[name] = { + "alias": value, + "email": context["CONTACTEMAIL[%s]" % name], + "pager": context["CONTACTPAGER[%s]" % name], + } + return contacts + +def rbn_all_contacts(): + # TODO: Diese Liste nur einmal holen und dann cachen + contacts = {} + query = "GET contacts\nColumns: name alias email pager\nSeparators: 1 2 3 4\n" + response = livestatus_fetch_query(query) + notify_log(response) + lines = response.split('\1') + for line in lines: + parts = line.split('\2') + if len(parts) == 4: + name, alias, email, pager = parts + contacts[name] = { + "alias" : alias, + "email" : email, + "pager" : pager, + } + return contacts + +def rbn_groups_contacts(groups): + if not groups: + return {} + contacts = set([]) + query = "GET contactgroups\nColumns: members\n" + for group in groups: + query += "Filter: name = %s\n" % group + query += "Or: %d\n" % len(groups) + response = livestatus_fetch_query(query) + for line in response.splitlines(): + line = line.strip() + if line: + contacts.update(line.split(",")) + return contacts +def rbn_emails_contacts(emails): + return [ "mailto:" + e for e in emails ] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b56b21b..0040a3a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7543,7 +7543,7 @@ def vs_notification_rule(): ( "contact_groups", ListOf( GroupSelection("contact"), - title = _("The member of certain contact groups"), + title = _("The members of certain contact groups"), movable = False, ) ),

10 years, 6 months

Check_MK Git: check_mk: Remove obsolete notes

by Mathias Kettner

Module: check_mk Branch: master Commit: 47cdf8daa0f52d6eafa12981427c5ae411794bf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47cdf8daa0f52d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 25 07:58:43 2014 +0100 Remove obsolete notes --- IMPLEMENTIERUNG | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/IMPLEMENTIERUNG b/IMPLEMENTIERUNG deleted file mode 100644 index 80a3107..0000000 --- a/IMPLEMENTIERUNG +++ /dev/null @@ -1,10 +0,0 @@ -NOCH ZU TUN: - -[6] host_inventory per Livestatus bereitstellen, damit verteiltes Monitoring klappt? -Dabei auch evtl. host_has_inventory bereitstellen für das Icon? - -[7] Linux komplett abdecken - -[8] Windows komplett abdecken - -[2] Displayhints für *alle* Knoten erstellen. Das kann man machen, sobald der Baum komplett ist

10 years, 6 months

Check_MK Git: check_mk: RBN: prepare notification context for rule based notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 82bcdb60f0dc19c2af44e463094a9a86da92d1fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82bcdb60f0dc19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 25 10:37:16 2014 +0100 RBN: prepare notification context for rule based notifications --- modules/check_mk.py | 31 ++++++++++++++++++++------ modules/notify.py | 62 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 82 insertions(+), 11 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index e1844ff..9fb692c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1444,14 +1444,10 @@ def host_contactgroups_of(hostlist): first_list = False else: cgrs.append(entry) + if monitoring_core == "nagios" and enable_rulebased_notifications: + cgrs.append("check-mk-notify") return list(set(cgrs)) -def host_contactgroups_nag(hostlist): - cgrs = host_contactgroups_of(hostlist) - if len(cgrs) > 0: - return " contact_groups " + ",".join(cgrs) + "\n" - else: - return "" def parents_of(hostname): par = host_extra_conf(hostname, parents) @@ -1481,6 +1477,8 @@ def extra_service_conf_of(hostname, description): sercgr = service_extra_conf(hostname, description, service_contactgroups) contactgroups_to_define.update(sercgr) if len(sercgr) > 0: + if enable_rulebased_notifications: + sercgr.append("check-mk-notify") # not nessary if not explicit groups defined conf += " contact_groups\t\t" + ",".join(sercgr) + "\n" sergr = service_extra_conf(hostname, description, service_groups) @@ -2614,7 +2612,11 @@ def create_nagios_config_contacts(outfile): outfile.write(" email\t\t\t\t%s\n" % contact["email"]) if "pager" in contact: outfile.write(" pager\t\t\t\t%s\n" % contact["pager"]) - not_enabled = contact.get("notifications_enabled", True) + if enable_rulebased_notifications: + not_enabled = False + else: + not_enabled = contact.get("notifications_enabled", True) + for what in [ "host", "service" ]: no = contact.get(what + "_notification_options", "") if not no or not not_enabled: @@ -2630,6 +2632,21 @@ def create_nagios_config_contacts(outfile): outfile.write(" contactgroups\t\t\t%s\n" % ", ".join(cgrs)) outfile.write("}\n\n") + if enable_rulebased_notifications: + outfile.write( + "# Needed for rule based notifications\n" + "define contact {\n" + " contact_name\t\t\tcheck-mk-notify\n" + " alias\t\t\t\tContact for rule based notifications\n" + " host_notification_options\td,u,r,f,s\n" + " service_notification_options\tu,c,w,r,f,s\n" + " host_notification_period\t24X7\n" + " service_notification_period\t24X7\n" + " host_notification_commands\tcheck-mk-notify\n" + " service_notification_commands\tcheck-mk-notify\n" + " contactgroups\t\t\tcheck-mk-notify\n" + "}\n\n"); + # Quote string for use in a nagios command execution. # Please note that also quoting for ! and \ vor Nagios diff --git a/modules/notify.py b/modules/notify.py index d52a55e..34a07a2 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -34,7 +34,7 @@ # hostname, servicedesc, hoststate, servicestate, output in # the form %(variable)s -import pprint, urllib, select, subprocess +import pprint, urllib, select, subprocess, socket # Default settings notification_logdir = var_dir + "/notify" @@ -294,7 +294,8 @@ def do_notify(args): notify_mode, argument = args if notify_mode in ['fake-service', 'fake-host']: - plugin = argument + global fake_plugin + fake_plugin = argument if notify_mode in ['spoolfile']: filename = argument @@ -447,10 +448,11 @@ def convert_context_to_unicode(context): context[key] = value_unicode def notify_notify(context): + if notification_logging >= 2: + notify_log("----------------------------------------------------------------------") notify_log("Got notification context with %s variables" % len(context)) # Add a few further helper variables - import socket context["MONITORING_HOST"] = socket.gethostname() if omd_root: context["OMD_ROOT"] = omd_root @@ -483,13 +485,17 @@ def notify_notify(context): (context['HOSTNAME'], context['SERVICEDESC'])) if notify_mode in [ 'fake-service', 'fake-host' ]: - sys.exit(call_notification_script(plugin, [], context, True)) + sys.exit(call_notification_script(fake_plugin, [], context, True)) if 'LASTHOSTSTATECHANGE' in context: context['LASTHOSTSTATECHANGE_REL'] = get_readable_rel_date(context['LASTHOSTSTATECHANGE']) if context['WHAT'] != 'HOST' and 'LASTSERVICESTATECHANGE' in context: context['LASTSERVICESTATECHANGE_REL'] = get_readable_rel_date(context['LASTSERVICESTATECHANGE']) + # Rule based notifications enabled? We might need to complete a few macros + if enable_rulebased_notifications: + add_rulebased_macros(context) + convert_context_to_unicode(context) if notification_logging >= 2: @@ -511,6 +517,54 @@ def notify_notify(context): process_context(context, notification_spooling) +def add_rulebased_macros(context): + # For the rule based notifications we need the list of contacts + # an object has. The CMC does send this in the macro "CONTACTS" + # (the count) and macros of the form CONTACTALIAS[hh]=Harry Hirsch + if "NUM_CONTACTS" not in context: + livestatus_fetch_contacts(context, context["HOSTNAME"], context.get("SERVICEDESC")) + +def livestatus_fetch_contacts(context, host, service): + + if service: + query = "GET services\nFilter: host_name = %s\nFilter: service_description = %s\nColumns: contacts\n" % ( + host, service) + else: + query = "GET hosts\nFilter: host_name = %s\nColumns: contacts\n" % host + + contacts = livestatus_fetch_query(query).split(",") + + # Now get all relevant information + query = "GET contacts\nColumns: name alias email pager\nSeparators: 1 2 3 4\n" + for contact in contacts: + query += "Filter: name = %s\n" % contact.strip() + query += "Or: %d\n" % len(contacts) + response = livestatus_fetch_query(query) + lines = response.split('\1') + count = 0 + for line in lines: + parts = line.split('\2') + if len(parts) == 4: + name, alias, email, pager = parts + if name != "check-mk-notify": + context["CONTACTALIAS[%s]" % name] = alias + context["CONTACTEMAIL[%s]" % name] = email + context["CONTACTPAGER[%s]" % name] = pager + count += 1 + context["NUM_CONTACTS"] = str(count) + +def livestatus_fetch_query(query): + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(livestatus_unix_socket) + sock.send(query) + sock.shutdown(socket.SHUT_WR) + response = sock.recv(10000000) + sock.close() + return response + + + + def notify_via_email(context, write_into_spoolfile): if write_into_spoolfile: notify_log("Spooled this notification.")

10 years, 6 months

Check_MK Git: check_mk: RBN: actually do notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a42264c610b44977aa19b20f7f82eab4d199493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a42264c610b44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 25 18:33:21 2014 +0100 RBN: actually do notifications --- modules/notify.py | 99 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 88 insertions(+), 11 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index f02c51a..bcdb833 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -736,7 +736,7 @@ def notify_flexible(context, notification_table, write_into_spoolfile): else: return 0 -def call_notification_script(plugin, parameters, context, write_into_spoolfile): +def call_notification_script(plugin, parameters, context, write_into_spoolfile=False): # Enter context into environment os.putenv("NOTIFY_PARAMETERS", " ".join(parameters)) @@ -771,7 +771,7 @@ def call_notification_script(plugin, parameters, context, write_into_spoolfile): create_spoolfile({"context": context, "plugin": plugin}) exitcode = 0 else: - notify_log("Executing %s" % path) + notify_log(" executing %s" % path) out = os.popen(path + " 2>&1 </dev/null") for line in out: notify_log("Output: %s" % line.rstrip()) @@ -847,15 +847,16 @@ def notify_rulebased(context): # } notifications = {} + num_rule_matches = 0 for rule in notification_rules: - notify_log(pprint.pformat(rule)) notify_log("Trying rule '%s'..." % rule["description"]) why_not = rbn_match_rule(rule, context) # also checks disabling if why_not: notify_log(" -> does not match: %s" % why_not) else: notify_log(" -> matches!") + num_rule_matches += 1 contacts = rbn_rule_contacts(rule, context) plugin = rule["notify_plugin"] method = rule["notify_method"] @@ -876,11 +877,87 @@ def notify_rulebased(context): # Hint: method is the list of plugin parameters in this case notifications[key] = ( not rule.get("allow_disable"), method ) - notify_log("Resulting notification table:") + if not notifications: + if num_rule_matches: + notify_log("%d rules matched, but no notification has been created." % num_rule_matches) + else: + if notification_fallback_email: + notify_log("No rule matched, falling back to email to %s" % notification_fallback_email) + contact = rbn_fake_email_contact(notification_fallback_email) + rbn_add_contact_information(context, contact) + call_notification_script("mail", [], context) + return + + # Now do the actual notifications + notify_log("Executing %d notifications:" % len(notifications)) entries = notifications.items() entries.sort() for (contact, plugin), (locked, params) in entries: - notify_log(" * %s via %s, parameters: %s" % (contact, plugin, " ".join(params))) + notify_log(" * notifying %s via %s, parameters: %s" % (contact, plugin, ", ".join(params))) + try: + rbn_add_contact_information(context, contact) + call_notification_script(plugin, params, context) + except Exception, e: + if opt_debug: + raise + fe = format_exception() + notify_log(" ERROR: %s" % e) + notify_log(fe) + + +def rbn_fake_email_contact(email): + return { + "name" : email.split("@")[0], + "alias" : "Explicit email adress " + email, + "email" : email, + "pager" : "", + } + + +def rbn_add_contact_information(context, contact): + if type(contact) == dict: + for what in [ "name", "alias", "email", "pager" ]: + context["CONTACT" + what.upper()] = contact[what] + else: + context["CONTACTNAME"] = contact + for what in [ "alias", "email", "pager" ]: + varname = "CONTACT" + what.upper() + value = context.get("%s[%s]" % (varname, contact)) + if value != None: + context[varname] = value + else: + # Need to fetch information via livestatus + contact_dict = query_contact_info(contact) + rbn_add_contact_information(context, contact_dict) + +g_contact_cache = {} +def query_contact_info(name): + if name in g_contact_cache: + return g_contact_cache[name] + try: + query = "GET contacts\nColumns: alias email pager\nFilter: name = %s\n" % name + response = livestatus_fetch_query(query) + alias, email, pager = response.strip().split(";") + except: + if opt_debug: + raise + alias = name + email = "" + page = "" + contact = { + "name" : name, + "alias" : alias, + "email" : email, + "pager" : pager, + } + g_contact_cache[name] = contact + return contact + + + + + + def rbn_match_rule(rule, context): @@ -1061,17 +1138,17 @@ def rbn_all_contacts(): contacts = {} query = "GET contacts\nColumns: name alias email pager\nSeparators: 1 2 3 4\n" response = livestatus_fetch_query(query) - notify_log(response) lines = response.split('\1') for line in lines: parts = line.split('\2') if len(parts) == 4: name, alias, email, pager = parts - contacts[name] = { - "alias" : alias, - "email" : email, - "pager" : pager, - } + if name not in [ "check-mk-notify", "check_mk" ]: + contacts[name] = { + "alias" : alias, + "email" : email, + "pager" : pager, + } return contacts def rbn_groups_contacts(groups):

10 years, 6 months

Check_MK Git: check_mk: RBN: all conditions are now implemented

by Mathias Kettner

Module: check_mk Branch: master Commit: 4499a766c8f772470eae290c459ad39245c44896 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4499a766c8f772… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 25 17:51:06 2014 +0100 RBN: all conditions are now implemented --- check_mk_templates.cfg | 2 ++ modules/notify.py | 65 +++++++++++++++++++++++++++++++++++++++----- web/htdocs/wato.py | 70 ++++++++++++++++++++++++++---------------------- 3 files changed, 98 insertions(+), 39 deletions(-) diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index a6f04d7..1f295b1 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -365,6 +365,7 @@ define command { NOTIFY_HOSTALIAS='$HOSTALIAS$' \ NOTIFY_HOSTADDRESS='$HOSTADDRESS$' \ NOTIFY_LASTHOSTSTATE='$LASTHOSTSTATE$' \ + NOTIFY_LASTHOSTSTATEID='$LASTHOSTSTATEID$' \ NOTIFY_LASTHOSTSTATECHANGE='$LASTHOSTSTATECHANGE$' \ NOTIFY_LASTHOSTUP='$LASTHOSTUP$' \ NOTIFY_HOSTSTATE='$HOSTSTATE$' \ @@ -375,6 +376,7 @@ define command { NOTIFY_LONGHOSTOUTPUT='$LONGHOSTOUTPUT$' \ NOTIFY_SERVICEDESC='$SERVICEDESC$' \ NOTIFY_LASTSERVICESTATE='$LASTSERVICESTATE$' \ + NOTIFY_LASTSERVICESTATEID='$LASTSERVICESTATEID$' \ NOTIFY_LASTSERVICESTATECHANGE='$LASTSERVICESTATECHANGE$' \ NOTIFY_LASTSERVICEOK='$LASTSERVICEOK$' \ NOTIFY_SERVICESTATE='$SERVICESTATE$' \ diff --git a/modules/notify.py b/modules/notify.py index 8f39b79..f02c51a 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -896,7 +896,9 @@ def rbn_match_rule(rule, context): rbn_match_checktype(rule, context) or \ rbn_match_timeperiod(rule) or \ rbn_match_escalation(rule, context) or \ - rbn_match_servicelevel(rule, context) + rbn_match_servicelevel(rule, context) or \ + rbn_match_host_event(rule, context) or \ + rbn_match_service_event(rule, context) def rbn_match_hosttags(rule, context): @@ -930,6 +932,8 @@ def rbn_match_services(rule, context): "allowed services (%s)" % (service, ", ".join(servicelist)) def rbn_match_exclude_services(rule, context): + if context["WHAT"] != "SERVICE": + return excludelist = rule.get("match_exclude_services", []) service = context["SERVICEDESC"] if in_extraconf_servicelist(excludelist, service): @@ -968,14 +972,61 @@ def rbn_match_escalation(rule, context): notification_number, from_number, to_number) def rbn_match_servicelevel(rule, context): - from_sl, to_sl = rule["match_sl"] - if context['WHAT'] == "SERVICE" and context.get('SVC_SL','').isdigit(): - sl = saveint(context.get('SVC_SL')) + if "match_sl" in rule: + from_sl, to_sl = rule["match_sl"] + if context['WHAT'] == "SERVICE" and context.get('SVC_SL','').isdigit(): + sl = saveint(context.get('SVC_SL')) + else: + sl = saveint(context.get('HOST_SL')) + + if sl < from_sl or sl > to_sl: + return "The service level %d is not between %d and %d." % (sl, from_sl, to_sl) + +def rbn_match_host_event(rule, context): + if "match_host_event" in rule: + if context["WHAT"] != "HOST": + if "match_host_event" not in rule: + return "This is a service notification, but the rule just matches host events" + else: + return # Let this be handled by match_service_event + allowed_events = rule["match_host_event"] + state = context["HOSTSTATE"] + last_state = context["LASTHOSTSTATE"] + events = { "UP" : 'r', "DOWN" : 'd', "UNREACHABLE" : 'u' } + return rbn_match_event(context, state, last_state, events, allowed_events) + + +def rbn_match_service_event(rule, context): + if "match_service_event" in rule: + if context["WHAT"] != "SERVICE": + if "match_host_event" not in rule: + return "This is a host notification, but the rule just matches service events" + else: + return # Let this be handled by match_host_event + allowed_events = rule["match_service_event"] + state = context["SERVICESTATE"] + last_state = context["LASTSERVICESTATE"] + events = { "OK" : 'r', "WARNING" : 'w', "CRITICAL" : 'c', "UNKNOWN" : 'u' } + return rbn_match_event(context, state, last_state, events, allowed_events) + +def rbn_match_event(context, state, last_state, events, allowed_events): + notification_type = context["NOTIFICATIONTYPE"] + + if notification_type == "RECOVERY": + event = events.get(last_state, '?') + 'r' + elif notification_type in [ "FLAPPINGSTART", "FLAPPINGSTOP", "FLAPPINGDISABLED" ]: + event = 'f' + elif notification_type in [ "DOWNTIMESTART", "DOWNTIMEEND", "DOWNTIMECANCELLED"]: + event = 's' + elif notification_type == "ACKNOWLEDGEMENT": + event = 'x' else: - sl = saveint(context.get('HOST_SL')) + event = events.get(last_state, '?') + events.get(state, '?') + + if event not in allowed_events: + return "Event type '%s' not handled by this rule. Allowed are: %s" % ( + event, ", ".join(allowed_events)) - if sl < from_sl or sl > to_sl: - return "The service level %d is not between %d and %d." % (sl, from_sl, to_sl) def rbn_rule_contacts(rule, context): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1ff23b7..6670e3b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7485,45 +7485,51 @@ def vs_notification_rule(): ( "match_host_event", ListChoice( title = _("Match Host Event Type"), + help = _("Select the host event types and transitions this rule should handle. Note: " + "If you activate this option and do <b>not</b> also specify service event " + "types then this rule will never hold for service notifications!"), choices = [ - ( 'rd', _("UP") + " ➤ " + _("DOWN")), - ( 'dr', _("DOWN") + " ➤ " + _("UP")), - ( 'ru', _("UP") + " ➤ " + _("UNREACHABLE")), - ( 'du', _("DOWN") + " ➤ " + _("UNREACHABLE")), - ( 'ud', _("UNREACHABLE") + " ➤ " + _("DOWN")), - ( 'ur', _("UNREACHABLE") + " ➤ " + _("UP")), - ( 'f', _("Start or end of flapping state")), - ( 's', _("Start or end of a scheduled downtime ")), - ( 'x', _("Acknowledgement of host problem")), - ], - default_value = [ 'rd', 'dr', 'f', 's', 'x' ], + ( 'rd', _("UP") + " ➤ " + _("DOWN")), + ( 'dr', _("DOWN") + " ➤ " + _("UP")), + ( 'ru', _("UP") + " ➤ " + _("UNREACHABLE")), + ( 'du', _("DOWN") + " ➤ " + _("UNREACHABLE")), + ( 'ud', _("UNREACHABLE") + " ➤ " + _("DOWN")), + ( 'ur', _("UNREACHABLE") + " ➤ " + _("UP")), + ( 'f', _("Start or end of flapping state")), + ( 's', _("Start or end of a scheduled downtime ")), + ( 'x', _("Acknowledgement of host problem")), + ], + default_value = [ 'rd', 'dr', 'f', 's', 'x' ], ) ), ( "match_service_event", ListChoice( title = _("Match Service Event Type"), + help = _("Select the service event types and transitions this rule should handle. Note: " + "If you activate this option and do <b>not</b> also specify host event " + "types then this rule will never hold for host notifications!"), choices = [ - ( 'rw', _("OK") + " ➤ " + _("WARN")), - ( 'rc', _("OK") + " ➤ " + _("CRIT")), - ( 'ru', _("OK") + " ➤ " + _("UNKNOWN")), - - ( 'wr', _("WARN") + " ➤ " + _("OK")), - ( 'wc', _("WARN") + " ➤ " + _("CRIT")), - ( 'wu', _("WARN") + " ➤ " + _("UNKNOWN")), - - ( 'cr', _("CRIT") + " ➤ " + _("OK")), - ( 'cw', _("CRIT") + " ➤ " + _("WARN")), - ( 'cu', _("CRIT") + " ➤ " + _("UNKNOWN")), - - ( 'ur', _("UNKNOWN") + " ➤ " + _("OK")), - ( 'uw', _("UNKNOWN") + " ➤ " + _("WARN")), - ( 'uc', _("UNKNOWN") + " ➤ " + _("CRIT")), - - ( 'f', _("Start or end of flapping state")), - ( 's', _("Start or end of a scheduled downtime")), - ( 'x', _("Acknowledgement of service problem")), - ], - default_value = [ 'rw', 'rc', 'ru', 'wc', 'wu', 'uc', 'f', 's', 'x' ], + ( 'rw', _("OK") + " ➤ " + _("WARN")), + ( 'rc', _("OK") + " ➤ " + _("CRIT")), + ( 'ru', _("OK") + " ➤ " + _("UNKNOWN")), + + ( 'wr', _("WARN") + " ➤ " + _("OK")), + ( 'wc', _("WARN") + " ➤ " + _("CRIT")), + ( 'wu', _("WARN") + " ➤ " + _("UNKNOWN")), + + ( 'cr', _("CRIT") + " ➤ " + _("OK")), + ( 'cw', _("CRIT") + " ➤ " + _("WARN")), + ( 'cu', _("CRIT") + " ➤ " + _("UNKNOWN")), + + ( 'ur', _("UNKNOWN") + " ➤ " + _("OK")), + ( 'uw', _("UNKNOWN") + " ➤ " + _("WARN")), + ( 'uc', _("UNKNOWN") + " ➤ " + _("CRIT")), + + ( 'f', _("Start or end of flapping state")), + ( 's', _("Start or end of a scheduled downtime")), + ( 'x', _("Acknowledgement of service problem")), + ], + default_value = [ 'rw', 'rc', 'ru', 'wc', 'wu', 'uc', 'f', 's', 'x' ], ) ),

10 years, 6 months

Check_MK Git: check_mk: FIX Fix timeperiod computation with CMC and flexible notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: f35c19350ff28a53219293ddd0dd831e1c0444c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f35c19350ff28a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 25 16:35:13 2014 +0100 FIX Fix timeperiod computation with CMC and flexible notifications If you used the Check_MK Micro Core and flexible notifications and used the state of a timeperiod as a notification condition then this condition would fail. Timeperiods would be computed just once after every configuration restart. This has been fixed now. --- .werks/720 | 12 ++++++++++++ ChangeLog | 1 + modules/notify.py | 3 +++ 3 files changed, 16 insertions(+) diff --git a/.werks/720 b/.werks/720 new file mode 100644 index 0000000..ca34a9d --- /dev/null +++ b/.werks/720 @@ -0,0 +1,12 @@ +Title: Fix timeperiod computation with CMC and flexible notifications +Level: 1 +Component: notifications +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1393342421 + +If you used the Check_MK Micro Core and flexible notifications and +used the state of a timeperiod as a notification condition then +this condition would fail. Timeperiods would be computed just once +after every configuration restart. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 6aa1a7c..aa44d66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -296,6 +296,7 @@ * 0108 FIX: Prevent service notification on host alerts... * 0058 FIX: Fix email notifications containing non-ASCII characters in some situtations... * 0133 FIX: Fixed mkeventd notification plugin... + * 0720 FIX: Fix timeperiod computation with CMC and flexible notifications... BI: * 0669 FIX: Fixed regex matching in BI when using character groups [...]... diff --git a/modules/notify.py b/modules/notify.py index 04fa0bb..97acb51 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -335,6 +335,9 @@ def notify_keepalive(): while True: try: + # Invalidate timeperiod cache + global g_inactive_timerperiods + g_inactive_timerperiods = None # Invalidate timeperiod cache global g_inactive_timerperiods

10 years, 6 months

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014