Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: ba5e67b38b1b3a8c716b7b08e220a9ed1d004fed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba5e67b38b1b3a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 23 12:25:11 2013 +0200 Fixed string --- web/htdocs/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c67a410..35caefd 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -321,7 +321,7 @@ def compile_forest(user, only_hosts = None, only_groups = None): continue if len(entry) < 3: - raise MKConfigError(_("<h1>Invalid aggregation <tt>%s</tt>'</h1>" + raise MKConfigError(_("<h1>Invalid aggregation <tt>%s</tt></h1>" "Must have at least 3 entries (has %d)") % (entry, len(entry))) if type(entry[0]) == list:

10 years, 10 months

Check_MK Git: check_mk: ldap: Trying to handle unstable ldap connections a bit better

by Lars Michelsen

Module: check_mk Branch: master Commit: 396ee8524aa590c426ba5e9615ec8f44b6cbb657 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=396ee8524aa590… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 23 09:39:54 2013 +0200 ldap: Trying to handle unstable ldap connections a bit better --- web/plugins/userdb/ldap.py | 69 +++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 1e8d2c4..d58d873 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -304,37 +304,52 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): ldap_log('LDAP_SEARCH "%s" "%s" "%s" "%r"' % (base, scope, filt, columns)) start_time = time.time() - result = [] - try: - - search_func = config.ldap_connection.get('page_size') \ - and ldap_paged_async_search or ldap_async_search - for dn, obj in search_func(base, scope, filt, columns): - if dn is None: - continue # skip unwanted answers - new_obj = {} - for key, val in obj.iteritems(): - # Convert all keys to lower case! - new_obj[key.lower().decode('utf-8')] = [ i.decode('utf-8') for i in val ] - result.append((dn, new_obj)) - except ldap.NO_SUCH_OBJECT, e: - raise MKLDAPException(_('The given base object "%s" does not exist in LDAP (%s))') % (base, e)) - - except ldap.FILTER_ERROR, e: - raise MKLDAPException(_('The given ldap filter "%s" is invalid (%s)') % (filt, e)) - - except ldap.SIZELIMIT_EXCEEDED: - raise MKLDAPException(_('The response reached a size limit. This could be due to ' - '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.')) + # 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 + success = False + while not success: + tries_left -= 1 + try: + result = [] + try: + search_func = config.ldap_connection.get('page_size') \ + and ldap_paged_async_search or ldap_async_search + for dn, obj in search_func(base, scope, filt, columns): + if dn is None: + continue # skip unwanted answers + new_obj = {} + for key, val in obj.iteritems(): + # Convert all keys to lower case! + new_obj[key.lower().decode('utf-8')] = [ i.decode('utf-8') for i in val ] + result.append((dn, new_obj)) + success = True + except ldap.NO_SUCH_OBJECT, e: + raise MKLDAPException(_('The given base object "%s" does not exist in LDAP (%s))') % (base, e)) + + except ldap.FILTER_ERROR, e: + raise MKLDAPException(_('The given ldap filter "%s" is invalid (%s)') % (filt, e)) + + except ldap.SIZELIMIT_EXCEEDED: + raise MKLDAPException(_('The response reached a size limit. This could be due to ' + '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: + if tries_left: + ldap_log(' Received SERVER_DOWN. Retrying...') + time.sleep(0.5) + else: + break duration = time.time() - start_time + + if not success: + raise MKLDAPException(_('Unable to successfully perform the LDAP search. ' + 'Maybe there is a connection problem with the LDAP server.')) + ldap_log(' RESULT length: %d, duration: %0.3f' % (len(result), duration)) return result - #return ldap_connection.search_s(base, scope, filter, columns) - #for dn, obj in ldap_connection.search_s(base, scope, filter, columns): - # html.log(repr(dn) + ' ' + repr(obj)) # Returns the ldap filter depending on the configured ldap directory type def ldap_filter(key, handle_config = True):

10 years, 10 months

Check_MK Git: check_mk: Reduced number of ldap queries during sync; Improved connection logging a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: d1ee0c77ba560cbded40684288056b40ff09d440 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1ee0c77ba560c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 23 09:25:36 2013 +0200 Reduced number of ldap queries during sync; Improved connection logging a bit --- web/plugins/userdb/ldap.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 5c41652..1e8d2c4 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -153,7 +153,10 @@ def ldap_connect(enforce_new = False, enforce_server = None): and not "no_persistent" in config.ldap_connection \ and ldap_connection \ and config.ldap_connection == ldap_connection_options: + ldap_log('LDAP CONNECT - Using existing connecting') return # Use existing connections (if connection settings have not changed) + else: + ldap_log('LDAP CONNECT - Connecting...') ldap_test_module() @@ -455,6 +458,7 @@ def ldap_get_users(add_filter = ''): 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 return result @@ -475,10 +479,15 @@ def ldap_get_groups(add_filt = None): filt = '(&%s%s)' % (filt, add_filt) return ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn']) -def ldap_user_groups(username, attr = 'cn'): - # The given username might be wrong case. The ldap search is case insensitive, - # so the username read from ldap might differ. Fix it here. - user_dn, username = ldap_get_user(username, True) +def ldap_user_groups(username, user_dn, attr = 'cn'): + # When configured to convert user_ids to lower case, all user ids here are lower case. + # Otherwise all user_ids are in the case which they are in LDAP. This should be ok + # for this function! I removed the snippet below to reduce the number of ldap queries. + # Before removal, this query was executed for every user again, just to fetch the DN + # and the username. + # # The given username might be wrong case. The ldap search is case insensitive, + # # so the username read from ldap might differ. Fix it here. + # user_dn, username = ldap_get_user(username, True) if username in g_ldap_group_cache: if attr == 'cn': @@ -709,7 +718,7 @@ register_user_attribute_sync_plugins() def ldap_convert_groups_to_contactgroups(params, user_id, ldap_user, user): groups = [] # 1. Fetch CNs of all LDAP groups of the user (use group_dn, group_filter) - ldap_groups = ldap_user_groups(user_id) + ldap_groups = ldap_user_groups(user_id, ldap_user['dn']) # 2. Fetch all existing group names in WATO cg_names = load_group_information().get("contact", {}).keys() @@ -730,7 +739,7 @@ ldap_attribute_plugins['groups_to_contactgroups'] = { def ldap_convert_groups_to_roles(params, user_id, ldap_user, user): groups = [] # 1. Fetch DNs of all LDAP groups of the user - ldap_groups = [ g.lower() for g in ldap_user_groups(user_id, 'dn') ] + ldap_groups = [ g.lower() for g in ldap_user_groups(user_id, ldap_user['dn'], 'dn') ] # 2. Load default roles from default user profile roles = config.default_user_profile['roles'][:]

10 years, 10 months

Check_MK Git: check_mk: df / esx_vsphere_datastore easier filesystem level configuration

by Andreas Boesl

Module: check_mk Branch: master Commit: 3be851a23147ef8902c5b12d1115daee7cbdee5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3be851a23147ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 22 16:22:45 2013 +0200 df / esx_vsphere_datastore easier filesystem level configuration --- ChangeLog | 3 ++ checks/df.include | 62 +++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 62 ++++++++++++++++++++++++++++++---- 3 files changed, 112 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70b4a46..3df43a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,9 @@ (output buffer now grows dynamically) * jolokia_metrics: fixed incorrect plugin output for high warn/crit levels * hyperv: Added a check for checking state changes. + * df / esx_vsphere_datastore: filesystem levels configuration gets even easier + now able to set absolute levels and levels depending + on total disk space Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/df.include b/checks/df.include index e3495ec..24f3626 100644 --- a/checks/df.include +++ b/checks/df.include @@ -55,9 +55,9 @@ filesystem_groups = [] # } factory_settings["filesystem_default_levels"] = { - "levels" : (80, 90), # warn/crit in percent + "levels" : (80.0, 90.0), # warn/crit in percent "magic_normsize" : 20, # Standard size if 20 GB - "levels_low" : (50, 60), # Never move warn level below 50% due to magic factor + "levels_low" : (50.0, 60.0), # Never move warn level below 50% due to magic factor "trend_range" : 24, "trend_perfdata" : True, # do send performance data for trends } @@ -101,16 +101,28 @@ def df_inventory(mplist): # old style params a'la (80, 90). As soon as we drop support for that # (can happen any decade now), we can get rid of this function. def get_filesystem_levels(host, mountpoint, size_gb, params): - + mega = 1024 * 1024 + giga = mega * 1024 # Start with factory settings levels = factory_settings["filesystem_default_levels"].copy() + + def convert_legacy_levels(value): + if type(params) == tuple or not params.get("flex_levels"): + return tuple(map(float, value)) + else: + return value + # convert default levels to dictionary. This is in order support # old style levels like (80, 90) if type(filesystem_default_levels) == dict: + fs_default_levels = filesystem_default_levels.copy() + fs_levels = fs_default_levels.get("levels") + if fs_levels: + fs_default_levels["levels"] = convert_legacy_levels(fs_levels) levels.update(filesystem_default_levels) else: levels = factory_settings["filesystem_default_levels"].copy() - levels["levels"] = filesystem_default_levels[:2] + levels["levels"] = convert_legacy_levels(filesystem_default_levels[:2]) if len(filesystem_default_levels) == 2: levels["magic"] = None else: @@ -121,16 +133,35 @@ def get_filesystem_levels(host, mountpoint, size_gb, params): levels.update(params) else: # simple format - explicitely override levels and magic - levels["levels"] = params[:2] + levels["levels"] = convert_legacy_levels(params[:2]) if len(params) >= 3: levels["magic"] = params[2] - warn, crit = levels["levels"] + # Determine real warn, crit levels + if type(levels["levels"]) == tuple: + warn, crit = levels["levels"] + else: + # A list of levels. Choose the correct one depending on the + # size of the current tablespace + found = False + for to_size, this_levels in levels["levels"]: + if size_gb * giga > to_size: + warn, crit = this_levels + found = True + if not found: + warn, crit = 100.0, 100.0 # entry not found in list + # If the magic factor is used, take disk size and magic factor # into account in order to move levels magic = levels.get("magic") if magic: + # convert warn/crit to percentage + if type(warn) != float: + warn = savefloat(warn * mega / float(size_gb * giga)) * 100 + if type(crit) != float: + crit = savefloat(crit * mega / float(size_gb * giga)) * 100 + normsize = levels["magic_normsize"] hgb_size = size_gb / float(normsize) felt_size = hgb_size ** magic @@ -145,14 +176,27 @@ def get_filesystem_levels(host, mountpoint, size_gb, params): if crit_scaled < lowest_critical_level: crit_scaled = lowest_critical_level else: - warn_scaled = warn - crit_scaled = crit + if type(warn) != float: + warn_scaled = savefloat(warn * mega / float(size_gb * giga)) * 100 + else: + warn_scaled = warn + + if type(crit) != float: + crit_scaled = savefloat(crit * mega / float(size_gb * giga)) * 100 + else: + crit_scaled = crit size_mb = size_gb * 1024 warn_mb = savefloat(size_mb * warn_scaled / 100) crit_mb = savefloat(size_mb * crit_scaled / 100) levels["levels_mb"] = (warn_mb, crit_mb) - levels["levels_text"] = "(levels at %.1f/%.1f%%)" % (warn_scaled, crit_scaled) + if type(warn) == float: + levels["levels_text"] = "(levels at %.2f/%.2f%%)" % (warn_scaled, crit_scaled) + else: + warn_hr = get_bytes_human_readable(warn * mega) + crit_hr = get_bytes_human_readable(crit * mega) + levels["levels_text"] = "(levels at %s/%s)" % ( warn_hr, crit_hr ) + return levels # Legacy function for checks that do not support groups yet diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 467ee10..a23ba31 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1322,12 +1322,60 @@ register_check_parameters( ) filesystem_elements = [ - ( "levels", - Tuple( - title = _("Levels for filesystem usage"), - elements = [ - Percentage(title = _("Warning if above"), unit = _("% usage"), allow_int = True, default_value=80), - Percentage(title = _("Critical if above"), unit = _("% usage"), allow_int = True, default_value=90)])), + ("levels", + Alternative( + title = _("Levels for filesystem usage"), + default_value = (80.0, 90.0), + elements = [ + Tuple( + title = _("Percentage used space"), + elements = [ + Percentage(title = _("Warning if above"), unit = _("% usage")), + Percentage(title = _("Critical if above"), unit = _("% usage")), + ] + ), + Tuple( + title = _("Absolute used space"), + elements = [ + Integer(title = _("Warning if above"), unit = _("MB")), + Integer(title = _("Critical if above"), unit = _("MB")), + ] + ), + ListOf( + Tuple( + orientation = "horizontal", + elements = [ + Filesize(title = _("Filesystem larger than")), + Alternative( + title = _("Levels for the filesystem usage"), + elements = [ + Tuple( + title = _("Percentage used space"), + elements = [ + Percentage(title = _("Warning if above"), unit = _("% usage")), + Percentage(title = _("Critical if above"), unit = _("% usage")), + ] + ), + Tuple( + title = _("Absolute used space"), + elements = [ + Integer(title = _("Warning if above"), unit = _("MB")), + Integer(title = _("Critical if above"), unit = _("MB")), + ] + ), + ] + ), + ], + ), + title = _('Dynamic levels'), + ),]), + ), + ( "flex_levels", + FixedValue( + None, + totext = "", + title = _("Hidden identifier key for flexible level usage") + )), ( "magic", Float( title = _("Magic factor (automatic level adaptation for large filesystems)"), @@ -1390,6 +1438,7 @@ register_check_parameters( _("Filesystems (used space and growth)"), Dictionary( elements = filesystem_elements, + hidden_keys = ["flex_levels"], ), TextAscii( title = _("Mount point"), @@ -1414,6 +1463,7 @@ register_check_parameters( ] )), ], + hidden_keys = ["flex_levels"], ), TextAscii( title = _("Datastore Name"),

10 years, 10 months

Check_MK Git: check_mk: Rules for temperatures, voltage,

by Götz Golla

electrical power and nominal frequencies added, Message-ID: <52161ce0.bYRAt628fRlgiEoQ%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: ddf93493d40eef6a52ee043d66b28b47135bfea3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddf93493d40eef… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 22 16:12:21 2013 +0200 Rules for temperatures, voltage, electrical power and nominal frequencies added, partly to enable non-european customers to set meaningful levels different from the european defaults --- checks/liebert_bat_temp | 2 +- checks/ups_in_freq | 1 + checks/ups_in_voltage | 1 + checks/ups_out_voltage | 1 + checks/ups_power | 2 +- web/plugins/wato/check_parameters.py | 74 ++++++++++++++++++++++++++++++++-- 6 files changed, 76 insertions(+), 5 deletions(-) diff --git a/checks/liebert_bat_temp b/checks/liebert_bat_temp index 06389e6..b51cdc5 100644 --- a/checks/liebert_bat_temp +++ b/checks/liebert_bat_temp @@ -54,7 +54,7 @@ check_info['liebert_bat_temp'] = { "check_function" : check_liebert_bat_temp, "service_description" : "Battery Temp", "has_perfdata" : True, - "group" : "hw_temperature", + "group" : "hw_single_temperature", "snmp_info" : (".1.3.6.1.4.1.476.1.42.3.4.1.3.3.1.3", "1"), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [".1.3.6.1.4.1.476.1.42"] diff --git a/checks/ups_in_freq b/checks/ups_in_freq index 12e6af8..6cd615d 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -55,6 +55,7 @@ check_info['ups_in_freq'] = { "check_function" : check_ups_in_freq, "service_description" : "IN frequenz phase %s", "has_perfdata" : True, + "group" : "efreq", "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 6800576..09fc295 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -54,6 +54,7 @@ check_info['ups_in_voltage'] = { "check_function" : check_ups_in_voltage, "service_description" : "IN voltage phase %s", "has_perfdata" : True, + "group" : "evolt", "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index fa74095..871c5c1 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -54,6 +54,7 @@ check_info['ups_out_voltage'] = { "check_function" : check_ups_out_voltage, "service_description" : "OUT voltage phase %s", "has_perfdata" : True, + "group" : "evolt", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", diff --git a/checks/ups_power b/checks/ups_power index aebd56c..b64ed82 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -57,7 +57,7 @@ check_info['ups_power'] = { "check_function" : check_ups_power, "service_description" : "Power phase %s", "has_perfdata" : True, - "group" : "hw_temperature", + "group" : "epower", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 4 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bcf0b2a..467ee10 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -37,7 +37,7 @@ subgroup_networking = _("Networking") subgroup_storage = _("Storage, Filesystems and Files") subgroup_os = _("Operating System Resources") subgroup_printing = _("Printers") -subgroup_environment = _("Temperature, Humidity, etc.") +subgroup_environment = _("Temperature, Humidity, Electrical Parameters, etc.") subgroup_applications = _("Applications, Processes & Services") subgroup_virt = _("Virtualization") subgroup_hardware = _("Hardware, BIOS") @@ -2753,7 +2753,73 @@ register_check_parameters( ]), TextAscii( title = _("Sensor ID"), - help = _("The identificator of the themal sensor.")), + help = _("The identifier of the themal sensor.")), + "first" +) + +register_check_parameters( + subgroup_environment, + "hw_single_temperature", + _("Host/Device temperature"), + Tuple( + help = _("Temperature levels for hardware devices with " + "a single temperature sensor."), + elements = [ + Integer(title = _("warning if above"), unit = u"°C", default_value = 35), + Integer(title = _("critical if above"), unit = u"°C", default_value = 40), + ]), + None, + "first" +) + +register_check_parameters( + subgroup_environment, + "evolt", + _("Nominal Voltages"), + Tuple( + help = _("Voltage Levels for devices like UPS oder PDUs. " + "Several phases may be addressed independently."), + elements = [ + Integer(title = _("warning if below"), unit = "V", default_value = 210), + Integer(title = _("critical if below"), unit = "V", default_value = 180), + ]), + TextAscii( + title = _("Phase"), + help = _("The identifier of the phase the power is related to.")), + "first" +) + +register_check_parameters( + subgroup_environment, + "efreq", + _("Nominal Frequencies"), + Tuple( + help = _("Levels for the nominal frequencies of AC devices " + "like UPSs or PDUs. Several phases may be addressed independently."), + elements = [ + Integer(title = _("warning if below"), unit = "Hz", default_value = 40), + Integer(title = _("critical if below"), unit = "Hz", default_value = 45), + ]), + TextAscii( + title = _("Phase"), + help = _("The identifier of the phase the power is related to.")), + "first" +) + +register_check_parameters( + subgroup_environment, + "epower", + _("Electrical Power"), + Tuple( + help = _("Levels for the electrical power consumption of a device " + "like a UPS or a PDU. Several phases may be addressed independently."), + elements = [ + Integer(title = _("warning if below"), unit = "Watt", default_value = 20), + Integer(title = _("critical if below"), unit = "Watt", default_value = 1), + ]), + TextAscii( + title = _("Phase"), + help = _("The identifier of the phase the power is related to.")), "first" ) @@ -2763,7 +2829,9 @@ register_check_parameters( _("Hardware temperature (e.g. switches)"), Tuple( help = _("Temperature levels for hardware devices like " - "Brocade switches."), + "Brocade switches with (potentially) several " + "temperature sensors. Sensor IDs can be selected " + "in the rule."), elements = [ Integer(title = _("warning if above"), unit = u"°C", default_value = 35), Integer(title = _("critical if above"), unit = u"°C", default_value = 40),

10 years, 10 months

Check_MK Git: check_mk: Dictionary vs: now able to set hidden_keys ( only useful for fixed values)

by Andreas Boesl

Module: check_mk Branch: master Commit: 75dd66512e2047eb12abb07da7e34b8dcb2ac7ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75dd66512e2047… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 22 15:58:25 2013 +0200 Dictionary vs: now able to set hidden_keys (only useful for fixed values) --- web/htdocs/valuespec.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 00cf4df..1a02992 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2079,6 +2079,10 @@ class Dictionary(ValueSpec): self._optional_keys = False else: self._optional_keys = True + if "hidden_keys" in kwargs: + self._hidden_keys = kwargs["hidden_keys"] + else: + self._hidden_keys = [] self._columns = kwargs.get("columns", 1) # possible: 1 or 2 self._render = kwargs.get("render", "normal") # also: "form" -> use forms.section() @@ -2115,6 +2119,8 @@ class Dictionary(ValueSpec): if headers_sup: html.write('<tr>') for param, vs in self._get_elements(): + if param in self._hidden_keys: + continue if not oneline: html.write('<tr><td class=dictleft>') div_id = varprefix + "_d_" + param @@ -2181,9 +2187,12 @@ class Dictionary(ValueSpec): def render_input_form_header(self, varprefix, value, title, sections): forms.header(title, narrow=self._form_narrow) for param, vs in self._get_elements(): - if sections and param not in sections: + if param in self._hidden_keys: continue + if sections and param not in sections: + continue + div_id = varprefix + "_d_" + param vp = varprefix + "_p_" + param if self._optional_keys and param not in self._required_keys:

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1001

by Götz Golla

Module: check_mk Branch: master Commit: 1b45f28fc0179ae5189cf2a65affdf6a7314a3e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b45f28fc0179a… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 22 13:50:41 2013 +0200 Updated bug entries #1001 --- .bugs/1001 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/1001 b/.bugs/1001 new file mode 100644 index 0000000..6c57b12 --- /dev/null +++ b/.bugs/1001 @@ -0,0 +1,12 @@ +Title: check ups_power uses the group 'hw_temperature' which settings levels in degree celcius' +Component: checks +State: open +Date: 2013-08-22 13:43:24 +Targetversion: future +Class: nastiness + +Levels for the electric power of ups devices are in watt, however the check uses the group +hw_temperature to set the values with the corresponding wato check in degrees celcius. +This will nevertheless work and may be in active use since the values are integers. However it +may be confusing. A new group hw_power with corresponding wato rule should be added. Customers +need to be aware that this fix may break their existing checks.

10 years, 10 months

Check_MK Git: check_mk: Added filter for filtering hostgroups by regexes

by Lars Michelsen

Module: check_mk Branch: master Commit: 73041a3dcd838516eeeee50de8c17a8ee63c2af5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73041a3dcd8385… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 22 12:27:12 2013 +0200 Added filter for filtering hostgroups by regexes --- web/plugins/views/filters.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index c454c5a..19caaa4 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -66,6 +66,9 @@ declare_filter(201, FilterText("service", _("Service (exact match)"), _("Exact match, used for linking")) +declare_filter(101, FilterText("hostgroupnameregex", _("Hostgroup)"), "hostgroup", "hostgroup_name", "hostgroup_name", "~~"), + _("Search field allowing regular expressions and partial matches on the names of hostgroups")) + declare_filter(101, FilterText("servicegroupnameregex", _("Servicegroup"), "servicegroup", "servicegroup_name", "servicegroup_name", "~~"), _("Search field allowing regular expression and partial matches")) @@ -74,8 +77,6 @@ declare_filter(101, FilterText("servicegroupname", _("Servicegroup (enforced)"), declare_filter(202, FilterText("output", _("Status detail"), "service", "service_plugin_output", "service_output", "~~")) - - class FilterIPAddress(Filter): def __init__(self): Filter.__init__(self, "host_address", _("Host IP Address"), "host", ["host_address", "host_address_prefix"], ["host_address"])

10 years, 10 months

Check_MK Git: check_mk: Removed debug outputs

by Lars Michelsen

Module: check_mk Branch: master Commit: 25e380f56312f44ce7c6c06c18a98756e3ab2385 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25e380f56312f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 22 10:57:41 2013 +0200 Removed debug outputs --- web/htdocs/prediction.py | 1 - web/plugins/userdb/ldap.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 534bce4..b7d1d9d 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -91,7 +91,6 @@ def page_graph(): html.select("timegroup", choices, choices[0], onchange="document.prediction.submit();") html.hidden_fields() html.end_form() - html.log("HIRN") # Get prediction data tg_data = eval(file(dir + "/" + timegroup["name"]).read()) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index b185cde..5c41652 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -687,8 +687,6 @@ ldap_attribute_plugins['pager'] = { # Register sync plugins for all custom user attributes (assuming simple data types) def register_user_attribute_sync_plugins(): for attr, val in get_user_attributes(): - html.log(attr) - html.log(val) ldap_attribute_plugins[attr] = { 'title': val['valuespec'].title(), 'help': val['valuespec'].help(),

10 years, 10 months

Check_MK Git: check_mk: Better logging of suppressed exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: ef6a73ea9dfc09b3dbeca4399c2ded5d61bc9b2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef6a73ea9dfc09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 22 12:20:06 2013 +0200 Better logging of suppressed exceptions --- web/htdocs/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index f3c583a..3df5b76 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -401,6 +401,7 @@ def handler(req, profiling = True): except Exception, e: html.unplug() + apache.log_error("%s %s %s" % (req.uri, _('Internal error') + ':', e), apache.APLOG_ERR) # log in all cases if plain_error: html.write(_("Internal error") + ": %s\n" % e) elif not fail_silently: @@ -411,7 +412,6 @@ def handler(req, profiling = True): else: url = html.makeuri([("debug", "1")]) html.show_error("%s: %s (<a href=\"%s\">%s</a>)" % (_('Internal error') + ':', e, url, _('Retry with debug mode'))) - apache.log_error("%s %s" % (_('Internal error') + ':', e), apache.APLOG_ERR) html.footer() response_code = apache.OK

10 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013