Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: Updated help of check_mkevents

by Lars Michelsen

Module: check_mk Branch: master Commit: 87b950f77d4129ed861760cbb0cd4b60d6b66de4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87b950f77d4129… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 11:24:32 2013 +0100 Updated help of check_mkevents --- mkeventd/lib/check_mkevents | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 0863273..563b779 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -65,8 +65,8 @@ try: else: application = None except: - sys.stdout.write("Usage: check_mkevents [-H REMOTE:PORT] [-a] HOST [APPLICATION]\n") - sys.stdout.write("\n -a do not take into account acknowledged events.\n") + sys.stdout.write("Usage: check_mkevents [-H (REMOTE:PORT|/path/to/unix/socket)] [-a] HOST [APPLICATION]\n") + sys.stdout.write("\n -a do not take into account acknowledged events.\n") sys.stdout.write("\n") sys.exit(3)

10 years, 9 months

Check_MK Git: check_mk: FIX check_mk -c: Now also rewrites the location of conf.d directory

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b35ce653f27d8cc44f1419ab5a8b9b1c0828095 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b35ce653f27d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 11:01:42 2013 +0100 FIX check_mk -c: Now also rewrites the location of conf.d directory --- .werks/379 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/379 b/.werks/379 new file mode 100644 index 0000000..2071d0c --- /dev/null +++ b/.werks/379 @@ -0,0 +1,10 @@ +Title: check_mk -c: Now also rewrites the location of conf.d directory +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387274477 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index e5792cf..7dff826 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 0087 FIX: Fixed possible locking issue when using datasource program with long output... * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... + * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk.py b/modules/check_mk.py index 6349fd7..5156294 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -170,6 +170,11 @@ if __name__ == "__main__": if not os.path.exists(check_mk_configfile): sys.stderr.write("Missing configuration file %s.\n" % check_mk_configfile) sys.exit(1) + + # Also rewrite the location of the conf.d directory + if os.path.exists(check_mk_basedir + "/conf.d"): + check_mk_configdir = check_mk_basedir + "/conf.d" + else: sys.stderr.write("Missing argument to option -c.\n") sys.exit(1)

10 years, 9 months

