Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: Step1: Using Regex for Hostnames

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0bbf930a23f16bf9e751ea52a3aa669b5a131267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bbf930a23f16b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Feb 27 13:47:54 2014 +0100 Step1: Using Regex for Hostnames --- modules/check_mk.py | 17 +++++++++++++---- web/htdocs/wato.py | 7 +++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 12a5a98..22b2d31 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1821,7 +1821,8 @@ def in_boolean_serviceconf_list(hostname, service_description, ruleset): # Entries in list are (tagged) hostnames that must equal the # (untagged) hostname. Expressions beginning with ! are negated: if -# they match, the item is excluded from the list. Also the three +# they match, the item is excluded from the list. Expressions beginning +# withy ~ are treated as Regular Expression. Also the three # special tags '@all', '@clusters', '@physical' are allowed. def in_extraconf_hostlist(hostlist, hostname): @@ -1832,6 +1833,8 @@ def in_extraconf_hostlist(hostlist, hostname): for hostentry in hostlist: if len(hostentry) == 0: raise MKGeneralException('Empty hostname in host list %r' % hostlist) + negate = False + regex = False if hostentry[0] == '@': if hostentry == '@all': return True @@ -1845,11 +1848,17 @@ def in_extraconf_hostlist(hostlist, hostname): elif hostentry[0] == '!': hostentry = hostentry[1:] negate = True - else: - negate = False + # Allow regex with prefix '~' + elif hostentry[0] == '~': + hostentry = hostentry[1:] + regex = True - if hostname == strip_tags(hostentry): + hostentry = strip_tags(hostentry) + if not regex and hostname == hostentry: return not negate + # Handle Regex + elif re.match(hostentry, hostname): + return True return False diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 372ef61..b65ce1e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12725,12 +12725,15 @@ def rule_matches_host_and_item(rulespec, tag_specs, host_list, item_list, rule_folder, host_folder, hostname, item): reasons = [] host = host_folder[".hosts"][hostname] - if not ( + hostname_match = False + + if not ( (hostname in host_list) or (("!"+hostname) not in host_list and len(host_list) > 0 - and host_list[-1] == ALL_HOSTS[0])): + and host_list[-1] == ALL_HOSTS[0]) + or len([ x for x in host_list if x.startswith('~') and re.match(x[1:], hostname) ]) > 0): reasons.append(_("The host name does not match.")) tags_match = True

10 years, 6 months

Check_MK Git: check_mk: snapshots: fixed bug with customized wato backup_path

by Andreas Boesl

Module: check_mk Branch: master Commit: 1eb2131d8d230951ae5d89630da8d92b35aa245f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb2131d8d2309… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 27 13:10:35 2014 +0100 snapshots: fixed bug with customized wato backup_path --- web/htdocs/wato.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 372ef61..dcd540b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5933,10 +5933,9 @@ def get_snapshot_status(snapshot): status["files"] = multitar.list_tar_content(snapshot_dir + name) if status.get("type") == "legacy": + allowed_files = map(lambda x: "%s.tar" % x[1], backup_paths) for tarname in status["files"].keys(): - if tarname not in ["check_mk.tar", "multisite.tar", - "htpasswd.tar", "sites.tar", "auth.secret.tar", - "auth.serials.tar", "usersettings.tar"]: + if tarname not in allowed_files: raise MKGeneralException(_("Invalid snapshot (contains invalid tarfile %s)") % tarname) else: # new snapshots for entry in ["comment", "created_by", "type"]:

10 years, 6 months

Check_MK Git: check_mk: notify.py: Cleanup code, add sections headers

by Mathias Kettner

Module: check_mk Branch: master Commit: 46b3d244e58acf2e9c33a3648e67b0cbea24e2c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46b3d244e58acf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 27 11:44:55 2014 +0100 notify.py: Cleanup code, add sections headers --- modules/notify.py | 930 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 519 insertions(+), 411 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=46b3d244e5…

