Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: FIX: Making "action" context link unclickable during handling actions / confirms

by Lars Michelsen

Module: check_mk Branch: master Commit: 0519760026bb09e6cd3a2017370aca73fc647dcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0519760026bb09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 10:22:00 2013 +0100 FIX: Making "action" context link unclickable during handling actions / confirms --- ChangeLog | 1 + web/htdocs/views.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f48e00..fc9d552 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * Improved debug logging of ldap syncs (Now writing duration of queries to log) * Displaying date/time of comments in comment icon hover menu (Please note: You need to update your livestatus to current version to make this work) + * FIX: Making "action" context link unclickable during handling actions / confirms BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c3c5fb1..9318519 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1429,13 +1429,17 @@ def render_view(view, rows, datasource, group_painters, painters, if show_buttons: update_context_links( # don't take display_options into account here ('c' is set during reload) - row_count > 0 and should_show_command_form('C', datasource), + row_count > 0 and should_show_command_form('C', datasource) \ + and not html.do_actions(), can_display_checkboxes ) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): play_alarm_sounds() + else: + # Always hide action related context links in this situation + update_context_links(False, False) # In multi site setups error messages of single sites do not block the # output and raise now exception. We simply print error messages here.

11 years, 7 months

Check_MK Git: check_mk: FIX: When a single rule matching raises an exception, the line is now

by Lars Michelsen

Module: check_mk Branch: master Commit: 1efb6cd92cca8932e192b208abc80a83dff84c05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1efb6cd92cca89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 10:46:06 2013 +0100 FIX: When a single rule matching raises an exception, the line is now matched agains the following rules instead of being skipped. The exception is logged to mkeventd.log --- ChangeLog | 3 +++ mkeventd/bin/mkeventd | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc9d552..95f47bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,9 @@ during "activate changes" process * Added hook mkeventd-activate-changes to add custom actions to the mkeventd "activate changes" GUI function + * FIX: When a single rule matching raises an exception, the line is now + matched agains the following rules instead of being skipped. The + exception is logged to mkeventd.log 1.2.1i5: Core: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index fc05d77..fa58bff 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1218,7 +1218,11 @@ class EventServer: rule_candidates = self._rules for rule in rule_candidates: - result = self.event_rule_matches(rule, event) + try: + result = self.event_rule_matches(rule, event) + except Exception: + log(' Exception during matching:\n%s' % format_exception()) + result = False if result: g_perfcounters.count("rule_hits") cancelling, groups = result @@ -1280,7 +1284,6 @@ class EventServer: do_rule_actions(rule, event) return - # Checks if an event matches a rule. Returns either False (no match) # or a pair of matchtype, groups, where matchtype is False for a # normal match and True for a cancelling match and the groups is a tuple @@ -1307,7 +1310,7 @@ class EventServer: log(" did not match because of wrong application '%s' (need '%s')" % (event["application"], pattern(rule.get("match_application")))) return False - + if "match_facility" in rule and event["facility"] != rule["match_facility"]: if debug: log(" did not match because of wrong syslog facility")

11 years, 7 months

Check_MK Git: check_mk: Fixed wrong variable name

by Lars Michelsen

Module: check_mk Branch: master Commit: 09603c36d65639469140bf81495ae58e2d03444a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09603c36d65639… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 18:49:04 2013 +0100 Fixed wrong variable name --- checks/winperf_phydisk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index f113775..e55803e 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -82,7 +82,7 @@ def winperf_phydisk_convert(info): # information) empty = [ -1 for x in disks ] - return zip(disks, disk_read_bytes, disk_write_bytes, reads, writes, empty, disk_readq_ctrs, disk_writeq_ctrs) + return zip(disks, disk_read_bytes, disk_write_bytes, disk_reads, disk_writes, empty, disk_readq_ctrs, disk_writeq_ctrs) def inventory_winperf_phydisk(info): return inventory_diskstat_generic(winperf_phydisk_convert(info))

11 years, 7 months

Check_MK Git: check_mk: The ldap member attribute of groups is now configruable via WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d594fddb66f92b2dc9185a2f8c6fd41ec34af2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d594fddb66f92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 14:01:49 2013 +0100 The ldap member attribute of groups is now configruable via WATO --- ChangeLog | 1 + web/plugins/userdb/ldap.py | 5 ++++- web/plugins/wato/check_mk_configuration.py | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47a2a5a..533974d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ is deprecated in python > 2.5 to prevent warning messages in apache error log * Added host filter for "last host state change" and "last host check" * FIX: Preventing autocomplete in password fields of "edit profile" dialog + * The ldap member attribute of groups is now configruable via WATO BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 810e3b6..2755f9a 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -246,6 +246,9 @@ def ldap_replace_macros(tmpl): def ldap_user_id_attr(): return config.ldap_userspec.get('user_id', ldap_attr('user_id')) +def ldap_member_attr(): + return config.ldap_groupspec.get('member', ldap_attr('member')) + def ldap_get_user(username, no_escape = False): if username in g_ldap_user_cache: return g_ldap_user_cache[username] @@ -303,7 +306,7 @@ def ldap_user_groups(username, attr = 'cn'): # Apply configured group ldap filter and only reply with groups # having the current user as member - filt = '(&%s(%s=%s))' % (ldap_filter('groups'), ldap_attr('member'), + filt = '(&%s(%s=%s))' % (ldap_filter('groups'), ldap_member_attr(), ldap.filter.escape_filter_chars(user_dn)) # First get all groups groups_cn = [] diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f0fea9e..59a773d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -424,7 +424,7 @@ register_configvar(group, default_value = lambda: userdb.ldap_filter('users', False), )), ("user_id", TextAscii( - title = _("User-ID Attrubute"), + title = _("User-ID Attribute"), help = _("The attribute used to identify the individual users. It must have " "unique values to make an user identifyable by the value of this " "attribute."), @@ -469,8 +469,13 @@ register_configvar(group, size = 80, default_value = lambda: userdb.ldap_filter('groups', False), )), + ("member", TextAscii( + title = _("Member Attribute"), + help = _("The attribute used to identify users group memberships."), + default_value = lambda: userdb.ldap_attr('member'), + )), ], - optional_keys = ['scope', 'filter'], + optional_keys = ['scope', 'filter', 'member'], ), domain = "multisite", )

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed exception in editing code of ldap group to rule plugin

by Lars Michelsen

Module: check_mk Branch: master Commit: ac8bb3352399081be83fce2f8b481da265dce5b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac8bb335239908… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 09:32:38 2013 +0100 FIX: Fixed exception in editing code of ldap group to rule plugin --- .bugs/914 | 7 +++++-- ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/914 b/.bugs/914 index 831b38c..e872ebf 100644 --- a/.bugs/914 +++ b/.bugs/914 @@ -1,9 +1,12 @@ Title: Host views miss filter "Last host state change" Component: multisite -State: open +Class: feature +State: done Date: 2013-02-05 08:57:08 Targetversion: 1.2.3 -Class: feature The service views have such a filter for the service state. It would be nice to have it also in host views. + +2013-02-07 08:49:46: changed state open -> done +Just implemented this. diff --git a/ChangeLog b/ChangeLog index c1d76f5..47a2a5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * Added oracle_tablespaces configuration to the application checkgroup * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups * FIX: "Sync & Restart" did not perform restart in distributed WATO setups + * FIX: Fixed exception in editing code of ldap group to rule plugin Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 716d111..810e3b6 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -531,7 +531,7 @@ def ldap_list_roles_with_group_dn(): "be defined within the scope of the " "<a href=\"wato.py?mode=edit_configvar&varname=ldap_groupspec\">LDAP Group Settings</a>."), size = 80, - enforce_suffix = ldap_replace_macros(config.ldap_groupspec['dn']), + enforce_suffix = ldap_replace_macros(config.ldap_groupspec.get('dn', '')), ))) return elements

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0916

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e49c47aab87f5394aef873e9e0fac0e053115f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e49c47aab87f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 11:12:41 2013 +0100 Updated bug entries #0916 --- .bugs/916 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/.bugs/916 b/.bugs/916 new file mode 100644 index 0000000..7385abb --- /dev/null +++ b/.bugs/916 @@ -0,0 +1,14 @@ +Title: Contactgroup deletion does not affect rules / Rules break on next save +Component: wato +State: open +Date: 2013-02-07 11:10:41 +Targetversion: 1.2.2 +Class: bug + +When having a contactgroup and a rule which assignes the group, +then deleting the group, the rule still points to the group. + +When opening the edit dialog for that rule, the configured +value can not be selected anymore, since the value does not +exist in the dropdown field. The first element is selected +. When saving this rule it changes the value! this is bad.