Check_MK Git: check_mk: FIX Fix folder visibility in WATO for unpriviledged users

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fe01b8cb4b15d4718d1fde513126e782ca13fd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fe01b8cb4b15d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 11:30:25 2013 +0100 FIX Fix folder visibility in WATO for unpriviledged users In WATO if you are an unpriviledged user you might have write access to some lower subfolders but not to the upper folders. This is perfectly common, because that way the monitoring administrator can delegate tasks for certain classes of hosts to his collegues. Previously, however, you couldn't navigate to the lower folders without faking the URL. This has been fixed now. If you are located in a folder without having permissions to it you won't see any hosts of that folder, but still you see the subfolders and also can enter these. Also this fix removes that buttons for actions on a folder if you do not have write permissions to it. --- .werks/346 | 21 +++++++++++++++++++++ ChangeLog | 1 + web/htdocs/wato.css | 8 ++++++++ web/htdocs/wato.py | 46 +++++++++++++++++++++++++++++----------------- 4 files changed, 59 insertions(+), 17 deletions(-) diff --git a/.werks/346 b/.werks/346 new file mode 100644 index 0000000..36cd5de --- /dev/null +++ b/.werks/346 @@ -0,0 +1,21 @@ +Title: Fix folder visibility in WATO for unpriviledged users +Level: 2 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387276017 +Targetversion: future + +In WATO if you are an unpriviledged user you might have write access to some +lower subfolders but not to the upper folders. This is perfectly common, +because that way the monitoring administrator can delegate tasks for certain +classes of hosts to his collegues. + +Previously, however, you couldn't navigate to the lower folders without +faking the URL. This has been fixed now. If you are located in a folder +without having permissions to it you won't see any hosts of that folder, +but still you see the subfolders and also can enter these. + +Also this fix removes that buttons for actions on a folder if you do +not have write permissions to it. diff --git a/ChangeLog b/ChangeLog index e5792cf..9f59b6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 0361 FIX: The page linked by "new rule" can now be bookmarked again * 0341 FIX: Avoid rare exception in WATO when deleting a host... * 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now + * 0346 FIX: Fix folder visibility in WATO for unpriviledged users... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index fb0550d..39eb26d 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -362,6 +362,7 @@ table.validationerror img { position: absolute; top: 28px; right: 19px; + z-index: 500; } .wato div.floatfolder div.infos img { @@ -422,6 +423,13 @@ table.validationerror img { top: -2px; } +.wato img.authicon { + width: 28px; + height: 28px; + margin-right: 10px; + vertical-align: middle; +} + .wato div.move_dialog { padding:10px; background-color: #45829D; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 029eac2..4518ff6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -827,6 +827,10 @@ def get_folder_aliaspath(folder, show_main = True): # '----------------------------------------------------------------------' def mode_folder(phase): + auth_message = check_folder_permissions(g_folder, "read", False) + auth_read = auth_message == True + auth_write = check_folder_permissions(g_folder, "write", False) == True + global g_folder if phase == "title": return g_folder["title"] @@ -835,16 +839,17 @@ def mode_folder(phase): global_buttons() if config.may("wato.rulesets") or config.may("wato.seeall"): html.context_button(_("Rulesets"), make_link([("mode", "ruleeditor")]), "rulesets") - html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") - if not g_folder.get(".lock_subfolders") and config.may("wato.manage_folders"): + if auth_read: + html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") + if not g_folder.get(".lock_subfolders") and config.may("wato.manage_folders") and auth_write: html.context_button(_("New folder"), make_link([("mode", "newfolder")]), "newfolder") - if not g_folder.get(".lock_hosts") and config.may("wato.manage_hosts"): + if not g_folder.get(".lock_hosts") and config.may("wato.manage_hosts") and auth_write: html.context_button(_("New host"), make_link([("mode", "newhost")]), "new") html.context_button(_("New cluster"), make_link([("mode", "newcluster")]), "new_cluster") if config.may("wato.services"): html.context_button(_("Bulk Inventory"), make_link([("mode", "bulkinventory"), ("all", "1")]), "inventory") - if not g_folder.get(".lock_hosts") and config.may("wato.parentscan"): + if not g_folder.get(".lock_hosts") and config.may("wato.parentscan") and auth_write: html.context_button(_("Parent scan"), make_link([("mode", "parentscan"), ("all", "1")]), "parentscan") search_button() @@ -955,6 +960,9 @@ def mode_folder(phase): else: render_folder_path() + if not auth_read: + html.message('<img class=authicon src="images/icon_autherr.png"> %s' % auth_message) + lock_messages = [] if g_folder.get(".lock_hosts"): if g_folder[".lock_hosts"] == True: @@ -982,7 +990,7 @@ def mode_folder(phase): if True == check_folder_permissions(g_folder, "read", False): have_something = show_hosts(g_folder) or have_something - if not have_something: + if not have_something and auth_write: menu_items = [] if not g_folder.get(".lock_hosts"): menu_items.extend([ @@ -1098,7 +1106,7 @@ def check_folder_permissions(folder, how, exception=True, user = None, users = N if c in cgs: return True - reason = _("Sorry, you have no permissions to access the folder <b>%s</b>. ") % folder["title"] + reason = _("Sorry, you have no permissions to the folder <b>%s</b>. ") % folder["title"] if not cgs: reason += _("The folder has no contact groups assigned to.") else: @@ -1107,6 +1115,7 @@ def check_folder_permissions(folder, how, exception=True, user = None, users = N reason += _("Your contact groups are <b>%s</b>.") % ", ".join(user_cgs) else: reason += _("But you are not a member of any contact group.") + reason += _("You may enter the folder as you might have permission on a subfolders, though.") if exception: raise MKAuthException(reason) @@ -1152,18 +1161,24 @@ def show_subfolders(folder): html.write('<div class="floatfolder%s" id="folder_%s"' % ( auth_read and " unlocked" or " locked", entry['.name'])) - if auth_write: - html.write(' onclick="wato_open_folder(event, \'%s\');"' % enter_url) + html.write(' onclick="wato_open_folder(event, \'%s\');"' % enter_url) html.write('>') # Only make folder openable when permitted to edit - if auth_read: - html.write( - '<div class=hoverarea onmouseover="wato_toggle_folder(event, this, true);" ' - 'onmouseout="wato_toggle_folder(event, this, false)">' - ) + if not auth_read: + html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \ + (html.strip_tags(auth_message))) + + if True: # auth_read: + if not auth_read: + html.write('<div class=hoverarea>') + + else: + html.write( + '<div class=hoverarea onmouseover="wato_toggle_folder(event, this, true);" ' + 'onmouseout="wato_toggle_folder(event, this, false)">' + ) - if auth_read: html.icon_button( edit_url, _("Edit the properties of this folder"), @@ -1200,9 +1215,6 @@ def show_subfolders(folder): ) html.write('</div>') - else: - html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \ - (html.strip_tags(auth_message))) html.write('<div class=infos>') # Show contact groups of the folder effective = effective_attributes(None, entry)

10 years, 9 months

Check_MK Git: check_mk: FIX agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 71235bf017dc5a0425a9394264c135643501ac9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71235bf017dc5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:36:24 2013 +0100 FIX agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts --- .werks/378 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere.pysphere | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/378 b/.werks/378 new file mode 100644 index 0000000..45dc7e9 --- /dev/null +++ b/.werks/378 @@ -0,0 +1,10 @@ +Title: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387272959 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index 6796b3d..05c6fd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 0370 FIX: brocade_mlx_module*: Improved output of checks * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... * 0345 FIX: Linux agent: fix detaching of background plugins... + * 0378 FIX: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index e09b10d..2e26e18 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -603,7 +603,7 @@ def output_mors(what, properties, direct=False): if type(value) == tuple: sections.append(value) else: - if name == 'runtime.host': + if name == 'runtime.host' and value: running_on = value elif name == 'runtime.powerState': power_state = value

10 years, 9 months

Check_MK Git: check_mk: agent_vsphere.pysphere: More compatibility in case of not enough permissions

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a034c7dc8d95a69c456aeb69d7581b2ad90c26d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a034c7dc8d95a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:48:42 2013 +0100 agent_vsphere.pysphere: More compatibility in case of not enough permissions --- agents/special/agent_vsphere.pysphere | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 2e26e18..68284f8 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -640,12 +640,15 @@ def output_datastores(): # print inspect.getmembers(MORTypes) print "<<<esx_vsphere_datastores:sep(%d)>>>" % ord('\t') - for mor in host._retrieve_properties_traversal(property_names=property_names, obj_type=MORTypes.Datastore): - for entry in mor.PropSet: - if entry.Name == "name": - print '[%s]' % entry.Val - else: - print '%s\t%s' % (entry.Name.split(".")[1], entry.Val) + rows = host._retrieve_properties_traversal(property_names=property_names, obj_type=MORTypes.Datastore) + # if the user has no permission to host / datastores, rows is None, skip it then + if rows: + for mor in rows: + for entry in mor.PropSet: + if entry.Name == "name": + print '[%s]' % entry.Val + else: + print '%s\t%s' % (entry.Name.split(".")[1], entry.Val) def conv_multipath(value): return " ".join(["%s %s" % (p.Name, p.PathState) for p in value.HostMultipathStateInfoPath])

10 years, 9 months

Check_MK Git: check_mk: check_http: Certificate Age mode now supports SNI

by Lars Michelsen

Module: check_mk Branch: master Commit: aea85429949228334ed9dc221ef340e6dd33c5ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aea85429949228… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:23:25 2013 +0100 check_http: Certificate Age mode now supports SNI The WATO configuration dialog did not provide the option to enable SNI for the "Certificate Age" checking mode. This option has been added now. --- .werks/377 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/wato/active_checks.py | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/.werks/377 b/.werks/377 new file mode 100644 index 0000000..b14e540 --- /dev/null +++ b/.werks/377 @@ -0,0 +1,12 @@ +Title: check_http: Certificate Age mode now supports SNI +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387272159 +Targetversion: future + +The WATO configuration dialog did not provide the option to enable +SNI for the "Certificate Age" checking mode. This option has been +added now. diff --git a/ChangeLog b/ChangeLog index 0d2540e..6796b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 0315 hitachi_hnas_quorumdevice, hitachi_hnas_pnode, hitachi_hnas_vnode: New checks for Hitachi HNAS devices * 0316 hitachi_hnas_cpu: New check for CPU utilization of Hitachi HNAS devices * 0373 wut_webtherm: Supporting several other devices now + * 0377 check_http: Certificate Age mode now supports SNI... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9777f0d..5b0e27f 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -733,6 +733,13 @@ register_rule(group, default_value = 443, ) ), + ( "sni", + FixedValue( + value = True, + totext = _("enable SNI"), + title = _("Enable SSL/TLS hostname extension support (SNI)"), + ) + ), ], required_keys = [ "cert_days" ], ),

