Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

4259 FIX aix_sap_processlist: fixed ValueError; if process has stopped and does not report any start time

by Simon Betz

Module: check_mk Branch: master Commit: af144e3c313cb312fe831e42daedb1dea51ef6e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af144e3c313cb3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 10 14:56:40 2017 +0100 4259 FIX aix_sap_processlist: fixed ValueError; if process has stopped and does not report any start time Change-Id: Ic56981d29e48a3886f8eb5b579b711736fed1c30 --- .werks/4259 | 10 ++++++ ChangeLog | 1 + checks/aix_sap_processlist | 87 +++++++++++++++++++++++++++++++--------------- 3 files changed, 70 insertions(+), 28 deletions(-) diff --git a/.werks/4259 b/.werks/4259 new file mode 100644 index 0000000..0b22d01 --- /dev/null +++ b/.werks/4259 @@ -0,0 +1,10 @@ +Title: aix_sap_processlist: fixed ValueError; if process has stopped and does not report any start time +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1484056407 + + diff --git a/ChangeLog b/ChangeLog index 553214e..6260396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 4230 FIX: db2_logsizes Removed debug output (regression since 1.4.0i3) * 4232 FIX: tsm_storagepools: Fixed missing perfdata * 4233 FIX: cisco_temp_sensor: Fixed possible wrong calculated thresholds + * 4259 FIX: aix_sap_processlist: fixed ValueError; if process has stopped and does not report any start time Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/aix_sap_processlist b/checks/aix_sap_processlist index 087fe0b..48cf170 100644 --- a/checks/aix_sap_processlist +++ b/checks/aix_sap_processlist @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # Example output from agent: # <<<aix_sap_processlist:sep(44)>>> # [01] @@ -41,52 +42,82 @@ # GetProcessList # FAIL: NIECONN_REFUSED (Connection refused), NiRawConnect failed in plugin_fopen() +# <<<aix_sap_processlist:sep(44)>>> +# [04] +# 10.01.2017 09:10:41 +# GetProcessList +# OK +# name, description, dispstatus, textstatus, starttime, elapsedtime, pid +# msg_server, MessageServer, GREEN, Running, 2017 01 08 14:38:18, 42:32:23, 12714224 +# disp+work, Dispatcher, GREEN, Running, 2017 01 08 14:38:18, 42:32:23, 15794214 +# aaaaaaaa, Central Syslog Collector, GRAY, Stopped, , , 9961478 +# bbbbbbbb, Central Syslog Sender, GRAY, Stopped, , , 9109548 + def parse_aix_sap_processlist(info): - instance = None - new_info = [] + instance, description = None, None + parsed = {} for line in info: if line[0].startswith('['): instance = line[0][1:-1] + elif instance and line[0].startswith("FAIL:"): instance = None + elif instance and len(line) == 7 and line[-1] != " pid": description, status, textstatus, start = map(lambda x: re.sub("^ ","",x), line[1:5]) - start_time = time.strptime(start, "%Y %m %d %H:%M:%S") - new_info.append([instance, description, status, textstatus, start_time]) + elif instance and len(line) == 9: description, status, textstatus = map(lambda x: re.sub("^ ","",x), line[1:4]) - start = re.sub("^ ","",line[6]) - start_time = time.strptime(start, "%Y %m %d %H:%M:%S") - new_info.append([instance, description, status, textstatus, start_time]) - return new_info + start = re.sub("^ ","", line[6]) -def inventory_aix_sap_processlist(info): - for line in info: - item = "%s on Instance %s" % (line[1], line[0]) - yield item, None + else: + continue + + if instance is not None and description is not None: + itemname = "%s on Instance %s" % (description, instance) + parsed.setdefault(itemname, { "status" : status, "textstatus" : textstatus }) + try: + parsed[itemname]["start_time"] = time.strptime(start, "%Y %m %d %H:%M:%S") + except ValueError: + continue + + return parsed + + +def inventory_aix_sap_processlist(parsed): + for entry in parsed: + yield entry, None -def check_aix_sap_processlist(item, _no_params, info): - now = time.time() - for line in info: - if item == "%s on Instance %s" % (line[1], line[0]): - start = time.strftime("%c", line[4]) - elapsed = now - time.mktime(line[4]) - infotext = "%s, Start Time: %s, Elapsed Time: %s" % (line[3], start, get_age_human_readable(elapsed)) - perfdata = [ ("runtime", elapsed) ] - if line[2] == "GREEN": - state = 0 - elif line[2] == "YELLOW": - state = 1 - else: - state = 2 - return state, infotext, perfdata + +def check_aix_sap_processlist(item, _no_params, parsed): + if item in parsed: + data = parsed[item] + status = data["status"] + textstatus = data["textstatus"] + infotexts = [ "Status: %s" % textstatus ] + perfdata = [] + + if "start_time" in data: + start_time = data["start_time"] + start = time.strftime("%c", start_time) + elapsed = time.time() - time.mktime(start_time) + perfdata = [ ("runtime", elapsed) ] + infotexts.append( "Start Time: %s, Elapsed Time: %s" % (start, get_age_human_readable(elapsed)) ) + + if status == "GREEN": + state = 0 + elif status == "YELLOW": + state = 1 + else: + state = 2 + return state, ", ".join(infotexts), perfdata check_info["aix_sap_processlist"] = { + 'parse_function' : parse_aix_sap_processlist, 'inventory_function' : inventory_aix_sap_processlist, 'check_function' : check_aix_sap_processlist, - 'parse_function' : parse_aix_sap_processlist, 'service_description' : 'SAP Process %s', 'has_perfdata' : True, }

