Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: e3241dbb7a4a3c44f4fd80a025c769bdd801d81f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3241dbb7a4a3c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 12:14:15 2016 +0100 Updated bug entries #2420 --- .bugs/2420 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2420 b/.bugs/2420 new file mode 100644 index 0000000..ba174fe --- /dev/null +++ b/.bugs/2420 @@ -0,0 +1,12 @@ +Title: Renaming hosts can lead to duplicate host names +Component: wato +State: open +Date: 2016-02-10 12:12:50 +Targetversion: future +Class: bug + +You have host A in folder F and host B in folder G. Now you can rename +B into A without WATO complaining. You end with two times A - which causes +*lots* of trouble. + +We need to check better for duplicate hosts when renaming.

8 years, 7 months

Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: b2a1b5110a1a4356459a33d48063caaf6f6b8dd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2a1b5110a1a43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 12:12:41 2016 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 121140f..d5b4321 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2420 +2430

8 years, 7 months

#3174 FIX Fix exception in Check_MK agent version check if version number does not contain three parts

by Mathias Kettner

Module: check_mk Branch: master Commit: 42c8e562af432ff17139f6eda2452d492144c82a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42c8e562af432f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 12:01:11 2016 +0100 #3174 FIX Fix exception in Check_MK agent version check if version number does not contain three parts --- .werks/3174 | 9 +++++++++ ChangeLog | 1 + modules/check_mk_base.py | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3174 b/.werks/3174 new file mode 100644 index 0000000..2d6588d --- /dev/null +++ b/.werks/3174 @@ -0,0 +1,9 @@ +Title: Fix exception in Check_MK agent version check if version number does not contain three parts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455102033 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b8140b6..82ca4ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -263,6 +263,7 @@ * 2990 FIX: netapp_api_vs_traffic: fixed incorrect CIFS latency... * 2978 FIX: agent_appdynamics: fixed missing closing brackets for piggyback data * 3172 FIX: fjdarye100_rluns fjdarye101_rluns fjdarye60_rluns: Correctly detect RAID 0 state... + * 3174 FIX: Fix exception in Check_MK agent version check if version number does not contain three parts Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 423f733..dca5b44 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1283,6 +1283,8 @@ def is_expected_agent_version(agent_version, expected_version): return True except Exception, e: + if opt_debug: + raise raise MKGeneralException("Unable to check agent version (Agent: %s Expected: %s, Error: %s)" % (agent_version, expected_version, e)) @@ -1306,7 +1308,11 @@ def parse_check_mk_version(v): return number and int(number) or 0, s return number and int(number) or 0, '' - major, minor, rest = v.split('.') + parts = v.split('.') + while len(parts) < 3: + parts.append("0") + + major, minor, rest = parts sub, rest = extract_number(rest) if not rest:

8 years, 7 months