10 years, 9 months

Check_MK Git: check_mk: FIX Inline SNMP now longer throws an exception when using SNMPv3 credentials

by Andreas Boesl

Module: check_mk Branch: master Commit: 094fc3a54e1dd7923d9c4098113d8fb4cb895c33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=094fc3a54e1dd7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 17 10:51:07 2013 +0100 FIX Inline SNMP now longer throws an exception when using SNMPv3 credentials During the generation of the monitoring configuration an exception was thrown, when the snmp host had SNMPv3 credentials set and the global settings "Use Inline SNMP" was activated. --- .werks/245 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/245 b/.werks/245 new file mode 100644 index 0000000..beabc34 --- /dev/null +++ b/.werks/245 @@ -0,0 +1,11 @@ +Title: Inline SNMP now longer throws an exception when using SNMPv3 credentials +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387273469 +Targetversion: future + +During the generation of the monitoring configuration an exception was thrown, when the +snmp host had SNMPv3 credentials set and the global settings "Use Inline SNMP" was activated. diff --git a/ChangeLog b/ChangeLog index 0d2540e..6fb2362 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 0370 FIX: brocade_mlx_module*: Improved output of checks * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... * 0345 FIX: Linux agent: fix detaching of background plugins... + * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/modules/check_mk.py b/modules/check_mk.py index aac0506..6349fd7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3159,7 +3159,7 @@ no_inventory_possible = None output.write("def is_snmpv2c_host(hostname):\n return %r\n\n" % is_snmpv2c_host(hostname)) output.write("def is_bulkwalk_host(hostname):\n return %r\n\n" % is_bulkwalk_host(hostname)) output.write("def snmp_timing_of(hostname):\n return %r\n\n" % snmp_timing_of(hostname)) - output.write("def snmp_credentials_of(hostname):\n return %r\n\n" % snmp_credentials_of(hostname)) + output.write("def snmp_credentials_of(hostname):\n return %s\n\n" % pprint.pformat(snmp_credentials_of(hostname))) output.write("def snmp_port_of(hostname):\n return %r\n\n" % snmp_port_of(hostname)) else: output.write("def snmp_port_spec(hostname):\n return %r\n\n" % snmp_port_spec(hostname))

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Now handling user-ids with umlauts

