Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: Updated bug entries #0926

by Lars Michelsen

Module: check_mk Branch: master Commit: 1e31e2e59a462c6614915744332bdf75ef923c70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e31e2e59a462c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 16:24:57 2013 +0200 Updated bug entries #0926 --- .bugs/926 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/926 b/.bugs/926 index f4415e2..8d65b69 100644 --- a/.bugs/926 +++ b/.bugs/926 @@ -1,9 +1,9 @@ Title: host_state (and others) are not treated as integers in log table Component: livestatus -State: open +Class: bug +State: done Date: 2013-08-12 10:45:03 Targetversion: 1.2.3i2 -Class: bug Multisite assumes that columns like the host_state are integers. @@ -45,3 +45,6 @@ Traceback (most recent call last): KeyError: u'0' --> We fix this in Multisite. Use saveint() here. + +2013-08-28 16:24:55: changed state open -> done +Seems to be fixed now. But there might be other places...

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0975

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ab8bf2113dc47676f85f9e6c8f83e2d92b29d20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ab8bf2113dc47… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 16:26:13 2013 +0200 Updated bug entries #0975 --- .bugs/975 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/975 b/.bugs/975 index 3c4cb9f..e3183e6 100644 --- a/.bugs/975 +++ b/.bugs/975 @@ -1,9 +1,9 @@ Title: checkmk.js - Bug with IE Component: multisite -State: open +Class: bug +State: works4me Date: 2013-08-26 10:21:49 Targetversion: 1.2.3i2 -Class: bug Since upgrade to 1.2.2p1 the Check_MK web page produces an error warning on IE8 and IE9 browsers. I have a clean install of OMD release and the behaviour @@ -76,3 +76,6 @@ Ian Phelps FTS SBG MIS DCSC + +2013-08-28 16:26:09: changed state open -> works4me +Seems as it has already been solved.

11 years, 1 month

Check_MK Git: check_mk: Second part, fixed datatype of states handling

by Lars Michelsen

Module: check_mk Branch: master Commit: a003d4cefe67a1850537b8255c3e143bbe94e0bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a003d4cefe67a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 16:22:53 2013 +0200 Second part, fixed datatype of states handling --- web/plugins/views/layouts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 2ea0551..227d5e4 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -200,9 +200,9 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show else: trclass = "odd" # state = row.get("service_state", row.get("aggr_state")) - state = row.get("service_state") + state = saveint(row.get("service_state")) if state == None: - state = row.get("host_state", 0) + state = saveint(row.get("host_state", 0)) if state > 0: state +=1 # 1 is critical for hosts stale = '' if is_stale(row):

11 years, 1 month

Check_MK Git: check_mk: FIX: Fixed exception when enabling sounds for log based views

by Lars Michelsen

Module: check_mk Branch: master Commit: ae43066386f90e912f387e904cffeffeec922c90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae43066386f90e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 16:19:32 2013 +0200 FIX: Fixed exception when enabling sounds for log based views Conflicts: ChangeLog --- ChangeLog | 3 +++ web/htdocs/views.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4382f9..40bb853 100644 --- a/ChangeLog +++ b/ChangeLog @@ -314,6 +314,9 @@ * FIX: Fixed missing roles in auth.php (in some cases) which resulted in non visible pnp graphs and missing nagvis permissions * FIX: Fixed label color of black toner perfometers when fuel is low + * FIX: Fixed wrong default settings of view filters in localized multisite + * FIX: Fixed exception when enabling sounds for views relying on + e.g. alert statistics source WATO: * FIX: fix layout of Auxiliary tags table diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9b7e035..afa9c64 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2582,10 +2582,10 @@ def register_events(row): if config.sounds != []: host_state = row.get("host_hard_state", row.get("host_state")) if host_state != None: - html.register_event({0:"up", 1:"down", 2:"unreachable"}[host_state]) + html.register_event({0:"up", 1:"down", 2:"unreachable"}[saveint(host_state)]) svc_state = row.get("service_last_hard_state", row.get("service_state")) if svc_state != None: - html.register_event({0:"up", 1:"warning", 2:"critical", 3:"unknown"}[svc_state]) + html.register_event({0:"up", 1:"warning", 2:"critical", 3:"unknown"}[saveint(svc_state)]) # The Group-value of a row is used for deciding wether # two rows are in the same group or not

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0830

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a0c5f5f37695301d90def93917d8bd33bae9592 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a0c5f5f376953… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 16:16:39 2013 +0200 Updated bug entries #0830 --- .bugs/830 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/830 b/.bugs/830 index 0d459a1..af376ab 100644 --- a/.bugs/830 +++ b/.bugs/830 @@ -1,8 +1,11 @@ Title: check_dns is missing in omd builds of debian 7.1 Component: checks -State: open +Class: bug +State: done Date: 2013-08-23 13:56:01 Targetversion: 1.2.3i2 -Class: bug the nagios plugin check_dns is missing in the omd build of debian 7.1 + +2013-08-28 16:16:35: changed state open -> done +Fixed in omd debian distro files.