10 years, 6 months

Check_MK Git: check_mk: RBN: User specific notifications work

by Mathias Kettner

Module: check_mk Branch: master Commit: 97a42faf08f78100aeac586ba331f2e1b0c0c39e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97a42faf08f781… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 27 12:14:21 2014 +0100 RBN: User specific notifications work --- modules/notify.py | 34 +++++++++++++++++++++++++++++----- web/htdocs/wato.py | 39 +++++++++++++++++++++++++-------------- 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index fe6d753..ec8c329 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -746,8 +746,12 @@ def notify_rulebased(context): notifications = {} num_rule_matches = 0 - for rule in notification_rules: - notify_log("Trying rule '%s'..." % rule["description"]) + for rule in notification_rules + user_notification_rules(): + if "contact" in rule: + notify_log("User %s's rule '%s'..." % (rule["contact"], rule["description"])) + else: + notify_log("Global 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) @@ -761,9 +765,12 @@ def notify_rulebased(context): 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 + locked, method = notifications[key] + if locked and "contact" in rule: + notify_log(" - cannot cancel notification of %s via %s: it is locked" % key) + else: + notify_log(" - cancelling notification of %s via %s" % key) + del notifications[key] else: for contact in contacts: key = contact, plugin @@ -802,6 +809,23 @@ def notify_rulebased(context): notify_log(fe) +# Create a table of all user specific notification rules +def user_notification_rules(): + user_rules = [] + for contactname, contact in contacts.iteritems(): + notify_log("Hat %s was?" % contactname) + for rule in contact.get("notification_rules", []): + # Save the owner of the rule for later debugging + rule["contact"] = contactname + # We assume that the "contact_..." entries in the + # rule are allowed and only contain one entry of the + # type "contact_contacts" : [ contactname ]. This + # is handled by WATO. Contact specific rules are a + # WATO-only feature anyway... + user_rules.append(rule) + notify_log("Found %d user specific rules" % len(user_rules)) + return user_rules + def rbn_fake_email_contact(email): return { "name" : email.split("@")[0], diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 20eb882..2844b0b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7365,6 +7365,7 @@ def vs_notification_rule(userid = None): if userid: contact_headers = [] section_contacts = [] + section_override = [] else: contact_headers = [ ( _("Contact Selection"), [ "contact_all", "contact_object", "contact_contacts", "contact_groups", "contact_emails" ] ), @@ -7408,6 +7409,17 @@ def vs_notification_rule(userid = None): ) ), ] + section_override = [ + ( "allow_disable", + Checkbox( + title = _("Overriding by users"), + help = _("If you uncheck this option then users are not allowed to deactive notifications " + "that are created by this rule."), + label = _("allow users to deactivate this notification"), + default_value = True, + ) + ), + ] return Dictionary( title = _("Rule Properties"), @@ -7428,15 +7440,9 @@ def vs_notification_rule(userid = None): label = _("do not apply this rule"), ) ), - ( "allow_disable", - Checkbox( - title = _("Overriding by users"), - help = _("If you uncheck this option then users are not allowed to deactive notifications " - "that are created by this rule."), - label = _("allow users to deactivate this notification"), - default_value = True, - ) - ), + ] + section_override + + [ + # Matching ( "match_hosttags", HostTagCondition( @@ -7832,17 +7838,22 @@ def mode_user_notifications(phase): if phase == "title": return _("Custom notification table for user ") + userid - elif phase == "buttons": + users = userdb.load_users(lock = phase == 'action') + user = users[userid] + is_contact = not not user.get("contactgroups") + if phase == "buttons": html.context_button(_("All Users"), make_link([("mode", "users")]), "back") html.context_button(_("User Properties"), make_link([("mode", "edit_user"), ("edit", userid)]), "edit") - html.context_button(_("New Rule"), make_link([("mode", "notification_rule"), ("user", userid)]), "new") + if is_contact: + html.context_button(_("New Rule"), make_link([("mode", "notification_rule"), ("user", userid)]), "new") return elif phase == "action": return - users = userdb.load_users(lock = phase == 'action') - user = users[userid] + if not is_contact: + html.show_warning(_("This user is not member of any contact group and thus cannot have notification rules!")) + return rules = user.get("notification_rules", []) render_notification_rules(rules, userid) @@ -10146,7 +10157,7 @@ def mode_users(phase): html.icon_button(delete_url, _("Delete"), "delete") notifications_url = make_link([("mode", "user_notifications"), ("user", id)]) - if load_configuration_settings().get("enable_rulebased_notifications"): + if load_configuration_settings().get("enable_rulebased_notifications") and user.get("contactgroups"): html.icon_button(notifications_url, _("Custom notification table of this user"), "notifications") # ID

10 years, 6 months

Check_MK Git: check_mk: printer_pages: Source cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: a188b39af22baa4fb4c68230ad072e89befcfe4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a188b39af22baa… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Feb 27 10:46:55 2014 +0100 printer_pages: Source cleanup --- checks/printer_pages | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checks/printer_pages b/checks/printer_pages index a063cbc..880d5cb 100644 --- a/checks/printer_pages +++ b/checks/printer_pages @@ -25,10 +25,9 @@ # Boston, MA 02110-1301 USA. def inventory_printer_pages(info): - if len(info) > 0: - return [ (None, None) ] + return [ (None, None) ] -def check_printer_pages(item, params, info): +def check_printer_pages(_no_item, _no_params, info): pages = saveint(info[0][0]) infotext = "%d Pages printed" % pages perfdata = [ ( "pages", pages ) ]

10 years, 6 months

Check_MK Git: check_mk: werk 559: fixed bug exception when uploading snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: 13e4887a2d4a1408418c9a705820107ccdbd66a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13e4887a2d4a14… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 26 18:10:14 2014 +0100 werk 559: fixed bug exception when uploading snapshots --- ChangeLog | 2 +- web/htdocs/multitar.py | 3 ++- web/htdocs/wato.py | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f12811b..64d651f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -202,7 +202,7 @@ * 0665 Added mail notificaton method to custom user notification dialog... * 0123 New time range filter for Downtimes and Comments... * 0683 New column painter for the last time a service was OK... - * 0561 quicksearch: now able to search for multiple patterns... + * 0561 quicksearch: now able to search with multiple filters... * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE * 0239 FIX: Fixed incorrect html formatting when displaying host or service comments... * 0307 FIX: Increased performance of multisite GUI with a large userbase... diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index aafe2ef..0c785f1 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -88,6 +88,7 @@ def list_tar_content(the_tarfile): files = {} try: if type(the_tarfile) != str: + the_tarfile.seek(0) tar = tarfile.open("r", fileobj = the_tarfile) else: tar = tarfile.open(the_tarfile, "r") @@ -98,10 +99,10 @@ def list_tar_content(the_tarfile): def get_file_content(the_tarfile, filename): if type(the_tarfile) != str: + the_tarfile.seek(0) tar = tarfile.open("r", fileobj = the_tarfile) else: tar = tarfile.open(the_tarfile, "r") - tar = tarfile.open(the_tarfile, "r") return tar.extractfile(filename).read() def extract_domains(tar, domains): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 20eb882..372ef61 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5941,7 +5941,10 @@ def get_snapshot_status(snapshot): else: # new snapshots for entry in ["comment", "created_by", "type"]: if entry in status["files"]: - status[entry] = multitar.get_file_content(snapshot_dir + name, entry) + if file_stream: + status[entry] = multitar.get_file_content(file_stream, entry) + else: + status[entry] = multitar.get_file_content(snapshot_dir + name, entry) else: raise MKGeneralException(_("Invalid snapshot (missing file: %s)") % entry) @@ -5986,7 +5989,8 @@ def get_snapshot_status(snapshot): status["broken"] = True pass except Exception, e: - status["broken_text"] = e.message + import traceback + status["broken_text"] = traceback.format_exc() status["broken"] = True pass return status

10 years, 6 months

Check_MK Git: check_mk: beautified werk 561

by Andreas Boesl

Module: check_mk Branch: master Commit: 81ce173177cdde92999855ae955f1e0cda242404 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81ce173177cdde… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 26 17:34:35 2014 +0100 beautified werk 561 --- .werks/561 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.werks/561 b/.werks/561 index d220b8d..2ad4445 100644 --- a/.werks/561 +++ b/.werks/561 @@ -21,7 +21,7 @@ C+: s: mem h: localhost C-: -This will search for all services containing <tt>mem</tt> on the localhost. +This will search for all services containing <tt>mem</tt> on the <tt>localhost</tt>. Furthermore you can combine these filters. C+: @@ -36,8 +36,11 @@ The search algorhytm is as follow: <li>Different filters are combined with <tt>AND</tt></li> </ul> -The query <tt>h: localhost s: mem s: cpu h:switch-intern</tt> actually results in the -following livestatus query: +The query +C+: +h: localhost s: mem s: cpu h:switch-intern +C-: +actually results in the following livestatus query: C+: GET services @@ -54,4 +57,4 @@ Limit: 80 C-: You can also add the <tt>hg:</tt> and <tt>sg:</tt> filters to the query. -Note: Right now, this multisearch filter only works if at least one of the filters is a service (<tt>s:</tt>). +Note: Right now, this multisearch filter only works if at least one of the filters is a service ( <tt>s:</tt> ).

10 years, 6 months

Check_MK Git: check_mk: Title: quicksearch: now able to search with multiple filters

by Andreas Boesl

Module: check_mk Branch: master Commit: 448b0ed051537b65846bd5130646b16450718fff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=448b0ed051537b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 26 17:31:42 2014 +0100 Title: quicksearch: now able to search with multiple filters --- .werks/561 | 57 +++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 369 +++++++++++++++++++++++++++-------------- web/plugins/sidebar/search.py | 149 ++++++++++++++--- 4 files changed, 431 insertions(+), 145 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=448b0ed051…

10 years, 6 months

Check_MK Git: check_mk: RBN: Edit user specific notificatios rules via WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 30ca22cbe355e0dffeae8e50f0894341361f2494 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30ca22cbe355e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 26 17:26:45 2014 +0100 RBN: Edit user specific notificatios rules via WATO --- web/htdocs/images/button_notifications_hi.png | Bin 0 -> 4762 bytes web/htdocs/images/button_notifications_lo.png | Bin 0 -> 5038 bytes web/htdocs/wato.py | 587 +++++++++++++++---------- web/plugins/wato/globals_notification.py | 3 +- 4 files changed, 345 insertions(+), 245 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=30ca22cbe3…

10 years, 6 months

Check_MK Git: check_mk: Allow foo@localhost as valid email address

by Mathias Kettner

Module: check_mk Branch: master Commit: 4eb58aaaf7f4f046103811a69c4d452435c9cc4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4eb58aaaf7f4f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 26 16:17:28 2014 +0100 Allow foo@localhost as valid email address --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c47ad63..7d509f1 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -452,7 +452,7 @@ class RegExpUnicode(TextUnicode, RegExp): class EmailAddress(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) - self._regex = re.compile('^[A-Z0-9._%+-]+(a)[A-Z0-9.-]+\.[A-Z]{2,4}$', re.I) + self._regex = re.compile('^[A-Z0-9._%+-]+(a)(localhost|[A-Z0-9.-]+\.[A-Z]{2,4})$', re.I) self._make_clickable = kwargs.get("make_clickable", False) def value_to_text(self, value):

10 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014