by Lars Michelsen

Module: check_mk Branch: master Commit: 84f69ad53ba14c7f5f627cf2ed6e62fee7ab100a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84f69ad53ba14c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:06:27 2013 +0100 FIX LDAP: Now handling user-ids with umlauts User-IDs with umlauts seem to be used in some installations. We added one new configuration options to handle those User-IDs. The default is now that multisite replaces the umlauts ü, ö, ä, ß with two letters ue, oe, ae, ss. Other umlauts are left untouched. Another option is that users with umlauts are simply skipped and not synced into multisite. Please note: Users with umlauts need to login with their umlaut login name. After login, the username is always used without umlauts within multisite. Maybe we make multisite handle umlauts correctly one day, but for the moment this change could have too many unwanted results. --- .werks/375 | 19 +++++++++++ ChangeLog | 1 + web/plugins/config/builtin.py | 5 ++- web/plugins/userdb/ldap.py | 49 +++++++++++++++++++++------- web/plugins/wato/check_mk_configuration.py | 13 +++++++- 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/.werks/375 b/.werks/375 new file mode 100644 index 0000000..3f7a792 --- /dev/null +++ b/.werks/375 @@ -0,0 +1,19 @@ +Title: LDAP: Now handling user-ids with umlauts +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387270969 +Targetversion: future + +User-IDs with umlauts seem to be used in some installations. We added one new configuration +options to handle those User-IDs. The default is now that multisite replaces the umlauts +ü, ö, ä, ß with two letters ue, oe, ae, ss. Other umlauts are left untouched. Another option +is that users with umlauts are simply skipped and not synced into multisite. + +Please note: Users with umlauts need to login with their umlaut login name. After login, the +username is always used without umlauts within multisite. + +Maybe we make multisite handle umlauts correctly one day, but for the moment this change +could have too many unwanted results. diff --git a/ChangeLog b/ChangeLog index 6ca7559..b89185e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 0356 FIX: Fixed exception caused by utf8 chars in tooltip text... * 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... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c5a3b1a..fd285d8 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -215,7 +215,10 @@ escape_plugin_output = True user_connectors = ['htpasswd'] userdb_automatic_sync = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ] ldap_connection = {} -ldap_userspec = {} +ldap_userspec = { + 'scope' : 'sub', + 'user_id_umlauts' : 'replace', +} ldap_groupspec = {} ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire': {}} ldap_cache_livetime = 300 diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index bf14356..ca1fd6c 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -399,6 +399,36 @@ def ldap_replace_macros(tmpl): return dn +def ldap_rewrite_user_id(user_id): + if config.ldap_userspec.get('lower_user_ids', False): + user_id = user_id.lower() + + umlauts = config.ldap_userspec.get('user_id_umlauts', 'replace') + new = "" + for c in user_id: + if c == u'ü': + new += 'ue' + elif c == u'ö': + new += 'oe' + elif c == u'ä': + new += 'ae' + elif c == u'ß': + new += 'ss' + elif c == u'Ü': + new += 'UE' + elif c == u'Ö': + new += 'OE' + elif c == u'Ä': + new += 'AE' + else: + new += c + if umlauts == 'replace': + user_id = new + elif umlauts == 'skip' and user_id != new: + return None # This makes the user being skipped + + return user_id + def ldap_user_id_attr(): return config.ldap_userspec.get('user_id', ldap_attr('user_id')) @@ -430,11 +460,9 @@ def ldap_get_user(username, no_escape = False): if result: 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() - + user_id = ldap_rewrite_user_id(result[0][1][ldap_user_id_attr()][0]) + if user_id is None: + return None g_ldap_user_cache[username] = (dn, user_id) if no_escape: @@ -488,13 +516,10 @@ def ldap_get_users(add_filter = ''): if ldap_user_id_attr() not in ldap_user: raise MKLDAPException(_('The configured User-ID attribute "%s" does not ' 'exist for the user "%s"') % (ldap_user_id_attr(), dn)) - user_id = ldap_user[ldap_user_id_attr()][0] - - if config.ldap_userspec.get('lower_user_ids', False): - user_id = user_id.lower() - - ldap_user['dn'] = dn # also add the DN - result[user_id] = ldap_user + user_id = ldap_rewrite_user_id(ldap_user[ldap_user_id_attr()][0]) + if user_id: + ldap_user['dn'] = dn # also add the DN + result[user_id] = ldap_user return result diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2a25018..5ffabb5 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -698,8 +698,19 @@ register_configvar(group, value = True, totext = _("Enforce lower case User-IDs."), )), + ("user_id_umlauts", DropdownChoice( + title = _("Umlauts in User-IDs"), + help = _("Multisite does not support umlauts in User-IDs at the moment. To deal " + "with LDAP users having umlauts in their User-IDs you have the following " + "choices."), + choices = [ + ("replace", _("Replace umlauts like \"ü\" with \"ue\"")), + ("skip", _("Skip users with umlauts in their User-IDs")), + ], + default_value = "replace", + )), ], - optional_keys = ['scope', 'filter', 'filter_group', 'user_id', 'lower_user_ids'], + optional_keys = ['filter', 'filter_group', 'user_id', 'lower_user_ids', ], ), domain = "multisite", in_global_settings = False,

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Default configuration of attributes is reflected within WATO now