Fix GIT function in WATO after WATO restructuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 09280abee46cc5912f9bfa4a074298e61e89aa79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09280abee46cc5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 11:22:08 2016 +0100 Fix GIT function in WATO after WATO restructuration --- web/htdocs/wato.py | 6 +++--- web/htdocs/watolib.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 627b8d6..305012f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -148,6 +148,9 @@ def page_handler(): if html.is_transaction(): lock_exclusive() + if config.wato_use_git: + prepare_git_commit() + try: init_wato_datastructures() except: @@ -15897,9 +15900,6 @@ modes = { loaded_with_language = False def load_plugins(force): - global g_git_messages - g_git_messages = [] - global loaded_with_language if loaded_with_language == current_language and not force: return diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index cca476c..aee3308 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4249,6 +4249,11 @@ def shell_quote(s): return "'" + s.replace("'", "'\"'\"'") + "'" +def prepare_git_commit(): + global g_git_messages + g_git_messages = [] + + def do_git_commit(): author = shell_quote("%s <%s>" % (config.user_id, config.user_email)) git_dir = defaults.default_config_dir + "/.git"

8 years, 7 months

Made crash reporting with local variables more robust agains non JSON compatible data

by Lars Michelsen

Module: check_mk Branch: master Commit: 34fdd74760a90bc094b1d0a359a7f3f99f848a1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34fdd74760a90b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 10 11:18:55 2016 +0100 Made crash reporting with local variables more robust agains non JSON compatible data --- modules/check_mk_base.py | 7 +++++-- web/htdocs/crash_reporting.py | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d5539c6..423f733 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1543,10 +1543,13 @@ def format_var_for_export(val): def get_local_vars_of_last_exception(): local_vars = {} - import inspect + import inspect, base64, pprint for key, val in inspect.trace()[-1][0].f_locals.items(): local_vars[key] = format_var_for_export(val) - return local_vars + + # This needs to be encoded as the local vars might contain binary data which can not be + # transported using JSON. + return base64.b64encode(pprint.pformat(local_vars)) def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, description, info, text): diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index f587732..e62cf59 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -283,8 +283,10 @@ def show_crash_report(info): html.write("</table>") +# Local vars are a base64 encoded repr of the python dict containing the local vars of +# the exception context. Decode it! def format_local_vars(local_vars): - return pprint.pformat(local_vars) + return base64.b64decode(local_vars) def show_crashed_check_details(info): @@ -389,7 +391,10 @@ def get_local_vars_of_last_exception(): local_vars = {} for key, val in inspect.trace()[-1][0].f_locals.items(): local_vars[key] = format_var_for_export(val) - return local_vars + + # This needs to be encoded as the local vars might contain binary data which can not be + # transported using JSON. + return base64.b64encode(pprint.pformat(local_vars)) def format_var_for_export(val):

8 years, 7 months

#3047 FIX Git integration: Using the users mail address for commit messages

by Lars Michelsen

Module: check_mk Branch: master Commit: c6e58f15317f7c059475b399f07b49eb5a2f8b9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6e58f15317f7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 16:39:01 2016 +0100 #3047 FIX Git integration: Using the users mail address for commit messages --- .werks/3047 | 9 +++++++++ ChangeLog | 1 + web/htdocs/config.py | 7 +++++-- web/htdocs/watolib.py | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/3047 b/.werks/3047 new file mode 100644 index 0000000..a6cc157 --- /dev/null +++ b/.werks/3047 @@ -0,0 +1,9 @@ +Title: Git integration: Using the users mail address for commit messages +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1454513900 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3be380c..b8140b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -356,6 +356,7 @@ * 3036 FIX: Bulk discovery steps are now timing out short before HTTP request timeout... * 3038 FIX: Fixed invalid error message when creating service group assignment rule without having service groups * 3044 FIX: Fixed garbled notifications page on page reload after an action has been performed + * 3047 FIX: Git integration: Using the users mail address for commit messages * 3169 FIX: Permission/Contact group settings for new hosts did show folder options... Notifications: diff --git a/web/htdocs/config.py b/web/htdocs/config.py index ca653a4..e461e80 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -251,13 +251,15 @@ def login(u): user_baserole_id = "guest" # Prepare user object - global user, user_alias + global user, user_alias, user_email if u in multisite_users: user = multisite_users[u] user_alias = user.get("alias", user_id) + user_email = user.get("email", user_id) else: user = { "roles" : user_role_ids } user_alias = user_id + user_email = user_email # Prepare cache of already computed permissions global user_permissions @@ -292,9 +294,10 @@ def login_super_user(): user_baserole_id = "admin" # Prepare user object - global user, user_alias + global user, user_alias, user_email user = { "roles" : "admin" } user_alias = "Superuser for unauthenticated pages" + user_email = "admin" # Prepare cache of already computed permissions global user_permissions diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ab04240..cca476c 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4250,7 +4250,7 @@ def shell_quote(s): def do_git_commit(): - author = shell_quote("%s <%s>" % (config.user_id, config.user_alias)) + author = shell_quote("%s <%s>" % (config.user_id, config.user_email)) git_dir = defaults.default_config_dir + "/.git" if not os.path.exists(git_dir): git_command(["init"])

8 years, 7 months

#3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp : Detect XI52 Model

by Mathias Kettner

Module: check_mk Branch: master Commit: 3ed9a2cc250b42c1bba84deb3fcb3f8ba29f4465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ed9a2cc250b42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 10:35:30 2016 +0100 #3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model --- .werks/3173 | 9 +++++++++ ChangeLog | 1 + checks/datapower_cpu | 2 +- checks/datapower_fan | 2 +- checks/datapower_fs | 2 +- checks/datapower_ldrive | 4 +--- checks/datapower_mem | 2 +- checks/datapower_pdrive | 3 +-- checks/datapower_raid_bat | 4 +--- checks/datapower_tcp | 2 +- checks/datapower_temp | 2 +- 11 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.werks/3173 b/.werks/3173 new file mode 100644 index 0000000..30b55aa --- /dev/null +++ b/.werks/3173 @@ -0,0 +1,9 @@ +Title: datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455096912 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f50d391..3be380c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 2976 eltek_battery, eltek_battery.temp, eltek_battery.supply, eltek_fans, eltek_outdoor_temp, eltek_systemstatus: new checks for a Eltek Valere USV * 2989 netapp_api_snapshots: increased performance while querying data. levels configurable... * 2977 aruba_wlc_clients: new check which monitors the WLC clients of a Aruba Networks WLAN Controller + * 3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/datapower_cpu b/checks/datapower_cpu index 6c30130..bb76da0 100644 --- a/checks/datapower_cpu +++ b/checks/datapower_cpu @@ -44,7 +44,7 @@ check_info['datapower_cpu'] = { "snmp_info" : ( ".1.3.6.1.4.1.14685.3.1.14", [ "2", # dpStatusCPUUsageoneMinute ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], "includes" : [ "cpu_util.include" ], "group" : "cpu_utilization", "default_levels_variable" : "datapower_cpu_default_levels", diff --git a/checks/datapower_fan b/checks/datapower_fan index 20c0a36..def1090 100644 --- a/checks/datapower_fan +++ b/checks/datapower_fan @@ -85,5 +85,5 @@ check_info["datapower_fan"] = { 2, # dpStatusEnvironmentalFanSensorsFanSpeed 4, # dpStatusEnvironmentalFanSensorsReadingStatus ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.14685.1.7"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], } diff --git a/checks/datapower_fs b/checks/datapower_fs index 38b19c9..8306047 100644 --- a/checks/datapower_fs +++ b/checks/datapower_fs @@ -70,6 +70,6 @@ check_info["datapower_fs"] = { "7", # dpStatusFilesystemStatusFreeInternal "8", # dpStatusFilesystemStatusTotalInternal ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], } diff --git a/checks/datapower_ldrive b/checks/datapower_ldrive index faa50f0..7517ccb 100644 --- a/checks/datapower_ldrive +++ b/checks/datapower_ldrive @@ -67,7 +67,5 @@ check_info['datapower_ldrive'] = { "5", # dpStatusRaidLogicaldrivetatusNumPhysicalDrives "6", # dpStatusRaidLogicaldrivetatusState ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", - - + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], } diff --git a/checks/datapower_mem b/checks/datapower_mem index c4a46ad..dd6a2a8 100644 --- a/checks/datapower_mem +++ b/checks/datapower_mem @@ -48,7 +48,7 @@ check_info['datapower_mem'] = { "2", # dpStatusMemoryStatusTotalMemory "3", # dpStatusMemoryStatusUsedMemory ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], "includes" : [ "memory.include" ], "group" : "memory_simple", "default_levels_variable" : "datapower_mem_default_levels", diff --git a/checks/datapower_pdrive b/checks/datapower_pdrive index cc6ab23..ab5c273 100644 --- a/checks/datapower_pdrive +++ b/checks/datapower_pdrive @@ -87,7 +87,6 @@ check_info['datapower_pdrive'] = { "15", # dpStatusRaidPhysicaldrivetatusProductID "18", # dpStatusRaidPhysicaldrivetatusFailure ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", - + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], } diff --git a/checks/datapower_raid_bat b/checks/datapower_raid_bat index e8221f6..eafe966 100644 --- a/checks/datapower_raid_bat +++ b/checks/datapower_raid_bat @@ -74,7 +74,5 @@ check_info['datapower_raid_bat'] = { "4", # dpStatusRaidBatteryBackUpStatusName "5", # dpStatusRaidBatteryBackUpStatusStatus ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", - - + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], } diff --git a/checks/datapower_tcp b/checks/datapower_tcp index 6169b4d..f46d383 100644 --- a/checks/datapower_tcp +++ b/checks/datapower_tcp @@ -52,7 +52,7 @@ check_info['datapower_tcp'] = { OID_END, # state of tcp connection "", # number of tcp connections of this state ]), - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.14685.1.7", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], 'has_perfdata' : True, 'group' : 'tcp_conn_stats', 'includes' : [ "tcp_connections.include" ], diff --git a/checks/datapower_temp b/checks/datapower_temp index 720c3df..fe76e6f 100644 --- a/checks/datapower_temp +++ b/checks/datapower_temp @@ -68,7 +68,7 @@ check_info["datapower_temp"] = { 5, # dpStatusEnvironmentalSensorsReadingStatus 6, # dpStatusEnvironmentalSensorsUpperCriticalThreshold ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.14685.1.7"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ], "includes" : [ "temperature.include" ], "default_levels_variable" : "datapower_temp_default_levels", }

8 years, 7 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: ef9199490740074b80f7a13a2ea83646e177977e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef919949074007… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 10:35:10 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f3cabfd..e66344f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3173 +3183

8 years, 7 months

#3172 FIX fjdarye100_rluns fjdarye101_rluns fjdarye60_rluns:

by Mathias Kettner

Correctly detect RAID 0 state Message-ID: <56baf23f.V0ALshVAMWV2xvV8%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 2244763de51b4b541614350c69cf860554d1c71d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2244763de51b4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 10 09:17:42 2016 +0100 #3172 FIX fjdarye100_rluns fjdarye101_rluns fjdarye60_rluns: Correctly detect RAID 0 state Thanks to Alexander Greiner Baer. --- .werks/3172 | 9 +++++++++ ChangeLog | 1 + checks/fjdarye.include | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/3172 b/.werks/3172 new file mode 100644 index 0000000..8f598ea --- /dev/null +++ b/.werks/3172 @@ -0,0 +1,9 @@ +Title: fjdarye100_rluns fjdarye101_rluns fjdarye60_rluns: Correctly detect RAID 0 state +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455092205 +Class: fix + +Thanks to Alexander Greiner Baer. diff --git a/ChangeLog b/ChangeLog index 5d419df..f50d391 100644 --- a/ChangeLog +++ b/ChangeLog @@ -261,6 +261,7 @@ * 3071 FIX: cisco_mem, cisco_sys_mem, cisco_mem_asa: fixed incorrect unit being displayed... * 2990 FIX: netapp_api_vs_traffic: fixed incorrect CIFS latency... * 2978 FIX: agent_appdynamics: fixed missing closing brackets for piggyback data + * 3172 FIX: fjdarye100_rluns fjdarye101_rluns fjdarye60_rluns: Correctly detect RAID 0 state... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/fjdarye.include b/checks/fjdarye.include index 3d51b32..ed53565 100644 --- a/checks/fjdarye.include +++ b/checks/fjdarye.include @@ -133,6 +133,8 @@ def check_fjdarye_rluns(item, _no_params, info): return (1, "RLUN copyback in progress") elif rawdata[2] == u'\x41': return (1, "RLUN spare is in use") + elif rawdata[2] == u'B': + return (0, "RLUN is in RAID0 state") # assumption state 42 elif rawdata[2] == u'\x00': return (0, "RLUN is in normal state") # assumption else:

8 years, 7 months

Fix exception in table sorting in case number of columns change

by Mathias Kettner

Module: check_mk Branch: master Commit: 541df6d0100e9facd9acc5e67b133d0e8f4ec0ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=541df6d0100e9f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 9 16:57:28 2016 +0100 Fix exception in table sorting in case number of columns change --- web/htdocs/table.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 3578125..edc2cb3 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -221,10 +221,18 @@ def end(): rows.remove(row) fixed_rows.append((index, row)) - # Then use natural sorting to sort the list - rows.sort(cmp=lambda a, b: cmp(num_split(a[0][sort_col][0]), - num_split(b[0][sort_col][0])), - reverse=sort_reverse==1) + # Then use natural sorting to sort the list. Note: due to a + # change in the number of columns of a table in different software + # versions the cmp-function might fail. This is because the sorting + # column is persisted in a user file. So we ignore exceptions during + # sorting. This gives the user the chance to change the sorting and + # see the table in the first place. + try: + rows.sort(cmp=lambda a, b: cmp(num_split(a[0][sort_col][0]), + num_split(b[0][sort_col][0])), + reverse=sort_reverse==1) + except IndexError: + pass # Now re-add the removed "fixed" rows to the list again if fixed_rows:

8 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016