11 years, 1 month

Check_MK Git: check_mk: Vizualizing ldap sync fail status for permitted users in page footers

by Lars Michelsen

Module: check_mk Branch: master Commit: 550a98739417add1d6bfafb72bfbebd77949edde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=550a98739417ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 15:28:31 2013 +0200 Vizualizing ldap sync fail status for permitted users in page footers --- web/htdocs/images/status_ldap.png | Bin 0 -> 5593 bytes web/htdocs/views.py | 7 +++++++ 2 files changed, 7 insertions(+) diff --git a/web/htdocs/images/status_ldap.png b/web/htdocs/images/status_ldap.png new file mode 100644 index 0000000..681ed2d Binary files /dev/null and b/web/htdocs/images/status_ldap.png differ diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9089ad7..9b7e035 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1541,6 +1541,13 @@ def render_view(view, rows, datasource, group_painters, painters, if bi.reused_compilation(): html.add_status_icon("aggrcomp", _("Reused cached compiled BI aggregations (PID %d)") % pid) + if config.may('wato.users'): + try: + msg = file(defaults.var_dir + '/web/ldap_sync_fail.mk').read() + html.add_status_icon("ldap", _('Last LDAP sync failed! %s') % html.attrencode(msg)) + except IOError: + pass + html.bottom_focuscode() if 'Z' in display_options: html.bottom_footer()

11 years, 1 month

Check_MK Git: check_mk: Trying to improve ldap connection problem handling during sync runs; improved logging

by Lars Michelsen

Module: check_mk Branch: master Commit: 66dc43be622b2738f5ab7d905671943e6cf78cf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66dc43be622b27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 15:14:55 2013 +0200 Trying to improve ldap connection problem handling during sync runs; improved logging --- web/plugins/userdb/ldap.py | 54 +++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 488fccb..2ed66a3 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. import config, defaults -import time, copy +import time, copy, traceback try: # docs: http://www.python-ldap.org/doc/html/index.html @@ -49,6 +49,8 @@ g_ldap_group_cache = {} # File for storing the time of the last success event g_ldap_sync_time_file = defaults.var_dir + '/web/ldap_sync_time.mk' +# Exists when last ldap sync failed, contains exception text +g_ldap_sync_fail_file = defaults.var_dir + '/web/ldap_sync_fail.mk' # LDAP attributes are case insensitive, we only use lower case! # Please note: This are only default values. The user might override this @@ -93,7 +95,8 @@ ldap_filter_map = { def ldap_log(s): if config.ldap_debug_log is not None: - file(ldap_replace_macros(config.ldap_debug_log), "a").write('%s\n' % s) + file(ldap_replace_macros(config.ldap_debug_log), "a").write('%s %s\n' % + (time.strftime('%Y-%m-%d %H:%M:%S'), s)) class MKLDAPException(MKGeneralException): pass @@ -128,6 +131,7 @@ def ldap_connect_server(server): conn = ldap.ldapobject.ReconnectLDAPObject(uri) conn.protocol_version = config.ldap_connection['version'] conn.network_timeout = config.ldap_connection.get('connect_timeout', 2.0) + conn.retry_delay = 0.5 # When using the domain top level as base-dn, the subtree search stumbles with referral objects. # whatever. We simply disable them here when using active directory. Hope this fixes all problems. @@ -188,6 +192,7 @@ def ldap_connect(enforce_new = False, enforce_server = None): else: errors.append(error_msg) + # Got no connection to any server if ldap_connection is None: raise MKLDAPException(_('The LDAP connector is unable to connect to the LDAP server.\n%s') % ('<br />\n'.join(errors))) @@ -196,7 +201,9 @@ def ldap_connect(enforce_new = False, enforce_server = None): ldap_connection_options = config.ldap_connection except Exception: - ldap_connection = None # Invalidate connection on failure + # Invalidate connection on failure + ldap_connection = None + ldap_connection_options = None raise # Bind with the default credentials @@ -306,11 +313,12 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): # In some environments, the connection to the LDAP server does not seem to # be as stable as it is needed. So we try to repeat the query for three times. - tries_left = 3 + tries_left = 2 success = False while not success: tries_left -= 1 try: + ldap_connect() result = [] try: search_func = config.ldap_connection.get('page_size') \ @@ -335,12 +343,13 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): 'a sizelimit configuration on the LDAP server.<br />Throwing away the ' 'incomplete results. You should change the scope of operation ' 'within the ldap or adapt the limit settings of the LDAP server.')) - except ldap.SERVER_DOWN: + except (ldap.SERVER_DOWN, ldap.TIMEOUT, MKLDAPException), e: if tries_left: - ldap_log(' Received SERVER_DOWN. Retrying...') - ldap_connection.reconnect(ldap_connection._uri) + ldap_log(' Received %r. Retrying with clean connection...' % e) + ldap_disconnect() time.sleep(0.5) else: + ldap_log(' Giving up.') break duration = time.time() - start_time @@ -837,8 +846,6 @@ def ldap_sync(add_to_changelog, only_username): start_time = time.time() - ldap_connect() - ldap_log(' SYNC PLUGINS: %s' % ', '.join(config.ldap_active_plugins.keys())) # Unused at the moment, always sync all users @@ -846,10 +853,11 @@ def ldap_sync(add_to_changelog, only_username): #if only_username: # filt = '(%s=%s)' % (ldap_user_id_attr(), only_username) - import wato - users = load_users(lock = True) ldap_users = ldap_get_users() + import wato + users = load_users(lock = True) + # Remove users which are controlled by this connector but can not be found in # LDAP anymore for user_id, user in users.items(): @@ -897,6 +905,12 @@ def ldap_sync(add_to_changelog, only_username): duration = time.time() - start_time ldap_log('SYNC FINISHED - Duration: %0.3f sec' % duration) + # delete the fail flag file after successful sync + try: + os.unlink(g_ldap_sync_fail_file) + except OSError: + pass + save_users(users) # Calculates the attributes of the users which are locked for users managed @@ -930,11 +944,25 @@ def ldap_page(): except: last_sync_time = 0 - if last_sync_time + config.ldap_cache_livetime > time.time(): + # in case of sync problems, synchronize all 20 seconds, instead of the configured + # regular cache livetime + if os.path.exists(g_ldap_sync_fail_file): + cache_livetime = 20 + else: + cache_livetime = config.ldap_cache_livetime + + if last_sync_time + cache_livetime > time.time(): return # No action needed, cache is recent enough # ok, cache is too old. Act! - ldap_sync(False, None) + try: + ldap_sync(False, None) + except: + # Do not let the exception through to the user. Instead write last + # error in a state file which is then visualized for the admin and + # will be deleted upon next successful sync. + file(g_ldap_sync_fail_file, 'w').write('%s\n%s' % (time.strftime('%Y-%m-%d %H:%M:%S'), + traceback.format_exc())) multisite_user_connectors.append({ 'id': 'ldap',

11 years, 1 month

Check_MK Git: check_mk: wording improvements

by Götz Golla

Module: check_mk Branch: master Commit: cc73fe8bd1993fdafcbd06071048f1a00aedab5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc73fe8bd1993f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Aug 28 13:54:08 2013 +0200 wording improvements --- web/htdocs/wato.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1cfdd54..332618b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6025,7 +6025,7 @@ def mode_groups(phase, what): what == "contact" and "users" or "groups", _("Contact groups are needed for assigning hosts and services to people (contacts)"))]) else: - html.write("<div class=info>" + _("There are not defined any groups yet.") + "</div>") + html.write("<div class=info>" + _("No groups are defined yet.") + "</div>") return # Show member of contact groups @@ -8201,7 +8201,7 @@ def mode_users(phase): entries = users.items() entries.sort(cmp = lambda a, b: cmp(a[1].get("alias", a[0]).lower(), b[1].get("alias", b[0]).lower())) - table.begin("users", None, empty_text = _("There are not defined any users yet.")) + table.begin("users", None, empty_text = _("No users are defined yet.")) online_threshold = time.time() - config.user_online_maxage for id, user in entries: table.row() @@ -13272,7 +13272,7 @@ def mode_custom_attrs(phase, what): return None if not attrs: - html.write("<div class=info>" + _("There are not defined any custom attributes yet.") + "</div>") + html.write("<div class=info>" + _("No custom attributes are defined yet.") + "</div>") return table.begin(what + "attrs")