by Lars Michelsen

Module: check_mk Branch: master Commit: 6dd78ca0453c5f920dadfed9e1d4f5f0bf098b21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dd78ca0453c5f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:11:21 2013 +0100 FIX LDAP: Default configuration of attributes is reflected within WATO now --- .werks/376 | 10 ++++++++++ ChangeLog | 1 + web/plugins/config/builtin.py | 4 +++- web/plugins/wato/check_mk_configuration.py | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/376 b/.werks/376 new file mode 100644 index 0000000..42f1cc6 --- /dev/null +++ b/.werks/376 @@ -0,0 +1,10 @@ +Title: LDAP: Default configuration of attributes is reflected within WATO now +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387271448 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index b89185e..f228f00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 0332 FIX: Own host tag groups without topics resulted in two groups "Host tags" in the rule editor * 0361 FIX: The page linked by "new rule" can now be bookmarked again * 0341 FIX: Avoid rare exception in WATO when deleting a host... + * 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index fd285d8..bec88d0 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -219,7 +219,9 @@ ldap_userspec = { 'scope' : 'sub', 'user_id_umlauts' : 'replace', } -ldap_groupspec = {} +ldap_groupspec = { + 'scope' : 'sub', +} ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire': {}} ldap_cache_livetime = 300 ldap_debug_log = None diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5ffabb5..f7b0a1a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -759,7 +759,7 @@ register_configvar(group, attrencode = True, )), ], - optional_keys = ['scope', 'filter', 'member'], + optional_keys = ['filter', 'member'], ), domain = "multisite", in_global_settings = False,

10 years, 9 months

Check_MK Git: check_mk: FIX: Linux agent: fix detaching of background plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b97347881693169485aeb1685d2900f6568aee9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b973478816931… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 10:07:46 2013 +0100 FIX: Linux agent: fix detaching of background plugins The asynchronous execution of background processes in the Linux agent has been fixed. Before it could have happened that the agent starts background processes but - however - waits for all of them to finish until finishing itself. This has now been fixed. All plugins started with run_cached are now correctly detached from the agent. --- .werks/345 | 14 ++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/345 b/.werks/345 new file mode 100644 index 0000000..fed7f1f --- /dev/null +++ b/.werks/345 @@ -0,0 +1,14 @@ +Title: Linux agent: fix detaching of background plugins +Level: 2 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387270406 +Targetversion: future + +The asynchronous execution of background processes in the Linux agent has +been fixed. Before it could have happened that the agent starts background +processes but - however - waits for all of them to finish until finishing +itself. This has now been fixed. All plugins started with run_cached are +now correctly detached from the agent. diff --git a/ChangeLog b/ChangeLog index 6ca7559..0ad4f89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 0369 FIX: cups_queues: Fixed bug checking the last queue reported by agent... * 0370 FIX: brocade_mlx_module*: Improved output of checks * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... + * 0345 FIX: Linux agent: fix detaching of background plugins... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 28453ad..2f67328 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -88,7 +88,7 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then - echo "$CMDLINE" | setsid bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & + echo "set -o noclobber ; exec > $CACHEFILE.new || exit 1 ; $CMDLINE && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new" | nohup bash 2>/dev/null & fi }

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