7 years, 8 months

4231 FIX Fixed broken host renaming when files are in var/check_mk/web

by Lars Michelsen

Module: check_mk Branch: master Commit: ca2a96460c283303afd8458921a04575d2410379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca2a96460c2833… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:39:11 2017 +0100 4231 FIX Fixed broken host renaming when files are in var/check_mk/web Change-Id: If94463595ca529b2024b045fca3f224ee18b1c57 --- .werks/4231 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4231 b/.werks/4231 new file mode 100644 index 0000000..18c08f8 --- /dev/null +++ b/.werks/4231 @@ -0,0 +1,9 @@ +Title: Fixed broken host renaming when files are in var/check_mk/web +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1484055535 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8383e4f..c40f4a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 4223 FIX: Fixed possible g_host_attribute related AttributeError exception * 4224 FIX: Improved exception handling during WATO slave site activation * 4237 FIX: Fixed rendering of old timestamps... + * 4231 FIX: Fixed broken host renaming when files are in var/check_mk/web Notifications: * 4197 FIX: Fix sending notification to global fallback email address

7 years, 8 months

4232 FIX tsm_storagepools: Fixed missing perfdata

by Lars Michelsen

Module: check_mk Branch: master Commit: 80eeee51b422e328fae72d3460601231e1891985 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80eeee51b422e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:39:49 2017 +0100 4232 FIX tsm_storagepools: Fixed missing perfdata Change-Id: I0de75965b57328d7c9f6662ca566110940f68b8c --- .werks/4232 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4232 b/.werks/4232 new file mode 100644 index 0000000..8ca99e5 --- /dev/null +++ b/.werks/4232 @@ -0,0 +1,9 @@ +Title: tsm_storagepools: Fixed missing perfdata +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1484055584 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c40f4a1..9c1c621 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 4183 FIX: ibm_imm_fan: Fixed crash if fan speed is "unavailable"... * 4184 FIX: hivemanager_devices: Fixed bug if device is up for more than 1 year... * 4230 FIX: db2_logsizes Removed debug output (regression since 1.4.0i3) + * 4232 FIX: tsm_storagepools: Fixed missing perfdata Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings....

7 years, 8 months

4233 FIX cisco_temp_sensor: Fixed possible wrong calculated thresholds

by Lars Michelsen

Module: check_mk Branch: master Commit: a5b6295a7ed09fb89249120b85860bb729060956 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5b6295a7ed09f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:40:02 2017 +0100 4233 FIX cisco_temp_sensor: Fixed possible wrong calculated thresholds Change-Id: I7e50bc0fb40c55666ba1b064416c980352074621 --- .werks/4233 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4233 b/.werks/4233 new file mode 100644 index 0000000..85318e0 --- /dev/null +++ b/.werks/4233 @@ -0,0 +1,9 @@ +Title: cisco_temp_sensor: Fixed possible wrong calculated thresholds +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1484055595 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9c1c621..553214e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 4184 FIX: hivemanager_devices: Fixed bug if device is up for more than 1 year... * 4230 FIX: db2_logsizes Removed debug output (regression since 1.4.0i3) * 4232 FIX: tsm_storagepools: Fixed missing perfdata + * 4233 FIX: cisco_temp_sensor: Fixed possible wrong calculated thresholds Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings....