11 years, 1 month

Check_MK Git: check_mk: Added default error rates to if check valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 04d1cc9aa8e5cba6dfef9e5dde7656ecca5f2e11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04d1cc9aa8e5cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 12:41:21 2013 +0200 Added default error rates to if check valuespec --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9e3e0c6..8d95d6d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1566,8 +1566,8 @@ register_check_parameters( "the given bounds. The error rate is computed by dividing number of " "errors by the total number of packets (successful plus errors)."), elements = [ - Percentage(title = _("Warning if above"), label = _("errors")), - Percentage(title = _("Critical if above"), label = _("errors")) + Percentage(title = _("Warning if above"), label = _("errors"), default_value = 0.01), + Percentage(title = _("Critical if above"), label = _("errors"), default_value = 0.1) ])), ( "speed", OptionalDropdownChoice(

11 years, 1 month

Check_MK Git: check_mk: wato: fixed layout in ruleset lists when help texts are disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 9dd23306bb9ee55e42aa8f5780025c7a438b32b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dd23306bb9ee5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 28 10:15:51 2013 +0200 wato: fixed layout in ruleset lists when help texts are disabled --- web/htdocs/js/checkmk.js | 19 +++++++++++++------ web/htdocs/wato.py | 8 +++++++- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 4926c67..b253a4c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1763,14 +1763,21 @@ function help_switch(how) { helpdivs[i].style.display = how ? "block" : "none"; } - // small hack for wato ruleset lists, toggle the "nofloat" class - // on those objects to make the layout possible + // small hack for wato ruleset lists, toggle the "float" and "nofloat" + // classes on those objects to make the layout possible var rulesetdivs = document.getElementsByClassName('ruleset'); for (var i = 0; i < rulesetdivs.length; i++) { - if (how) - add_class(rulesetdivs[i], 'nofloat'); - else - remove_class(rulesetdivs[i], 'nofloat'); + if (how) { + if (has_class(rulesetdivs[i], 'float')) { + remove_class(rulesetdivs[i], 'float'); + add_class(rulesetdivs[i], 'nofloat'); + } + } else { + if (has_class(rulesetdivs[i], 'nofloat')) { + remove_class(rulesetdivs[i], 'nofloat'); + add_class(rulesetdivs[i], 'float'); + } + } } get_url("ajax_switch_help.py?enabled=" + (how ? "yes" : "")); diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fcb7b90..0e08f7d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10302,7 +10302,13 @@ def mode_rulesets(phase): something_shown = True - float_cls = (not config.wato_hide_help_in_lists and html.help_visible) and ' nofloat' or '' + float_cls = '' + if not config.wato_hide_help_in_lists: + if html.help_visible: + float_cls = ' nofloat' + else: + float_cls = ' float' + url_vars = [("mode", "edit_ruleset"), ("varname", varname)] if only_host: url_vars.append(("host", only_host))

11 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013