11 years, 7 months

Check_MK Git: check_mk: Added host filter for "last host state change" and "last host check"

by Lars Michelsen

Module: check_mk Branch: master Commit: c188dee5291570799e0eee5d2339aa9bd9c420af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c188dee5291570… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 08:49:34 2013 +0100 Added host filter for "last host state change" and "last host check" --- .bugs/910 | 7 +++++-- ChangeLog | 1 + web/plugins/views/filters.py | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/910 b/.bugs/910 index 000777f..f1f4e79 100644 --- a/.bugs/910 +++ b/.bugs/910 @@ -1,9 +1,12 @@ Title: Distributed WATO - activate changes bad dialog handling Component: wato -State: open +Class: bug +State: done Date: 2013-02-04 10:03:33 Targetversion: 1.2.2 -Class: bug When having a change pending, clicking "sync & restart", the sync is done, but no restart is triggered. The restart has to be done again by clicking "restart". + +2013-02-07 08:38:52: changed state open -> done +Just fixed this. diff --git a/ChangeLog b/ChangeLog index 968a874..c1d76f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * Added comment painter to notification related views * Added compatibility code to use hashlib.md5() instead of md5.md5(), which is deprecated in python > 2.5 to prevent warning messages in apache error log + * Added host filter for "last host state change" and "last host check" * FIX: Preventing autocomplete in password fields of "edit profile" dialog BI: diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 77be9ea..559cd43 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -460,6 +460,9 @@ class FilterTime(Filter): declare_filter(250, FilterTime("service", "svc_last_state_change", _("Last service state change"), "service_last_state_change")) declare_filter(251, FilterTime("service", "svc_last_check", _("Last service check"), "service_last_check")) +declare_filter(250, FilterTime("host", "host_last_state_change", _("Last host state change"), "host_last_state_change")) +declare_filter(251, FilterTime("host", "host_last_check", _("Last host check"), "host_last_check")) + # _ # | | ___ __ _ # | | / _ \ / _` |

11 years, 7 months

Check_MK Git: check_mk: Added bind result logging to debug log

by Lars Michelsen

Module: check_mk Branch: master Commit: ab1312db318fb37fae93a4185f06e6011e5e057b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab1312db318fb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 16:39:03 2013 +0100 Added bind result logging to debug log --- web/plugins/userdb/ldap.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index ac79113..187c176 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -167,7 +167,9 @@ def ldap_bind(username, password, catch = True): ldap_log('LDAP_BIND %s' % username) try: ldap_connection.simple_bind_s(username, password) + ldap_log(' SUCCESS') except ldap.LDAPError, e: + ldap_log(' FAILED (%s)' % e) if catch: raise MKLDAPException(_('Unable to authenticate with LDAP (%s)' % e)) else:

11 years, 7 months

Check_MK Git: check_mk: Fixed login when having "enforce lower user_id" enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: fe7f9a58d9c4b5058e940f5dd24b60b5135ae12e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe7f9a58d9c4b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 15:58:29 2013 +0100 Fixed login when having "enforce lower user_id" enabled --- web/plugins/userdb/ldap.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 75834d2..ac79113 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -268,6 +268,9 @@ def ldap_get_user(username, no_escape = False): dn = result[0][0] user_id = result[0][1][ldap_user_id_attr()][0] + if config.ldap_userspec.get('lower_user_ids', False): + user_id = user_id.lower() + g_ldap_user_cache[username] = (dn, user_id) if no_escape:

11 years, 7 months

Check_MK Git: check_mk: Improved debug logging of ldap syncs (

by Lars Michelsen

Now writing duration of queries to log) Message-ID: <5113ccb8.YRCwIdXQCtWItYQa%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 81b19134b79b40c46dc2aa68fa55d4d0099793bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81b19134b79b40… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 15:36:02 2013 +0100 Improved debug logging of ldap syncs (Now writing duration of queries to log) --- ChangeLog | 1 + web/plugins/userdb/ldap.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f136a48..3cdd4a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * FIX: Preventing autocomplete in password fields of "edit profile" dialog * The ldap member attribute of groups is now configruable via WATO * Added option to enforce lower User-IDs during LDAP sync + * Improved debug logging of ldap syncs (Now writing duration of queries to log) BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index bb8f4cc..75834d2 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -187,6 +187,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): scope = ldap.SCOPE_ONELEVEL ldap_log('LDAP_SEARCH "%s" "%s" "%s" "%r"' % (base, scope, filt, columns)) + start_time = time.time() # Convert all keys to lower case! result = [] @@ -210,7 +211,8 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): 'incomplete results. You should change the scope of operation ' 'within the ldap or adapt the limit settings of the LDAP server.')) - ldap_log(' RESULT length: %d' % len(result)) + duration = time.time() - start_time + ldap_log(' RESULT length: %d, duration: %0.3f' % (len(result), duration)) return result #return ldap_connection.search_s(base, scope, filter, columns) #for dn, obj in ldap_connection.search_s(base, scope, filter, columns): @@ -596,6 +598,8 @@ def ldap_sync(add_to_changelog, only_username): g_ldap_user_cache = {} g_ldap_group_cache = {} + start_time = time.time() + ldap_connect() # Unused at the moment, always sync all users @@ -651,6 +655,9 @@ def ldap_sync(add_to_changelog, only_username): _("LDAP Connector: Modified user %s (Added: %s, Removed: %s, Changed: %s)" % (user_id, ', '.join(added), ', '.join(removed), ', '.join(changed)))) + duration = time.time() - start_time + ldap_log('SYNC FINISHED - Duration: %0.3f sec' % duration) + save_users(users) # Calculates the attributes of the users which are locked for users managed

11 years, 7 months

← Newer
1
...
27
28
29
30
31
32
33
34
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013