7 years, 8 months

4229 New Web GUI logging configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: cdb96fcadea6e39ed2e6995d2fb9b7307bdbd02f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdb96fcadea6e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:36:25 2017 +0100 4229 New Web GUI logging configuration The logging mechanism of the Web GUI has been changed to a single global setting. Similar to the new core log level configuration. Existing verbose log level configurations will be reset to the default log level during update. Change-Id: Ib0c8770343d72600a378ef3669fde393ef8e030a --- .werks/4229 | 13 +++++++++++++ ChangeLog | 1 + 2 files changed, 14 insertions(+) diff --git a/.werks/4229 b/.werks/4229 new file mode 100644 index 0000000..a674cfd --- /dev/null +++ b/.werks/4229 @@ -0,0 +1,13 @@ +Title: New Web GUI logging configuration +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1484055330 +Class: feature + +The logging mechanism of the Web GUI has been changed to a single +global setting. Similar to the new core log level configuration. + +Existing verbose log level configurations will be reset to the +default log level during update. diff --git a/ChangeLog b/ChangeLog index d4adc45..ae412d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... + * 4229 New Web GUI logging configuration... * 4143 FIX: Fixed possible log spam "MKAuthException: Invalid credentials" in web.log... * 4004 FIX: Fixed exception when viewing availability of BI aggregations... * 4144 FIX: Sidebar: Bottom of last snapin was not 100% visible

7 years, 8 months

4228 FIX Context links to HW/SW inventory views are only shown when useful

by Lars Michelsen

Module: check_mk Branch: master Commit: d8d08729020d425ab3f837b6fb88e94a0d5c0014 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8d08729020d42… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:35:22 2017 +0100 4228 FIX Context links to HW/SW inventory views are only shown when useful Change-Id: I886aad92a49220e80af3835ea4f4b55d21dc3403 --- .werks/4228 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4228 b/.werks/4228 new file mode 100644 index 0000000..809d1c1 --- /dev/null +++ b/.werks/4228 @@ -0,0 +1,9 @@ +Title: Context links to HW/SW inventory views are only shown when useful +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1484055312 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5e6ff1e..d4adc45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 4145 FIX: Fixed exception when setting output_format in wrong case * 4220 FIX: WATO folder filter: improve output of unknown folders * 4226 FIX: Custom inventory painters are now correctly loaded when declared with inventory_displayhints + * 4228 FIX: Context links to HW/SW inventory views are only shown when useful WATO: * 4142 New extended search dialog for rulesets and rules...

7 years, 8 months

4230 FIX db2_logsizes Removed debug output (regression since 1.4.0i3)

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d60b7c39bb1eca16abb92fda0072c9d0a396322 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d60b7c39bb1ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:37:39 2017 +0100 4230 FIX db2_logsizes Removed debug output (regression since 1.4.0i3) Change-Id: Ia7d42127e6cef370efa4f1e91e1f24321d21ff4c --- .werks/4230 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4230 b/.werks/4230 new file mode 100644 index 0000000..8b820a8 --- /dev/null +++ b/.werks/4230 @@ -0,0 +1,9 @@ +Title: db2_logsizes Removed debug output (regression since 1.4.0i3) +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1484055448 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ae412d1..8383e4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 4176 FIX: postfix_mailq_status: fixed wrong status handling * 4183 FIX: ibm_imm_fan: Fixed crash if fan speed is "unavailable"... * 4184 FIX: hivemanager_devices: Fixed bug if device is up for more than 1 year... + * 4230 FIX: db2_logsizes Removed debug output (regression since 1.4.0i3) Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings....

7 years, 8 months

Refactoring table.py: Moved functions around.

by Roland Halbig

Module: check_mk Branch: master Commit: 45b222c68566e5c9e859d27ce2e08ebbfb21d105 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45b222c68566e5… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 10:52:20 2017 +0100 Refactoring table.py: Moved functions around. Change-Id: I3c98ae9e0a323bd62e79bc1c64ca41d004c5c189 --- web/htdocs/table.py | 144 ++++++++++++++++++++++++++-------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index da107c8..5de76aa 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -129,77 +129,6 @@ def add_cell(title="", text="", css=None, help=None, colspan=None, sortable=True table["rows"][-1][0].append((htmlcode, css, colspan)) -def _filter_rows(rows, search_term): - filtered_rows = [] - for row, css, state, fixed in rows: - if state == "header" or fixed: - filtered_rows.append((row, css, state, fixed)) - continue # skip filtering of headers or fixed rows - - for cell_content, css_classes, colspan in row: - if search_term in cell_content.lower(): - filtered_rows.append((row, css, state, fixed)) - break # skip other cells when matched - return filtered_rows - - -def _sort_rows(rows, sort_col, sort_reverse): - - # remove and remind fixed rows, add to separate list - fixed_rows = [] - for index, row in enumerate(rows[:]): - if row[3] == True: - rows.remove(row) - fixed_rows.append((index, row)) - - # 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: - for index, row in fixed_rows: - rows.insert(index, row) - - return rows - - -def _write_csv(table, csv_separator): - - rows = table["rows"] - headers = table["headers"] - limit = table['limit'] - omit_headers = table["omit_headers"] - - num_rows_unlimited = len(rows) - num_cols = len(headers) - - # Apply limit after search / sorting etc. - if limit is not None: - rows = rows[:limit] - - def render_headers(): - html.write(csv_separator.join([html.strip_tags(header) or "" for (header, css, help, sortable) in headers]) + "\n") - - # If we have no group headers then paint the headers now - if not omit_headers and table["rows"] and table["rows"][0][2] != "header": - render_headers() - - odd = "even" - for nr, (row, css, state, fixed) in enumerate(rows): - html.write(csv_separator.join([html.strip_tags(cell_content) for cell_content, css_classes, colspan in row ])) - html.write("\n") - - def end(): global table finish_previous() @@ -223,7 +152,6 @@ def end(): table = None return - if do_csv: _write_csv(table, csv_separator) table = None @@ -427,3 +355,75 @@ def end(): table = None +def _write_csv(table, csv_separator): + + rows = table["rows"] + headers = table["headers"] + limit = table['limit'] + omit_headers = table["omit_headers"] + + num_rows_unlimited = len(rows) + num_cols = len(headers) + + # Apply limit after search / sorting etc. + if limit is not None: + rows = rows[:limit] + + def render_headers(): + html.write(csv_separator.join([html.strip_tags(header) or "" for (header, css, help, sortable) in headers]) + "\n") + + # If we have no group headers then paint the headers now + if not omit_headers and table["rows"] and table["rows"][0][2] != "header": + render_headers() + + odd = "even" + for nr, (row, css, state, fixed) in enumerate(rows): + html.write(csv_separator.join([html.strip_tags(cell_content) for cell_content, css_classes, colspan in row ])) + html.write("\n") + + + +def _filter_rows(rows, search_term): + filtered_rows = [] + for row, css, state, fixed in rows: + if state == "header" or fixed: + filtered_rows.append((row, css, state, fixed)) + continue # skip filtering of headers or fixed rows + + for cell_content, css_classes, colspan in row: + if search_term in cell_content.lower(): + filtered_rows.append((row, css, state, fixed)) + break # skip other cells when matched + return filtered_rows + + +def _sort_rows(rows, sort_col, sort_reverse): + + # remove and remind fixed rows, add to separate list + fixed_rows = [] + for index, row in enumerate(rows[:]): + if row[3] == True: + rows.remove(row) + fixed_rows.append((index, row)) + + # 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: + for index, row in fixed_rows: + rows.insert(index, row) + + return rows + +

7 years, 8 months

Refactoring table.py: Isolated sort and filter functions.

by Roland Halbig

Module: check_mk Branch: master Commit: d3de9e474c8eb845eb3da0fc7ee60b50abf88148 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3de9e474c8eb8… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 5 15:47:48 2017 +0100 Refactoring table.py: Isolated sort and filter functions. Change-Id: I16762356db788386c2f1abdd0f67d4ca1971162d --- tests/web/test_table.py | 141 ++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/table.py | 87 +++++++++++++++++------------- 2 files changed, 192 insertions(+), 36 deletions(-) diff --git a/tests/web/test_table.py b/tests/web/test_table.py new file mode 100644 index 0000000..7ce30e6 --- /dev/null +++ b/tests/web/test_table.py @@ -0,0 +1,141 @@ +#!/usr/bin/python +# call using +# > py.test -s -k test_html_generator.py + +# enable imports from web directory +from testlib import cmk_path +import sys, os +sys.path.insert(0, "%s/web/htdocs" % cmk_path()) + +# external imports +import re +from bs4 import BeautifulSoup as bs + +# internal imports +from htmllib import html +import __builtin__ +from htmllib import HTMLGenerator, HTMLCheck_MK +from tools import compare_html , gentest, compare_and_empty +from classes import DeprecatedRenderer + + +try: + from config.user import load_file, save_file +except: + load_file = lambda x, y: {} + save_file = lambda x, y: None + +import table + +import traceback + +class TableTest(html): + + written_text = '' + tag_counter = 0 + + def lowlevel_write(self, text): + + if re.match(r'.*\.close_\w+[(][)]', '\n'.join(traceback.format_stack()), re.DOTALL): + self.tag_counter -= 1 if self.tag_counter > 0 else 0 + self.written_text += " " * 4 * self.tag_counter + text + elif re.match(r'.*\.open_\w+[(]', '\n'.join(traceback.format_stack()), re.DOTALL): + self.written_text += " " * 4 * self.tag_counter + text + self.tag_counter += 1 + else: + self.written_text += " " * 4 * self.tag_counter + text + '' + + +def read_out_table(text): + # Get the contents of the table as a list of lists + data = [] + for row in bs(text, 'html5lib').findAll('tr'): + columns = row.findAll('th') + if not columns: + columns = row.findAll('td') + data.append([re.sub(r'\s', '', re.sub(r'<[^<]*>', '', cell.text)) for cell in columns]) + return data + + +def read_out_csv(text, separator): + # Get the contents of the table as a list of lists + data = [] + for row in text.split('\n'): + columns = row.split(separator) + data.append([re.sub(r'\s', '', re.sub(r'<[^<]*>', '', cell)) for cell in columns]) + data = [row for row in data if not all(cell == '' for cell in row)] + return data + + +def table_test_cubical(sortable, searchable, limit, output_format): + + html = TableTest() + __builtin__.html = html + + table_id = 0 + title = " TEST " + separator = ';' + + html.add_var('_%s_sort' % table_id, "1,0") + + rows = [ (i, i**3) for i in range(10) ] + header = ["Number", "Cubical"] + + table.begin(table_id = table_id, + title = title, + sortable = sortable, + searchable = searchable, + limit = limit, + output_format = output_format) + + for row in rows: + table.row() + for i in range(len(header)): + table.cell(_(header[i]), row[i]) + table.end() + + # write to file: This is part of the test! Look at the generated HTML! + filename = "./web/testtable_%s_%s_%s.html" % ("sortable" * sortable, "searchable" * searchable, limit) + text = html.written_text + with open(filename, "w") as html_file: + html_file.write(text) + + # Data assertions + assert output_format in ['html', 'csv'], 'Fetch is not yet implemented' + if output_format == 'html': + data = read_out_table(text) + assert data.pop(0) == header + elif output_format == 'csv': + data = read_out_csv(text, separator) + assert data.pop(0) == header, header + else: + assert False, 'Not yet implemented!' + + data = [ tuple(map(int, row)) for row in data ] + if limit is None: + limit = len(rows) + + assert len(data) == limit + assert data == rows[:limit] + + +def test_table(): + table_test_cubical(False, False, None, 'html') + + +def test_limit(): + table_test_cubical(False, False, 2, 'html') + + +def test_sortable(): + table_test_cubical(True, False, None, 'html') + + +def test_searchable(): + table_test_cubical(False, True, None, 'html') + + +def test_csv(): + table_test_cubical(False, False, None, 'csv') + + diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 4615b6b..b69e26b 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -128,6 +128,55 @@ def add_cell(title="", text="", css=None, help=None, colspan=None, sortable=True table["headers"].append((title, css, help, sortable)) table["rows"][-1][0].append((htmlcode, css, colspan)) + +def _filter_rows(rows, search_term): + filtered_rows = [] + for row, css, state, fixed in rows: + if state == "header" or fixed: + filtered_rows.append((row, css, state, fixed)) + continue # skip filtering of headers or fixed rows + + for cell_content, css_classes, colspan in row: + if search_term in cell_content.lower(): + filtered_rows.append((row, css, state, fixed)) + break # skip other cells when matched + return filtered_rows + + +def _sort_rows(rows, sort_col, sort_reverse): + + # remove and remind fixed rows, add to separate list + fixed_rows = [] + for index, row in enumerate(rows[:]): + if row[3] == True: + rows.remove(row) + fixed_rows.append((index, row)) + + # 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: + for index, row in fixed_rows: + rows.insert(index, row) + + return rows + + + + + + def end(): global table finish_previous() @@ -194,17 +243,7 @@ def end(): if search_term: html.set_var('_%s_search' % table_id, search_term) table_opts['search'] = search_term # persist - filtered_rows = [] - for row, css, state, fixed in rows: - if state == "header" or fixed: - filtered_rows.append((row, css, state, fixed)) - continue # skip filtering of headers or fixed rows - - for cell_content, css_classes, colspan in row: - if search_term in cell_content.lower(): - filtered_rows.append((row, css, state, fixed)) - break # skip other cells when matched - rows = filtered_rows + rows = _filter_rows(rows, search_term) if html.var('_%s_reset_sorting' % table_id): html.del_var('_%s_sort' % table_id) @@ -218,31 +257,7 @@ def end(): html.set_var('_%s_sort' % table_id, sort) table_opts['sort'] = sort # persist sort_col, sort_reverse = map(int, sort.split(',', 1)) - - # remove and remind fixed rows, add to separate list - fixed_rows = [] - for index, row in enumerate(rows[:]): - if row[3] == True: - rows.remove(row) - fixed_rows.append((index, row)) - - # 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: - for index, row in fixed_rows: - rows.insert(index, row) + rows = _sort_rows(rows, sort_col, sort_reverse) num_rows_unlimited = len(rows) num_cols = len(table["headers"])

7 years, 8 months

Repaired table test.

by Roland Halbig

Module: check_mk Branch: master Commit: 74f72daa28ef4996d576137f33499a0229685644 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74f72daa28ef49… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 10 10:48:11 2017 +0100 Repaired table test. Change-Id: I262c4a1ee55e76a52a6547fe0522cbc4dde35265 --- tests/web/test_table.py | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/web/test_table.py b/tests/web/test_table.py index 7ce30e6..1590175 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -19,15 +19,12 @@ from tools import compare_html , gentest, compare_and_empty from classes import DeprecatedRenderer -try: - from config.user import load_file, save_file -except: - load_file = lambda x, y: {} - save_file = lambda x, y: None - +os.environ["OMD_SITE"] = "heute" +import config import table - import traceback +def save_user_mock(name, data, user, unlock=False): + pass class TableTest(html): @@ -46,6 +43,31 @@ class TableTest(html): self.written_text += " " * 4 * self.tag_counter + text + '' +def test_table(monkeypatch): + monkeypatch.setattr(config, "save_user_file", save_user_mock) + table_test_cubical(False, False, None, 'html') + + +def test_limit(monkeypatch): + monkeypatch.setattr(config, "save_user_file", save_user_mock) + table_test_cubical(False, False, 2, 'html') + + +def test_sortable(monkeypatch): + monkeypatch.setattr(config, "save_user_file", save_user_mock) + table_test_cubical(True, False, None, 'html') + + +def test_searchable(monkeypatch): + monkeypatch.setattr(config, "save_user_file", save_user_mock) + table_test_cubical(False, True, None, 'html') + + +def test_csv(monkeypatch): + monkeypatch.setattr(config, "save_user_file", save_user_mock) + table_test_cubical(False, False, None, 'csv') + + def read_out_table(text): # Get the contents of the table as a list of lists data = [] @@ -117,25 +139,3 @@ def table_test_cubical(sortable, searchable, limit, output_format): assert len(data) == limit assert data == rows[:limit] - - -def test_table(): - table_test_cubical(False, False, None, 'html') - - -def test_limit(): - table_test_cubical(False, False, 2, 'html') - - -def test_sortable(): - table_test_cubical(True, False, None, 'html') - - -def test_searchable(): - table_test_cubical(False, True, None, 'html') - - -def test_csv(): - table_test_cubical(False, False, None, 'csv') - -

7 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017