Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: LDAP: Fixed bug in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 096a92cd9b36f65b9e2f42b073b06d5ab26ca5e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=096a92cd9b36f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 14:52:08 2013 +0100 LDAP: Fixed bug in last commit --- web/htdocs/wato.py | 4 ++++ web/plugins/config/builtin.py | 1 + web/plugins/userdb/ldap.py | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2a37ef0..2f6a0a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6098,6 +6098,8 @@ def mode_ldap_config(phase): return (False, msg) def test_user_base_dn(address): + if not userdb.ldap_user_base_dn_configured(): + return (False, _('The User Base DN is not configured.')) userdb.ldap_connect(enforce_new = True, enforce_server = address) if userdb.ldap_user_base_dn_exists(): return (True, _('The User Base DN could be found.')) @@ -6110,6 +6112,8 @@ def mode_ldap_config(phase): 'to configure proper bind credentials.')) def test_user_count(address): + if not userdb.ldap_user_base_dn_configured(): + return (False, _('The User Base DN is not configured.')) userdb.ldap_connect(enforce_new = True, enforce_server = address) try: ldap_users = userdb.ldap_get_users() diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 8881a22..0dc9f35 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -215,6 +215,7 @@ escape_plugin_output = True user_connectors = ['htpasswd'] userdb_automatic_sync = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ] ldap_connection = { + 'type' : 'ad', 'page_size' : 1000, } ldap_userspec = { diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 43c04e3..644c56b 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -438,6 +438,9 @@ def ldap_member_attr(): def ldap_bind_credentials_configured(): return config.ldap_connection.get('bind', ('', ''))[0] != '' +def ldap_user_base_dn_configured(): + return config.ldap_userspec.get('dn', '') != '' + def ldap_group_base_dn_configured(): return config.ldap_groupspec.get('dn', '') != '' @@ -943,7 +946,7 @@ def ldap_sync(add_to_changelog, only_username): # requests to e.g. the page hook would cause duplicate calculations file(g_ldap_sync_time_file, 'w').write('%s\n' % time.time()) - if not config.ldap_connection: + if not config.ldap_connection or not ldap_user_base_dn_configured(): return # silently skip sync without configuration # Flush ldap related before each sync to have a caching only for the

10 years, 9 months

Check_MK Git: check_mk: New mkp package for web applications: iNag / nagstatus / nagios status.dat

by Andreas Boesl

Module: check_mk Branch: master Commit: 15768433ac16a08bc0675d9367445351a36e3780 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15768433ac16a0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 19 14:49:51 2013 +0100 New mkp package for web applications: iNag / nagstatus / nagios status.dat This mkp package is not in the official check_mk build. You can find it in the check_mk git under doc/treasures/webapps. For further information please refer to the README in the webapps dir. --- .werks/247 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/webapps/README | 17 +++++++++++++++++ doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp | Bin 0 -> 3942 bytes 4 files changed, 28 insertions(+) diff --git a/.werks/247 b/.werks/247 new file mode 100644 index 0000000..b1e10d2 --- /dev/null +++ b/.werks/247 @@ -0,0 +1,10 @@ +Title: New mkp package for web applications: iNag / nagstatus / nagios status.dat +Level: 1 +Component: multisite +Version: 1.2.5i1 +Date: 1387460746 +Class: feature + +This mkp package is not in the official check_mk build. +You can find it in the check_mk git under doc/treasures/webapps. +For further information please refer to the README in the webapps dir. diff --git a/ChangeLog b/ChangeLog index 502d5ab..4961941 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ * 0352 Avoid Livestatus connections on pages that do not need them... * 0390 Added an icon selector to the view editor... * 0391 Added sorter / filter for host/service service levels... + * 0247 New mkp package for web applications: iNag / nagstatus / nagios status.dat... * 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/doc/treasures/webapps/README b/doc/treasures/webapps/README new file mode 100644 index 0000000..0452612 --- /dev/null +++ b/doc/treasures/webapps/README @@ -0,0 +1,17 @@ +Installing this mkp package results in the following new features + +* INAG support (iPhone nagios app) +Only works with basic auth activated + +* Nagstatus support (Windows sidebar / desktop gadget) +http://monitoringhost/site/check_mk/nagios_webapps.py?cmd=nagstatus.xml&_username=XXXXXX&_secret=MAWSYCJAMAICCFBADFDS + +* Get Logfile of last 24 hours +http://monitoringhost/site/check_mk/nagios_webapps.py?cmd=nagios.log&_username=XXXXXX&_secret=MAWSYCJAMAICCFBADFDS + +* Get nagios status.dat +http://monitoringhost/site/check_mk/nagios_webapps.py?cmd=status.dat&_username=XXXXXX&_secret=MAWSYCJAMAICCFBADFDS + +Note: +All of this features also work in distributed setups +So you can aquire on big status.dat file which reflects the state of several sites. diff --git a/doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp b/doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp new file mode 100644 index 0000000..c5f5083 Binary files /dev/null and b/doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp differ

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e48f19d8662011e852a3e61b9fa70c47c4ee277 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e48f19d866201… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 14:30:22 2013 +0100 FIX LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled --- .werks/415 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/415 b/.werks/415 new file mode 100644 index 0000000..4c9ee3b --- /dev/null +++ b/.werks/415 @@ -0,0 +1,10 @@ +Title: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387459797 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index ef1e953..8bf8c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 0389 FIX: Showing LDAP settings on site specific global settings page now... * 0400 FIX: WATO BI editor now supports percentages for count_ok... * 0392 FIX: LDAP: Improved error messages of LDAP configuration test... + * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c896f93..2a37ef0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6032,6 +6032,11 @@ def mode_ldap_config(phase): current_settings = load_configuration_settings() + if not userdb.connector_enabled('ldap'): + html.message(_('The LDAP user connector is disabled. You need to enable it to be able ' + 'to configure the LDAP settings.')) + return + if phase == 'action': if not html.check_transaction(): return

10 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 60812dacf340af1e87d76d766120d59686235526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60812dacf340af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 14:29:21 2013 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 21c8d99..5910394 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -415 +435

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Auth expiration plugin now checks users for being disabled (in AD)

by Lars Michelsen

Module: check_mk Branch: master Commit: 00f19dd9091c62486979a40aa3181096ab5260eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00f19dd9091c62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 14:25:01 2013 +0100 FIX LDAP: Auth expiration plugin now checks users for being disabled (in AD) The authentication expiration ldap sync plugin now also checks wether or not a user has been disabled in LDAP. This only works with Active Directory based LDAPs at the moment. --- .werks/394 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 19 ++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.werks/394 b/.werks/394 new file mode 100644 index 0000000..2276933 --- /dev/null +++ b/.werks/394 @@ -0,0 +1,12 @@ +Title: LDAP: Auth expiration plugin now checks users for being disabled (in AD) +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387459423 +Targetversion: future + +The authentication expiration ldap sync plugin now also checks wether or not +a user has been disabled in LDAP. This only works with Active Directory based +LDAPs at the moment. diff --git a/ChangeLog b/ChangeLog index 880c76d..fe0c1a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * 0374 FIX: Fixed syntax error in exception handler of LDAP search code... * 0375 FIX: LDAP: Now handling user-ids with umlauts... * 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000... + * 0394 FIX: LDAP: Auth expiration plugin now checks users for being disabled (in AD)... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 24dd484..43c04e3 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -709,6 +709,15 @@ ldap_attribute_plugins['alias'] = { # In first instance, it must parse the pw-changed field, then check wether or not # a date has been stored in the user before and then maybe increase the serial. def ldap_convert_auth_expire(plugin, params, user_id, ldap_user, user): + # Special handling for active directory: Is the user enabled / disabled? + if config.ldap_connection['type'] == 'ad' and ldap_user.get('useraccountcontrol'): + # see http://www.selfadsi.de/ads-attributes/user-userAccountControl.htm for details + if saveint(ldap_user['useraccountcontrol'][0]) & 2: + return { + 'locked': True, + 'serial': user.get('serial', 0) + 1, + } + changed_attr = params.get('attr', ldap_attr('pw_changed')) if not changed_attr in ldap_user: raise MKLDAPException(_('The "Authentication Expiration" attribute (%s) could not be fetched ' @@ -730,12 +739,20 @@ def ldap_convert_auth_expire(plugin, params, user_id, ldap_user, user): return {} +def ldap_attrs_auth_expire(params): + attrs = [ params.get('attr', ldap_attr('pw_changed')) ] + + # Fetch user account flags to check locking + if config.ldap_connection['type'] == 'ad': + attrs.append('useraccountcontrol') + return attrs + ldap_attribute_plugins['auth_expire'] = { 'title': _('Authentication Expiration'), 'help': _('This plugin fetches all information which are needed to check wether or ' 'not an already authenticated user should be deauthenticated, e.g. because ' 'the password has changed in LDAP or the account has been locked.'), - 'needed_attributes': lambda params: [ params.get('attr', ldap_attr('pw_changed')) ], + 'needed_attributes': ldap_attrs_auth_expire, 'convert': ldap_convert_auth_expire, # When a plugin introduces new user attributes, it should declare the output target for # this attribute. It can either be written to the multisites users.mk or the check_mk

10 years, 9 months

Check_MK Git: check_mk: brocade_fcport: fixed error in pnp-template

by Andreas Boesl

Module: check_mk Branch: master Commit: 5f99688f6e000035f5c846c6a496b7bd860d330f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f99688f6e0000… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 19 14:11:39 2013 +0100 brocade_fcport: fixed error in pnp-template --- .werks/246 | 10 +++++++++ ChangeLog | 1 + pnp-templates/check_mk-brocade_fcport.php | 34 ++++++++++++++--------------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.werks/246 b/.werks/246 new file mode 100644 index 0000000..3b9e1fd --- /dev/null +++ b/.werks/246 @@ -0,0 +1,10 @@ +Title: brocade_fcport: fixed error in pnp-template +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387458091 +Targetversion: future + +Error was caused through a duplicate definition of a parameter. diff --git a/ChangeLog b/ChangeLog index 880c76d..502d5ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * 0368 FIX: Generating selection id is hopefully now compatible to more systems... * 0374 FIX: Fixed syntax error in exception handler of LDAP search code... * 0375 FIX: LDAP: Now handling user-ids with umlauts... + * 0246 FIX: brocade_fcport: fixed error in pnp-template... * 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000... WATO: diff --git a/pnp-templates/check_mk-brocade_fcport.php b/pnp-templates/check_mk-brocade_fcport.php index 0cb19ab..15eac8f 100644 --- a/pnp-templates/check_mk-brocade_fcport.php +++ b/pnp-templates/check_mk-brocade_fcport.php @@ -66,23 +66,23 @@ $def[1] = "" if (isset($RRD['in_avg'])) { $def[1] .= "" - . "DEF:inavg=$RRD[in_avg] " - . "DEF:outavg=$RRD[out_avg] " - . "CDEF:inavgmb=inavg,1048576,/ " - . "CDEF:outavgmb=outavg,1048576,/ " - . "DEF:inavgavg=$RRDAVG[in_avg] " - . "DEF:outavgavg=$RRDAVG[out_avg] " - . "CDEF:inavgmbavg=inavgavg,1048576,/ " - . "CDEF:outavgmbavg=outavgavg,1048576,/ " - . "CDEF:outavgmbdraw=outavg,-1048576,/ " - . "LINE:inavgmb#a0d040:\"in (avg) \" " - . "GPRINT:inavgmb:LAST:\"%5.3lf MB/s last\" " - . "GPRINT:inavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " - . "GPRINT:inavgmb:MAX:\"%5.3lf MB/s max\\n\" " - . "LINE:outavgmbdraw#40a0d0:\"out (avg)\" " - . "GPRINT:outavgmb:LAST:\"%5.3lf MB/s last\" " - . "GPRINT:outavgmbavg:AVERAGE:\"%5.3lf MB/s avg\" " - . "GPRINT:outavgmb:MAX:\"%5.3lf MB/s max\\n\" " + . "DEF:inaverage=$RRD[in_avg] " + . "DEF:outaverage=$RRD[out_avg] " + . "CDEF:inaveragemb=inaverage,1048576,/ " + . "CDEF:outaveragemb=outaverage,1048576,/ " + . "DEF:inaverage_avg=$RRDAVG[in_avg] " + . "DEF:outaverage_avg=$RRDAVG[out_avg] " + . "CDEF:inaveragemb_avg=inaverage_avg,1048576,/ " + . "CDEF:outaveragemb_avg=outaverage_avg,1048576,/ " + . "CDEF:outaveragemb_draw=outaverage,-1048576,/ " + . "LINE:inaveragemb_avg#a0d040:\"in (avg) \" " + . "GPRINT:inaveragemb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:inaveragemb_avg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:inaveragemb:MAX:\"%5.3lf MB/s max\\n\" " + . "LINE:outaveragemb_draw#40a0d0:\"out (avg)\" " + . "GPRINT:outaveragemb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:outaveragemb_avg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:outaveragemb:MAX:\"%5.3lf MB/s max\\n\" " ; }

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2123

by Lars Michelsen

Module: check_mk Branch: master Commit: bd71614b8ec822ee78a810cf37a220b2fb8b5b85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd71614b8ec822… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 17:07:06 2013 +0100 Updated bug entries #2123 --- .bugs/2123 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2123 b/.bugs/2123 new file mode 100644 index 0000000..fa5dadf --- /dev/null +++ b/.bugs/2123 @@ -0,0 +1,7 @@ +Title: Enable mkeventd per default in our builds +Component: core +State: open +Date: 2013-12-18 17:05:37 +Targetversion: 1.2.5i1 +Class: todo +

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Enabled paged LDAP search by default now with a page size of 1000

by Lars Michelsen

Module: check_mk Branch: master Commit: eb65baa1fde23a74d3bf09130eee92258ac65091 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb65baa1fde23a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 14:08:28 2013 +0100 FIX LDAP: Enabled paged LDAP search by default now with a page size of 1000 This seems to be a better default option for most users. If your LDAP server does not support paged LDAP searching, simply disable the paged search in your LDAP Settings. --- .werks/393 | 12 ++++++++++++ ChangeLog | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/393 b/.werks/393 new file mode 100644 index 0000000..fb1d236 --- /dev/null +++ b/.werks/393 @@ -0,0 +1,12 @@ +Title: LDAP: Enabled paged LDAP search by default now with a page size of 1000 +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387458430 +Targetversion: future + +This seems to be a better default option for most users. If your LDAP server +does not support paged LDAP searching, simply disable the paged search in +your LDAP Settings. diff --git a/ChangeLog b/ChangeLog index 567a1aa..56e4a11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 0368 FIX: Generating selection id is hopefully now compatible to more systems... * 0374 FIX: Fixed syntax error in exception handler of LDAP search code... * 0375 FIX: LDAP: Now handling user-ids with umlauts... + * 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000... WATO: * 0308 Multisite can now set rotation view permissions for NagVis...

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Improved error messages of LDAP configuration test

by Lars Michelsen

Module: check_mk Branch: master Commit: 583ca16f849c633f5f7696c0a9b7ac3816fc675f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=583ca16f849c63… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 14:07:07 2013 +0100 FIX LDAP: Improved error messages of LDAP configuration test Replaced several internal exception / cryptic errors with (hopefully) better understandable error messages in LDAP configuration test dialog. --- .werks/392 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 24 +++++++++++++++++++++++- web/plugins/config/builtin.py | 4 +++- web/plugins/userdb/ldap.py | 13 ++++++++++++- web/plugins/wato/check_mk_configuration.py | 3 ++- 6 files changed, 52 insertions(+), 4 deletions(-) diff --git a/.werks/392 b/.werks/392 new file mode 100644 index 0000000..bef9b79 --- /dev/null +++ b/.werks/392 @@ -0,0 +1,11 @@ +Title: LDAP: Improved error messages of LDAP configuration test +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387458361 +Targetversion: future + +Replaced several internal exception / cryptic errors with (hopefully) +better understandable error messages in LDAP configuration test dialog. diff --git a/ChangeLog b/ChangeLog index 56e4a11..e089e2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ * 0385 FIX: Better error handling for invalid service regex in rule conditions... * 0389 FIX: Showing LDAP settings on site specific global settings page now... * 0400 FIX: WATO BI editor now supports percentages for count_ok... + * 0392 FIX: LDAP: Improved error messages of LDAP configuration test... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bb10448..c896f93 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6096,8 +6096,13 @@ def mode_ldap_config(phase): userdb.ldap_connect(enforce_new = True, enforce_server = address) if userdb.ldap_user_base_dn_exists(): return (True, _('The User Base DN could be found.')) + elif userdb.ldap_bind_credentials_configured(): + return (False, _('The User Base DN could not be found. Maybe the provided ' + 'user (provided via bind credentials) has no permission to ' + 'access the Base DN or the credentials are wrong.')) else: - return (False, _('The User Base DN could not be found.')) + return (False, _('The User Base DN could not be found. Seems you need ' + 'to configure proper bind credentials.')) def test_user_count(address): userdb.ldap_connect(enforce_new = True, enforce_server = address) @@ -6107,12 +6112,21 @@ def mode_ldap_config(phase): except Exception, e: ldap_users = None msg = str(e) + if 'successful bind must be completed' in msg: + if not userdb.ldap_bind_credentials_configured(): + return (False, _('Please configure proper bind credentials.')) + else: + return (False, _('Maybe the provided user (provided via bind credentials) has not ' + 'enough permissions or the credentials are wrong.')) + if ldap_users and len(ldap_users) > 0: return (True, _('Found %d users for synchronization.') % len(ldap_users)) else: return (False, msg) def test_group_base_dn(address): + if not userdb.ldap_group_base_dn_configured(): + return (False, _('The Group Base DN is not configured, not fetching any groups.')) userdb.ldap_connect(enforce_new = True, enforce_server = address) if userdb.ldap_group_base_dn_exists(): return (True, _('The Group Base DN could be found.')) @@ -6120,6 +6134,8 @@ def mode_ldap_config(phase): return (False, _('The Group Base DN could not be found.')) def test_group_count(address): + if not userdb.ldap_group_base_dn_configured(): + return (False, _('The Group Base DN is not configured, not fetching any groups.')) userdb.ldap_connect(enforce_new = True, enforce_server = address) try: ldap_groups = userdb.ldap_get_groups() @@ -6127,6 +6143,12 @@ def mode_ldap_config(phase): except Exception, e: ldap_groups = None msg = str(e) + if 'successful bind must be completed' in msg: + if not userdb.ldap_bind_credentials_configured(): + return (False, _('Please configure proper bind credentials.')) + else: + return (False, _('Maybe the provided user (provided via bind credentials) has not ' + 'enough permissions or the credentials are wrong.')) if ldap_groups and len(ldap_groups) > 0: return (True, _('Found %d groups for synchronization.') % len(ldap_groups)) else: diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index bec88d0..8881a22 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -214,7 +214,9 @@ escape_plugin_output = True user_connectors = ['htpasswd'] userdb_automatic_sync = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ] -ldap_connection = {} +ldap_connection = { + 'page_size' : 1000, +} ldap_userspec = { 'scope' : 'sub', 'user_id_umlauts' : 'replace', diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index ca1fd6c..24dd484 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -435,6 +435,12 @@ def ldap_user_id_attr(): def ldap_member_attr(): return config.ldap_groupspec.get('member', ldap_attr('member')) +def ldap_bind_credentials_configured(): + return config.ldap_connection.get('bind', ('', ''))[0] != '' + +def ldap_group_base_dn_configured(): + return config.ldap_groupspec.get('dn', '') != '' + def ldap_user_base_dn_exists(): try: result = ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), columns = ['dn'], scope = 'base') @@ -524,10 +530,15 @@ def ldap_get_users(add_filter = ''): return result def ldap_group_base_dn_exists(): + group_base_dn = ldap_replace_macros(config.ldap_groupspec['dn']) + if not group_base_dn: + return False + try: - result = ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), columns = ['dn'], scope = 'base') + result = ldap_search(group_base_dn, columns = ['dn'], scope = 'base') except Exception, e: return False + if not result: return False else: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f7b0a1a..7c75551 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -615,7 +615,7 @@ register_configvar(group, help = _("LDAP searches can be performed in paginated mode, for example to improve " "the performance. This enables pagination and configures the size of the pages."), minvalue = 1, - default_value = 100, + default_value = 1000, )), ("response_timeout", Integer( title = _("Response Timeout (sec)"), @@ -625,6 +625,7 @@ register_configvar(group, )), ], optional_keys = ['no_persistent', 'use_ssl', 'bind', 'page_size', 'response_timeout', 'failover_servers'], + default_keys = ['page_size'] ), domain = "multisite", in_global_settings = False,

10 years, 9 months

Check_MK Git: check_mk: FIX: kemp_loadmaster_services: active connections without unit /sec

by Götz Golla

Module: check_mk Branch: master Commit: 4df498c450cb8f8cfc41cd2e9288000f311713fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4df498c450cb8f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Dec 19 14:06:16 2013 +0100 FIX: kemp_loadmaster_services: active connections without unit /sec --- checks/kemp_loadmaster_services | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/kemp_loadmaster_services b/checks/kemp_loadmaster_services index bd37fb4..c048114 100644 --- a/checks/kemp_loadmaster_services +++ b/checks/kemp_loadmaster_services @@ -42,10 +42,10 @@ def check_kemp_loadmaster_services(item, _no_params, info): if line[0] == item: service_state, conns = map(saveint, line[1:]) message = "State: %s" % (service_states[service_state-1]) - perfdata = [ ('conn_sec', conns) ] + perfdata = [ ('conns', conns) ] state = 3 if service_state in [ 1, 6 ]: - message += ", Connections: %s/s" % conns + message += ", Active Connections: %s" % conns state = 0 if service_state == 5: state = 1

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits