Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: Fixed exceptions on ldap connection edit page

by Lars Michelsen

Module: check_mk Branch: master Commit: 4952ac3a1e1ab8954f4d9dead10d36aa99a08260 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4952ac3a1e1ab8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 15:52:36 2015 +0200 Fixed exceptions on ldap connection edit page --- web/htdocs/wato.py | 3 ++- web/plugins/userdb/ldap.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 903cfe5..bf308da 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7603,6 +7603,7 @@ def vs_ldap_connection(new): def mode_edit_ldap_connection(phase): connection_id = html.var("id") connections = userdb.load_connection_config() + userdb.set_connection(connection_id) connection = {} if connection_id == None: new = True @@ -7651,6 +7652,7 @@ def mode_edit_ldap_connection(phase): userdb.save_connection_config(connections) config.user_connections = connections # make directly available on current page + userdb.set_connection(connection_id) if html.var("_save"): return "ldap_config" else: @@ -7785,7 +7787,6 @@ def mode_edit_ldap_connection(phase): (_('Sync-Plugin: Roles'), test_groups_to_roles), ] - userdb.set_connection(connection_id) for address in userdb.ldap_servers(): html.write('<h3>%s: %s</h3>' % (_('Server'), address)) table.begin('test', searchable = False) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index a831a77..f0d080c 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1294,6 +1294,7 @@ def ldap_migrate_config(): key = what + "_" + key connection[key] = val + save_connection_config([connection]) config.user_connections.append(connection)

9 years, 2 months

Check_MK Git: check_mk: Fixed exception while creating new connections

by Lars Michelsen

Module: check_mk Branch: master Commit: b68394b538a942866fdb17b501658d0cb2fae602 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b68394b538a942… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 16:01:01 2015 +0200 Fixed exception while creating new connections --- web/htdocs/wato.py | 5 +++-- web/plugins/userdb/ldap.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bf308da..b24507a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7252,7 +7252,8 @@ def mode_ldap_config(phase): from_pos = int(html.var("_move")) to_pos = int(html.var("_where")) connection = connections[from_pos] - log_pending(SYNC, None, "move-ldap-connection", _("Changed position of LDAP connection %s") % (connection["id"])) + log_pending(SYNC, None, "move-ldap-connection", _("Changed position of LDAP connection %s to %d") % + (connection["id"], to_pos)) del connections[from_pos] # make to_pos now match! connections[to_pos:to_pos] = [connection] userdb.save_connection_config(connections) @@ -12344,7 +12345,7 @@ def mode_users(phase): locked_attributes = userdb.locked_attributes(user_connection_id) else: table.cell(_("Connector"), "%s (%s) (disabled)" % - (connector['short_title'], user_connection_id), css="error") + (connector.get('short_title', 'UNKNOWN'), user_connection_id), css="error") locked_attributes = [] # Authentication diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index f0d080c..93b5433 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -959,7 +959,7 @@ def ldap_list_roles_with_group_dn(): ListOf( LDAPDistinguishedName( size = 80, - enforce_suffix = ldap_replace_macros(g_config['group_dn']), + enforce_suffix = ldap_replace_macros(g_config.get('group_dn', '')), allow_empty = False, ), title = role['alias'] + ' - ' + _("Specify the Group DN"),

9 years, 2 months

Check_MK Git: check_mk: Further ldap cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 68689c6afc94168733d2debab17221323a7210cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68689c6afc9416… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 1 11:03:05 2015 +0200 Further ldap cleanups --- web/htdocs/userdb.py | 55 ++++++++++++++++++---------------------- web/htdocs/wato.py | 20 +++++++-------- web/plugins/userdb/htpasswd.py | 9 ++++--- web/plugins/userdb/ldap.py | 32 +++++++++++++++-------- 4 files changed, 63 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=68689c6afc…

9 years, 2 months

Check_MK Git: check_mk: Made ldap sync working again

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a624c23d2e6cbc5579b014afa12e7a00b4a06ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a624c23d2e6cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 1 17:05:29 2015 +0200 Made ldap sync working again --- web/htdocs/userdb.py | 11 +- web/htdocs/wato.py | 30 ++-- web/plugins/userdb/ldap.py | 426 +++++++++++++++++++++++++------------------- 3 files changed, 268 insertions(+), 199 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1a624c23d2…

9 years, 2 months

Check_MK Git: check_mk: Fixed migrated default config for sync plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 01daa037b04b031ae390713effa88007f870b4f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01daa037b04b03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 16:06:59 2015 +0200 Fixed migrated default config for sync plugins --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 93b5433..3807a88 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1282,7 +1282,7 @@ def ldap_migrate_config(): 'description' : _('This is the default LDAP connection.'), 'disabled' : 'ldap' not in getattr(config, 'user_connectors', []), 'cache_livetime' : getattr(config, 'ldap_cache_livetime', 300), - 'active_plugins' : getattr(config, 'ldap_active_plugins', ['email', 'alias', 'auth_expire' ]), + 'active_plugins' : getattr(config, 'ldap_active_plugins', []) or {'email': {}, 'alias': {}, 'auth_expire': {}}, 'debug_log' : getattr(config, 'ldap_debug_log', False), }

9 years, 2 months

Check_MK Git: check_mk: Fixed custom user attribute syncing when " on page load" sync is disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 6690e236a0d3e0dc166c624f3badff6fca3babf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6690e236a0d3e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 2 10:34:15 2015 +0200 Fixed custom user attribute syncing when "on page load" sync is disabled --- web/plugins/userdb/ldap.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 18084bf..f708028 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -789,6 +789,8 @@ class LDAPUserConnector(UserConnector): if not self.has_user_base_dn_configured(): return # silently skip sync without configuration + register_user_attribute_sync_plugins() + # Flush ldap related before each sync to have a caching only for the # current sync process self.flush_caches() @@ -913,8 +915,6 @@ class LDAPUserConnector(UserConnector): # Is called on every multisite http request def on_page_load(self): - register_user_attribute_sync_plugins() - if self.sync_is_needed(): try: self.do_sync(False, None) @@ -1007,6 +1007,8 @@ def ldap_list_attribute_plugins(): # Returns a list of pairs (key, parameters) of all available attribute plugins def ldap_attribute_plugins_elements(): + register_user_attribute_sync_plugins() + elements = [] items = sorted(ldap_attribute_plugins.items(), key = lambda x: x[1]['title']) for key, plugin in items:

9 years, 2 months

Check_MK Git: check_mk: ldap: Fixed exception during "save & test" on connection creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 63e7595009fabc48dcfade68bdcc3f5faecea057 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63e7595009fabc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 2 10:15:57 2015 +0200 ldap: Fixed exception during "save & test" on connection creation --- web/htdocs/wato.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ae75285..aba0f43 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7638,6 +7638,7 @@ def mode_edit_ldap_connection(phase): if new: connections.insert(0, connection_cfg) + connection_id = connection_cfg["id"] else: connection_cfg["id"] = connection_id connections[connection_nr] = connection_cfg

9 years, 2 months

Check_MK Git: check_mk: Started user connector api cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: b8bea9f610c421f2d265a86d3a93531fd430853f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8bea9f610c421… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 1 10:16:43 2015 +0200 Started user connector api cleanup --- web/htdocs/userdb.py | 201 +++-- web/htdocs/wato.py | 59 +- web/plugins/userdb/htpasswd.py | 206 +++--- web/plugins/userdb/ldap.py | 1579 +++++++++++++++++++++------------------- 4 files changed, 1077 insertions(+), 968 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b8bea9f610…

9 years, 2 months

Check_MK Git: check_mk: Fixed Typo in manpage

by Bastian Kuhn

Module: check_mk Branch: master Commit: f0716379bfd57ae018406f312a61db3b540bb759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0716379bfd57a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 2 10:47:03 2015 +0200 Fixed Typo in manpage --- checkman/jolokia_metrics.perm_gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/jolokia_metrics.perm_gen b/checkman/jolokia_metrics.perm_gen index 9504bb4..ad7c61c 100644 --- a/checkman/jolokia_metrics.perm_gen +++ b/checkman/jolokia_metrics.perm_gen @@ -4,7 +4,7 @@ catalog: app/java license: GPL distribution: check_mk description: - This check allows to monitor the usage of Perm Sprace + This check allows to monitor the usage of Perm Space usage on web application servers. To use this plugin, Jolokia and the agent plugin need to be installed

9 years, 2 months

Check_MK Git: check_mk: Removed define_generic_graph, fixes exception in graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: acfa4da07fab816654d0b0c0a19e9a158599e41c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acfa4da07fab81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 2 10:28:22 2015 +0200 Removed define_generic_graph, fixes exception in graphs --- web/plugins/metrics/check_mk.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 02ba239..d33ee01 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4147,8 +4147,6 @@ graph_info.append({ ], }) -define_generic_graph("backup_age") - graph_info.append({ "title" : _("NTP time offset"), "metrics" : [ @@ -4292,8 +4290,6 @@ graph_info.append({ "range" : (0, "fs_used:max"), }) -define_generic_graph("fs_used") - graph_info.append({ "title" : _("Growing / Shrinking"), "metrics" : [

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015