Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64410 discussions

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

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: ba749fecf8a2f965c4a642bb7479cd0829533b0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba749fecf8a2f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 16:48:01 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0898

by Lars Michelsen

Module: check_mk Branch: master Commit: 10c9da078fe8a3c1fe49df01ec4dea9e6138a5c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10c9da078fe8a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 16:28:51 2013 +0100 Updated bug entries #0898 --- .bugs/898 | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.bugs/898 b/.bugs/898 index 434e964..4fecb31 100644 --- a/.bugs/898 +++ b/.bugs/898 @@ -1,16 +1,9 @@ -Title: Unresolvable host prevents loading configuration (bad behaviour) -Component: core +Title: Make "site" infos available e.g. as group header in "Events ..." views +Component: ec State: open -Date: 2013-01-22 09:44:36 -Targetversion: 1.4.0 -Class: nastiness +Date: 2013-02-07 16:27:32 +Targetversion: 1.2.2 +Class: cleanup -It seems strange, I am able to add a host to Check_MK by the host name and -while the name can be resolved everything is OK. But once the name is not -resolvable anymore (for whatever reason), the monitoring still works but -if I want to rewrite the config and restart nagios, the process is blocked -by that unresolvable host. - -This seems a bit nasty. It would be better to have a warning message or just -no message while applying the config. The monitoring will show me the fact -that the host is not resolvable. +The hostname and so on are available and filled, the "site" info can be selected +for the view, but there is no data rendered for the site. Should be added.

11 years, 7 months

Check_MK Git: check_mk: FIX: Do not execute ldap sync while performing actions on users page

by Lars Michelsen

Module: check_mk Branch: master Commit: 5af5486d51cc6760ef092c8946a5fc9aa0a02199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5af5486d51cc67… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 14:09:43 2013 +0100 FIX: Do not execute ldap sync while performing actions on users page --- ChangeLog | 1 + web/htdocs/wato.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 533974d..9bfbe10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 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 + * FIX: Don't execute ldap sync while performing actions on users page Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 491a1a2..91d46d3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7714,8 +7714,10 @@ def mode_users(phase): return # Execute all connectors synchronisations of users. This must be done before - # loading the users, because it might modify the users list - userdb.hook_sync(add_to_changelog = True) + # loading the users, because it might modify the users list. But don't execute + # it during actions, this should save some time. + if phase != "action": + userdb.hook_sync(add_to_changelog = True) roles = userdb.load_roles() users = filter_hidden_users(userdb.load_users())

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0897

by Lars Michelsen

Module: check_mk Branch: master Commit: 09bb3c49cc45060db9da2bef16635c70362d0fa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09bb3c49cc4506… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 16:16:06 2013 +0100 Updated bug entries #0897 --- .bugs/897 | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.bugs/897 b/.bugs/897 index 494729c..90cd42e 100644 --- a/.bugs/897 +++ b/.bugs/897 @@ -1,9 +1,12 @@ -Title: Add Windows-Agent as Zip-File to Download page -Component: core +Title: Add some security mechanism to prevent accidential removal of ldap users profile +Component: multisite State: open -Date: 2013-01-21 16:46:19 -Targetversion: future -Class: todo +Date: 2013-02-07 16:13:52 +Targetversion: 1.2.2 +Class: nastiness -It is bad for windows users that there is no zip-download of the agent. There is the installer -but someone might not want to use it. +It might happen that users are not visible to the ldap sync (maybe by temporary +misconfiguration). When a sync detects that one user is suddenly missing, it +removes the user from the configuration as also the htpasswd mechanism does. +This could lead in bad situations where customized things in multisite get lost, +maybe we find a way to prevent this somehow...?

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits