Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

Check_MK Git: check_mk: FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor

by Lars Michelsen

Module: check_mk Branch: master Commit: fc55e8ec80ed45e6e7b91d23a4ff644c2241869f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc55e8ec80ed45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 09:40:37 2013 +0100 FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor --- ChangeLog | 3 +++ web/htdocs/wato.css | 9 +++++++++ web/htdocs/wato.py | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e4c0f1..b3ae1a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,9 @@ * LDAP: Reduced number of ldap querys during a single page request / sync process * LDAP: Implemnted some kind of debug logging for LDAP communication + WATO: + * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor + 1.2.1i4: Core: * Better exception handling when executing "Check_MK"-Check. Printing python diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 0bcaa3d..3dedc13 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -578,6 +578,15 @@ table.validationerror img { width: 90px; } +.wato form.rule_editor td.tag_sel { + vertical-align: middle; + display: table-cell; +} + +.wato form.rule_editor td.tag_sel > div { + white-space: nowrap; +} + .wato table.itemlist td { margin: 0; padding: 0; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index be7f22b..a6725a1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10523,12 +10523,12 @@ def render_condition_editor(tag_specs): ("is", _("is")), ("isnot", _("isnot"))], deflt, onchange="valuespec_toggle_dropdownn(this, 'tag_sel_%s');" % id) - html.write("</td><td>") + html.write("</td><td class=\"tag_sel\">") if html.form_submitted(): - div_is_open = html.var(tagtype + "_" + id) != "ignore" + div_is_open = html.var(tagtype + "_" + id, "ignore") != "ignore" else: div_is_open = deflt != "ignore" - html.write('<div id="tag_sel_%s" style="white-space: nowrap; %s">' % ( + html.write('<div id="tag_sel_%s" style="%s">' % ( id, not div_is_open and "display: none;" or "")) # Show main tags

11 years, 5 months

Check_MK Git: check_mk: CPU load ruleset does now accept float values

by Lars Michelsen

Module: check_mk Branch: master Commit: 63a9da631102ec9a2b9ed557cbaa1016b1ed4325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a9da631102ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 09:49:56 2013 +0100 CPU load ruleset does now accept float values --- ChangeLog | 1 + web/plugins/wato/check_parameters.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3ae1a8..8dc1047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * LDAP: Implemnted some kind of debug logging for LDAP communication WATO: + * CPU load ruleset does now accept float values * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor 1.2.1i4: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 41326f4..d3080d5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1132,13 +1132,15 @@ checkgroups.append(( checkgroups.append(( subgroup_os, "memory", - _("Main memory usage (Linux / UNIX)"), + _("Main memory usage (Linux / UNIX / Other Devices)"), Alternative( help = _("The levels for memory usage on Linux and UNIX systems take into account the " "currently used memory (RAM or SWAP) by all processes and sets this in relation " "to the total RAM of the system. This means that the memory usage can exceed 100%. " "A usage of 200% means that the total size of all processes is twice as large as " - "the main memory, so <b>at least</b> the half of it is currently swapped out."), + "the main memory, so <b>at least</b> the half of it is currently swapped out. " + "Besides Linux and UNIX systems, these parameters are also used for memory checks " + "of other devices, like Cisco and Fortigate devices."), elements = [ Tuple( title = _("Specify levels in percentage of total RAM"), @@ -1180,10 +1182,12 @@ checkgroups.append(( "for one. The <u>load average</u> is the averaged CPU load over the last 1, " "5 or 15 minutes. The following levels will be applied on the average " "load. On Linux system the 15-minute average load is used when applying " - "those levels."), + "those levels. The configured levels are multiplied with the number of " + "CPUs, so you should configure the levels based on the value you want to " + "be warned \"per CPU\"."), elements = [ - Integer(title = _("Warning at a load of")), - Integer(title = _("Critical at a load of"))]), + Float(title = _("Warning at a load of")), + Float(title = _("Critical at a load of"))]), None, None)) checkgroups.append((

11 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0882, #0884, #0822

by Lars Michelsen

Module: check_mk Branch: master Commit: d85c31b8876aaed7af3d525521300dcdbdf8484a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d85c31b8876aae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 10:00:00 2013 +0100 Updated bug entries #0882, #0884, #0822 --- .bugs/822 | 7 +++++-- .bugs/882 | 7 +++++-- .bugs/884 | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.bugs/822 b/.bugs/822 index c904dad..2fa0731 100644 --- a/.bugs/822 +++ b/.bugs/822 @@ -1,9 +1,12 @@ Title: RPMs contining a 64bit Version of waitmax Component: checks -State: open +Class: bug +State: done Date: 2013-01-11 16:01:24 Targetversion: 1.2.2 -Class: bug The check_mk-agent 1.2.1i3 and i4 RPMs erroneously contain a 64-bit waitmax binary, and thus cause problems on 32-bit Linux systems. Ticket ID: 645082 + +2013-01-17 09:58:23: changed state open -> done +Our build system had no "diet" install - thus created no static binary. diff --git a/.bugs/882 b/.bugs/882 index 6f17750..801d08f 100644 --- a/.bugs/882 +++ b/.bugs/882 @@ -1,9 +1,9 @@ Title: WATO rule for CPU load does not allow float Component: checks -State: open +Class: nastiness +State: done Date: 2012-12-05 16:03:54 Targetversion: 1.2.2 -Class: nastiness The WATO rule for the CPU load does not allow to specify float values. But since the level is multiplied by the number of cores this would be @@ -12,3 +12,6 @@ ints? If not, make it configurable such that it does or make an automatic conversion, so WATO is happy with existing int-based rules. Also fix the labelling: The level is multiplied by the number of Cores! + +2013-01-17 09:50:12: changed state open -> done +Has just been implemented. diff --git a/.bugs/884 b/.bugs/884 index 0281a5a..5c6591a 100644 --- a/.bugs/884 +++ b/.bugs/884 @@ -1,10 +1,13 @@ Title: Rule editor: selection boxes must not be visible on 'ignore' Component: wato -State: open +Class: bug +State: done Date: 2013-01-14 09:06:06 Targetversion: 1.2.2 -Class: bug In the rule editor in the host tag section when the first selection box is "ignore", then the second should be hidden, but is visible when entering the dialog. + +2013-01-17 09:40:58: changed state open -> done +has just been fixed.

11 years, 5 months

Check_MK Git: check_mk: Compiled waitmax as static binary

by Lars Michelsen

Module: check_mk Branch: master Commit: 98c4c46f83482392707f798761f107179d7ffe73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98c4c46f834823… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 10:08:55 2013 +0100 Compiled waitmax as static binary --- agents/waitmax | Bin 9956 -> 17312 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/waitmax b/agents/waitmax index cb77121..b9c7242 100755 Binary files a/agents/waitmax and b/agents/waitmax differ

11 years, 5 months

Check_MK Git: check_mk: Added valuespec for cisco_mem check to configure thresholds via WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f9e21b56e14637c4558b30930f34b61e4b8e675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f9e21b56e1463… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 10:09:05 2013 +0100 Added valuespec for cisco_mem check to configure thresholds via WATO --- ChangeLog | 1 + checks/cisco_mem | 2 +- web/plugins/wato/check_parameters.py | 30 +++++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dc1047..3936fd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ WATO: * CPU load ruleset does now accept float values + * Added valuespec for cisco_mem check to configure thresholds via WATO * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor 1.2.1i4: diff --git a/checks/cisco_mem b/checks/cisco_mem index 65e25a1..5a677eb 100644 --- a/checks/cisco_mem +++ b/checks/cisco_mem @@ -73,7 +73,7 @@ check_info["cisco_mem"] = { "inventory_function" : inventory_cisco_mem, "service_description" : "Mem used %s", "has_perfdata" : True, - "group" : "memory", + "group" : "cisco_mem", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.48.1.1.1.6.1"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.48.1.1.1", [ "2", "5", "6", "7" ]), } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d3080d5..96677ed 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1128,6 +1128,34 @@ checkgroups.append(( "dict", )) +checkgroups.append(( + subgroup_os, + "cisco_mem", + _("Cisco Memory Usage"), + Alternative( + elements = [ + Tuple( + title = _("Specify levels in percentage of total RAM"), + elements = [ + Percentage(title = _("Warning at a usage of"), label = _("% of RAM"), max_value = None), + Percentage(title = _("Critical at a usage of"), label = _("% of RAM"), max_value = None) + ] + ), + Tuple( + title = _("Specify levels in absolute usage values"), + elements = [ + Integer(title = _("Warning at"), unit = _("MB")), + Integer(title = _("Critical at"), unit = _("MB")) + ] + ), + ] + ), + TextAscii( + title = _("Memory Pool Name"), + allow_empty = False + ), + None +)) checkgroups.append(( subgroup_os, @@ -1140,7 +1168,7 @@ checkgroups.append(( "A usage of 200% means that the total size of all processes is twice as large as " "the main memory, so <b>at least</b> the half of it is currently swapped out. " "Besides Linux and UNIX systems, these parameters are also used for memory checks " - "of other devices, like Cisco and Fortigate devices."), + "of other devices, like Fortigate devices."), elements = [ Tuple( title = _("Specify levels in percentage of total RAM"),

11 years, 5 months

Check_MK Git: check_mk: wato: Changed hover text of checkbox toggler

by Lars Michelsen

Module: check_mk Branch: master Commit: d52f3d130cc1d0f0e9619cddd7d00e832548b013 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d52f3d130cc1d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 16 14:20:15 2013 +0100 wato: Changed hover text of checkbox toggler --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d24e340..be7f22b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1255,7 +1255,7 @@ def show_hosts(folder): if not show_checkboxes: html.write('<div id="%s_on" title="%s" class="togglebutton %s up" ' 'onclick="location.href=\'%s\'"></div>' % ( - 'checkbox', _('Show Checkboxes and show bulk actions'), 'checkbox', + 'checkbox', _('Show Checkboxes and bulk actions'), 'checkbox', html.makeuri([('show_checkboxes', '1'), ('selection', weblib.selection_id())]))) else:

11 years, 5 months

Check_MK Git: check_mk: ldap: Removed sys. path hack for dist-packages paths (Fixed in OMD now)

by Lars Michelsen

Module: check_mk Branch: master Commit: 30a371ce01e35d8885ff2351dc1be6053a335d90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30a371ce01e35d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 16 14:13:11 2013 +0100 ldap: Removed sys.path hack for dist-packages paths (Fixed in OMD now) --- web/plugins/userdb/ldap.py | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 4c4dbe0..bc5469a 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -27,20 +27,6 @@ import config, defaults import time, copy -# For some reason mod_python is missing /usr/lib/python2.7/dist-packages -# in sys.path. Therefor the ldap module can not be found at least on current -# ubuntu and sles releases. -# There seem to be some initialization problems with mod_pythan as the sys.path -# is correct when excuting python from the command line as site user. -# Try to workaround the problem now... - -import site, sys -try: - sys.path.extend(site.getsitepackages()) -except: # Workaround, python 2.6 ( debian squeeze ) - sys.path.extend(["/usr/local/lib/python2.6/dist-packages"]) - sys.path.extend(["/usr/lib/python2.6/dist-packages"]) - try: # docs: http://www.python-ldap.org/doc/html/index.html import ldap

11 years, 5 months

Check_MK Git: check_mk: Fixed selection of rows in wato

by Lars Michelsen

Module: check_mk Branch: master Commit: 7009fa496e62b086a4e05080a10d7fbb8f5e3e85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7009fa496e62b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 16 10:50:35 2013 +0100 Fixed selection of rows in wato --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index be40206..d24e340 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1256,7 +1256,7 @@ def show_hosts(folder): html.write('<div id="%s_on" title="%s" class="togglebutton %s up" ' 'onclick="location.href=\'%s\'"></div>' % ( 'checkbox', _('Show Checkboxes and show bulk actions'), 'checkbox', - html.makeuri([('show_checkboxes', '1')]))) + html.makeuri([('show_checkboxes', '1'), ('selection', weblib.selection_id())]))) else: html.write('<div id="%s_on" title="%s" class="togglebutton %s down" '

11 years, 5 months

Check_MK Git: check_mk: FIX: LDAP: OpenLDAP - Using uniqueMember instead of member when searching for groups of a user

by Lars Michelsen

Module: check_mk Branch: master Commit: bb8df359fe375b1a98449ad684965100e417e7b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb8df359fe375b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 16 10:42:04 2013 +0100 FIX: LDAP: OpenLDAP - Using uniqueMember instead of member when searching for groups of a user --- ChangeLog | 1 + web/plugins/userdb/ldap.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 192676e..3e4c0f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * FIX: LDAP: Fixed problem with special chars in LDAP queries when having contactgroup sync plugin enabled * FIX: LDAP: OpenLDAP - Changed default filter for users + * FIX: LDAP: OpenLDAP - Using uniqueMember instead of member when searching for groups of a user * LDAP: Role sync plugin validates the given group DNs with the group base dn now * LDAP: Using roles defined in default user profile in role sync plugin processing * LDAP: Improved error handling in case of misconfigurations diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index aa63efa..4c4dbe0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -66,6 +66,8 @@ ldap_attr_map = { 'openldap': { 'user_id': 'uid', 'pw_changed': 'pwdchangedtime', + # group attributes + 'member': 'uniquemember', }, } @@ -315,7 +317,8 @@ 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(member=%s))' % (ldap_filter('groups'), ldap.filter.escape_filter_chars(user_dn)) + filt = '(&%s(%s=%s))' % (ldap_filter('groups'), ldap_attr('member'), + ldap.filter.escape_filter_chars(user_dn)) # First get all groups groups_cn = [] groups_dn = []

11 years, 5 months

Check_MK Git: check_mk: Added debugging log for ldap transactions

by Lars Michelsen

Module: check_mk Branch: master Commit: 137d0d59a5510b386a36777e6c3fe8131db7b8d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=137d0d59a5510b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 16 10:29:27 2013 +0100 Added debugging log for ldap transactions --- ChangeLog | 1 + web/htdocs/config.py | 1 + web/plugins/userdb/ldap.py | 6 +++--- web/plugins/wato/check_mk_configuration.py | 14 ++++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6215ef..192676e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * LDAP: Using roles defined in default user profile in role sync plugin processing * LDAP: Improved error handling in case of misconfigurations * LDAP: Reduced number of ldap querys during a single page request / sync process + * LDAP: Implemnted some kind of debug logging for LDAP communication 1.2.1i4: Core: diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 112ef42..b5ee938 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -602,6 +602,7 @@ def load_default_values(into): into["ldap_groupspec"] = {} into["ldap_active_plugins"] = {'email': {}, 'alias': {}, 'auth_expire': {}} into["ldap_cache_livetime"] = 300 + into['ldap_debug_log'] = None into["default_user_profile"] = { 'roles': ['user'], } diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 35d9ed0..aa63efa 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -78,7 +78,6 @@ ldap_filter_map = { 'groups': '(objectclass=group)', }, 'openldap': { - #'users': '(objectcategory=user)', 'users': '(objectclass=person)', 'groups': '(objectclass=groupOfUniqueNames)', }, @@ -96,8 +95,8 @@ ldap_filter_map = { # '----------------------------------------------------------------------' def ldap_log(s): - pass # no logging by default - #file('/tmp/ldap.log', 'a').write('%s\n' % s) + if config.ldap_debug_log is not None: + file(config.ldap_debug_log, "a").write('%s\n' % s) class MKLDAPException(MKGeneralException): pass @@ -223,6 +222,7 @@ 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)) return result #return ldap_connection.search_s(base, scope, filter, columns) #for dn, obj in ldap_connection.search_s(base, scope, filter, columns): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 1b3963a..0a3b406 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -493,6 +493,20 @@ register_configvar(group, domain = "multisite", ) +register_configvar(group, + "ldap_debug_log", + Optional( + Filename( + label = _("Absolute path to log file"), + default = defaults.var_dir + '/web/ldap-debug.log', + ), + title = _("LDAP connection diagnostics"), + label = _("Activate logging of LDAP transactions into a logfile"), + help = _("If this option is used and set to a filename, Check_MK will create a logfile " + "containing details about connecting to LDAP and the single transactions.")), + domain = "multisite") + + def list_roles(): roles = userdb.load_roles() return [ (i, r["alias"]) for i, r in roles.items() ]

11 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013