Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 22cb5c5e18bef9563d1700f612219be9882556a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22cb5c5e18bef9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 2 08:44:02 2016 +0100 Login: Fixed wrong rendering of password field --- web/htdocs/login.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 5821b6e..70e86bd 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -429,7 +429,7 @@ def normal_login_page(called_directly = True): html.write('<label id="label_user" class="legend" for="_username">%s:</label><br />\n' % _('Username')) html.text_input("_username", id_="input_user") html.write('<label id="label_pass" class="legend" for="_password">%s:</label><br />\n' % _('Password')) - html.password_input("_password", id="input_pass", size=None) + html.password_input("_password", id_="input_pass", size=None) if html.has_user_errors(): html.write('<div id="login_error">')

7 years, 7 months

3998 FIX agent_netapp / netapp_api_if: improved mechanism to collect interface infos. fixes invalid if-speed

by Andreas Boesl

Module: check_mk Branch: master Commit: 5d07bc69afb2790a84a65074086f65eb5bcfa251 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d07bc69afb279… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 1 12:51:24 2016 +0100 3998 FIX agent_netapp / netapp_api_if: improved mechanism to collect interface infos. fixes invalid if-speed The speed of most interface was not correctly determined. This has been fixed by the new agent. You need to do a new service discovery of the netapp systems. Otherwise the existing netapp_api_if checks will raise a warning, stating that the speed differs. --- .werks/3998 | 12 ++++++++++++ ChangeLog | 2 ++ agents/special/agent_netapp | 44 ++++++++++++++++++++++++++++++-------------- 3 files changed, 44 insertions(+), 14 deletions(-) diff --git a/.werks/3998 b/.werks/3998 new file mode 100644 index 0000000..1e03a22 --- /dev/null +++ b/.werks/3998 @@ -0,0 +1,12 @@ +Title: agent_netapp / netapp_api_if: improved mechanism to collect interface infos. fixes invalid if-speed +Level: 1 +Component: checks +Compatible: incomp +Version: 1.4.0i3 +Date: 1480592904 +Class: fix + +The speed of most interface was not correctly determined. +This has been fixed by the new agent. You need to do a new service +discovery of the netapp systems. Otherwise the existing netapp_api_if +checks will raise a warning, stating that the speed differs. diff --git a/ChangeLog b/ChangeLog index 0abbb95..b59d44e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,8 @@ * 3943 FIX: ntp.time: fixed parameters in discovered checks... * 3994 FIX: windows agent: fixed memory and file handle leak when using windows eventlog... * 4081 FIX: dell_powerconnect_cpu: Fixed broken metrics + * 3998 FIX: agent_netapp / netapp_api_if: improved mechanism to collect interface infos. fixes invalid if-speed... + NOTE: Please refer to the migration notes! Multisite: * 4070 Added a painter for the service check period diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 2f1d3a4..f6f9c0a 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -890,28 +890,44 @@ try: if interfaces: print "<<<netapp_api_if:sep(9)>>>" - port_dict = create_dict(ports, custom_key = ["node", "port"], is_counter = False) - if_dict = create_dict(if_counters, custom_key = "instance_name") - map_if_nodeport_to_name = {} - for key, values in if_dict.items(): - map_if_nodeport_to_name[(values["node_name"], values["current_port"])] = key - - mod_port_dict = {} - for key, values in port_dict.items(): - port_key = map_if_nodeport_to_name.get((values["node"], values["port"])) - if port_key: - mod_port_dict[port_key] = values + extra_info = {} + interface_dict = create_dict(interfaces, custom_key = "interface-name", is_counter = False) + port_dict = create_dict(ports, custom_key = ["node", "port"], is_counter = False) + if_counters_dict = create_dict(if_counters, custom_key = "instance_name") + # Process counters # NetApp clustermode reports sent_data instead of send_data.. - for key, values in if_dict.items(): + for key, values in if_counters_dict.items(): for old, new in [ ("sent_data", "send_data"), ("sent_packet", "send_packet"), ("sent_errors", "send_errors") ]: values[new] = values[old] del values[old] - extra_info = if_dict - for key, values in mod_port_dict.items(): + extra_counter_info = {} + for key, values in if_counters_dict.items(): + if ":" in key: + vserver, name = key.split(":", 1) + else: + name = key + extra_counter_info[name] = values + + # Process ports + extra_port_info = {} + for the_port, port_values in port_dict.items(): + port_name = port_values.get("port") + port_node = port_values.get("node") + + node, port = the_port.split("|") + for if_key, if_values in interface_dict.items(): + port = if_values.get("current-port") + node = if_values.get("current-node") + if port_name == port and port_node == node: + extra_port_info[if_key] = port_values + + extra_info = extra_counter_info + for key, values in extra_port_info.items(): + extra_info.setdefault(key, {}) extra_info[key].update(values) print format_config(interfaces, "interface", "interface-name",

7 years, 7 months

netapp_api_luns: changed configuration of 'ignore used space' parameter

by Andreas Boesl

Module: check_mk Branch: master Commit: cf937e1bb96e1c39f9a2ab92646705d1e1106569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf937e1bb96e1c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 1 13:19:21 2016 +0100 netapp_api_luns: changed configuration of 'ignore used space' parameter --- checks/netapp_api_luns | 3 +- web/plugins/wato/check_parameters.py | 140 +++++++++++++++++------------------ 2 files changed, 70 insertions(+), 73 deletions(-) diff --git a/checks/netapp_api_luns b/checks/netapp_api_luns index 285166a..df040f2 100644 --- a/checks/netapp_api_luns +++ b/checks/netapp_api_luns @@ -54,12 +54,11 @@ def check_netapp_api_luns(item, params, parsed): size_total = int(lun.get("size")) / mega size_avail = size_total - (int(lun.get("size-used")) / mega) - if params == True: + if params.get("ignore_levels"): yield 0, "Total size: %s, Used space is ignored" % get_bytes_human_readable(size_total) else: yield df_check_filesystem_single(g_hostname, item, size_total, size_avail, 0, None, None, params) - def netapp_api_luns_item(name): return name.rsplit("/", 1)[-1] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 63f2243..7acf222 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -10101,77 +10101,75 @@ register_check_parameters( subgroup_storage, "netapp_luns", _("NetApp LUNs"), - Alternative( - elements = [ - FixedValue( - title = _("Ignore used space"), - help = _("Some luns, e.g. jfs formatted, tend to report incorrect used space values"), - label = _("Ignore used space"), - value = True, - totext = "", - ), - Dictionary( - title = _("Configure levels for used space"), - elements = [ - ("levels", - Alternative( - title = _("Levels for LUN"), - show_alternative_title = True, - default_value = (80.0, 90.0), - match = match_dual_level_type, - elements = [ - get_free_used_dynamic_valuespec("free", "LUN"), - Transform( - get_free_used_dynamic_valuespec("used", "LUN", default_value = (20.0, 10.0)), - allow_empty = False, - forth = transform_filesystem_free, - back = transform_filesystem_free, - ) - ] - ) - ), - ( "trend_range", - Optional( - Integer( - title = _("Time Range for lun filesystem trend computation"), - default_value = 24, - minvalue = 1, - unit= _("hours")), - title = _("Trend computation"), - label = _("Enable trend computation"))), - ( "trend_mb", - Tuple( - title = _("Levels on trends in MB per time range"), - elements = [ - Integer(title = _("Warning at"), unit = _("MB / range"), default_value = 100), - Integer(title = _("Critical at"), unit = _("MB / range"), default_value = 200) - ])), - ( "trend_perc", - Tuple( - title = _("Levels for the percentual growth per time range"), - elements = [ - Percentage(title = _("Warning at"), unit = _("% / range"), default_value = 5,), - Percentage(title = _("Critical at"), unit = _("% / range"), default_value = 10,), - ])), - ( "trend_timeleft", - Tuple( - title = _("Levels on the time left until the lun filesystem gets full"), - elements = [ - Integer(title = _("Warning if below"), unit = _("hours"), default_value = 12,), - Integer(title = _("Critical if below"), unit = _("hours"), default_value = 6, ), - ])), - ( "trend_showtimeleft", - Checkbox( title = _("Display time left in check output"), label = _("Enable"), - help = _("Normally, the time left until the lun filesystem is full is only displayed when " - "the configured levels have been breached. If you set this option " - "the check always reports this information")) - ), - ( "trend_perfdata", - Checkbox( - title = _("Trend performance data"), - label = _("Enable generation of performance data from trends"))), - ] - ) + Dictionary( + title = _("Configure levels for used space"), + elements = [ + ("ignore_levels", + FixedValue( + title = _("Ignore used space (this option disables any other options)"), + help = _("Some luns, e.g. jfs formatted, tend to report incorrect used space values"), + label = _("Ignore used space"), + value = True, + totext = "",) + ), + ("levels", + Alternative( + title = _("Levels for LUN"), + show_alternative_title = True, + default_value = (80.0, 90.0), + match = match_dual_level_type, + elements = [ + get_free_used_dynamic_valuespec("free", "LUN"), + Transform( + get_free_used_dynamic_valuespec("used", "LUN", default_value = (20.0, 10.0)), + allow_empty = False, + forth = transform_filesystem_free, + back = transform_filesystem_free, + ) + ] + ) + ), + ( "trend_range", + Optional( + Integer( + title = _("Time Range for lun filesystem trend computation"), + default_value = 24, + minvalue = 1, + unit= _("hours")), + title = _("Trend computation"), + label = _("Enable trend computation"))), + ( "trend_mb", + Tuple( + title = _("Levels on trends in MB per time range"), + elements = [ + Integer(title = _("Warning at"), unit = _("MB / range"), default_value = 100), + Integer(title = _("Critical at"), unit = _("MB / range"), default_value = 200) + ])), + ( "trend_perc", + Tuple( + title = _("Levels for the percentual growth per time range"), + elements = [ + Percentage(title = _("Warning at"), unit = _("% / range"), default_value = 5,), + Percentage(title = _("Critical at"), unit = _("% / range"), default_value = 10,), + ])), + ( "trend_timeleft", + Tuple( + title = _("Levels on the time left until the lun filesystem gets full"), + elements = [ + Integer(title = _("Warning if below"), unit = _("hours"), default_value = 12,), + Integer(title = _("Critical if below"), unit = _("hours"), default_value = 6, ), + ])), + ( "trend_showtimeleft", + Checkbox( title = _("Display time left in check output"), label = _("Enable"), + help = _("Normally, the time left until the lun filesystem is full is only displayed when " + "the configured levels have been breached. If you set this option " + "the check always reports this information")) + ), + ( "trend_perfdata", + Checkbox( + title = _("Trend performance data"), + label = _("Enable generation of performance data from trends")) + ), ] ), TextAscii(title = _("LUN name")),

7 years, 7 months

Fixed broken links in WATO rule editor help text

by Lars Michelsen

Module: check_mk Branch: master Commit: f33323ef6298ba646a32bddacd3a80ecbe2e91e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f33323ef6298ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 13:09:54 2016 +0100 Fixed broken links in WATO rule editor help text --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c521b9b..5fb22d8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13175,7 +13175,7 @@ def mode_edit_rule(phase, new = False): (rulespec["title"], new_rule_folder.alias_path())) if rulespec.get("help"): - html.div(rulespec["help"], class_="info") + html.div(HTML(rulespec["help"]), class_="info") html.begin_form("rule_editor", method="POST")

7 years, 7 months

Refactoring htmllib: adjusted test files.

by Roland Halbig

Module: check_mk Branch: master Commit: 7c98addc46818b0674d97aa158f27d42b2ee8660 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c98addc46818b… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:54:28 2016 +0100 Refactoring htmllib: adjusted test files. --- tests/web/classes.py | 175 +++++++++++++++++++++++++ tests/web/test_html.py | 19 ++- tests/web/test_htmllib_integration.py | 240 ++++++++++++++++++++++++++++------ tests/web/tools.py | 4 +- 4 files changed, 392 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7c98addc46…

7 years, 7 months

Enhanced error message output in visuals.

by Roland Halbig

Module: check_mk Branch: master Commit: c36a645d51d7d6d069e0ca08f30859e70e346117 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c36a645d51d7d6… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:52:13 2016 +0100 Enhanced error message output in visuals. --- web/htdocs/visuals.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e903a6e..5fcfe89 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import os, copy +import os, copy, sys try: import simplejson as json @@ -832,19 +832,23 @@ def declare_filter(sort_index, f, comment = None): def show_filter(f): - html.write('<div class="floatfilter %s">' % (f.double_height() and "double" or "single")) - html.write('<div class=legend>%s</div>' % html.attrencode(f.title)) - html.write('<div class=content>') + html.open_div(class_=["floatfilter", "double" if f.double_height() else "single"]) + html.div(f.title, class_="legend") + html.open_div(class_="content") try: + #TODO: Plug context html.plug() f.display() + # TODO: html.unplug() except Exception, e: - if config.debug: - raise - html.icon(_("This filter cannot be displayed"), "alert") - html.write("%s" % e) - - html.write("</div>") - html.write("</div>") + #TODO: html.plugged_text = '' + #TODO: html.unplug() + tb = sys.exc_info()[2] + tbs = ['Traceback (most recent call last):\n'] + tbs += traceback.format_tb(tb) + html.icon(_("This filter cannot be displayed") + " (%s)\n%s" % (e, "".join(tbs)), "alert") + html.write(_("This filter cannot be displayed")) + html.close_div() + html.close_div() # Base class for all filters

7 years, 7 months

htmllib: Refactored radiobuttons.

by Roland Halbig

Module: check_mk Branch: master Commit: 4ae5278c217c8c17e5852b8739a15c6d624d045f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ae5278c217c8c… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:08:54 2016 +0100 htmllib: Refactored radiobuttons. --- web/htdocs/htmllib.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index aba534d..1f9bd44 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1920,33 +1920,30 @@ class html(DeprecationWrapper): def begin_radio_group(self, horizontal=False): if self.mobile: - if horizontal: - add = 'data-type="horizontal" ' - else: - add = '' - self.write('<fieldset %s data-role="controlgroup">' % add) + attrs = {'data-type' : "horizontal" if horizontal else None, + 'data-role' : "controlgroup"} + self.write(self._render_opening_tag("fieldset", **attrs)) def end_radio_group(self): if self.mobile: - self.write('</fieldset>') + self.write(self._render_closing_tag("fieldset")) def radiobutton(self, varname, value, checked, label): + # Model + self.form_vars.append(varname) + + # Controller if self.has_var(varname): checked = self.var(varname) == value - checked_text = checked and " checked" or "" - if label: - id = "rb_%s_%s" % (varname, self.attrencode(value)) - idtxt = ' id="%s"' % id - else: - idtxt = "" - self.write("<input type=radio name=%s value=\"%s\"%s%s>\n" % - (varname, self.attrencode(value), checked_text, idtxt)) - if label: - self.write('<label for="%s">%s</label>\n' % (id, label)) - self.form_vars.append(varname) + # View + id_="rb_%s_%s" % (varname, value) if label else None + self.input(name=varname, type_="radio", value = value, + checked="" if checked else None, id_=id_) + if label: + self.label(label, for_=id_) def begin_checkbox_group(self, horizonal=False): self.begin_radio_group(horizonal)

7 years, 7 months

Refactoring: Changed call of text_input in login.py.

by Roland Halbig

Module: check_mk Branch: master Commit: dc25d41774edeae5cbd0a39576ea56d713b84831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc25d41774edea… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 12:51:16 2016 +0100 Refactoring: Changed call of text_input in login.py. --- web/htdocs/login.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 49380bd..5821b6e 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -427,7 +427,7 @@ def normal_login_page(called_directly = True): html.hidden_field('_login', '1') html.hidden_field('_origtarget', html.attrencode(origtarget)) html.write('<label id="label_user" class="legend" for="_username">%s:</label><br />\n' % _('Username')) - html.text_input("_username", id="input_user") + html.text_input("_username", id_="input_user") html.write('<label id="label_pass" class="legend" for="_password">%s:</label><br />\n' % _('Password')) html.password_input("_password", id="input_pass", size=None)

7 years, 7 months

htmllib: Refactored HTML class.

by Roland Halbig

Module: check_mk Branch: master Commit: bb06d0d4eca3ec9b4d8887103f8bad4b4a02f42d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb06d0d4eca3ec… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 11:50:23 2016 +0100 htmllib: Refactored HTML class. --- web/htdocs/htmllib.py | 71 ++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d8ccdc7..9f8bbde 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -108,12 +108,9 @@ class RequestTimeout(MKException): class HTML(object): - def __init__(self, value): + def __init__(self, value = ''): super(HTML, self).__init__() - if isinstance(value, HTML): - self.value = value.value - else: - self.value = value + self.value = "%s" % value def __str__(self): @@ -129,64 +126,43 @@ class HTML(object): def __add__(self, other): - if isinstance(other, HTML): - return self.value + other.value - else: - return self.value + other + return HTML("%s%s" % (self.value, other)) + + + def __iadd__(self, other): + return self.__add__(other) def __radd__(self, other): - if isinstance(other, HTML): - return other.value + self.value - else: - return other + self.value + return HTML("%s%s" % (other, self.value)) - def __iadd__(self, other): - self.value = self.__add__(other) - return self + def join(self, iterable): + return HTML(''.join(map(lambda x: "%s" % x, iterable))) def __lt__(self, other): - if isinstance(other, HTML): - return self.value < other.value - else: - return self.value < other + return self.value < "%s" % other def __le__(self, other): - if isinstance(other, HTML): - return self.value <= other.value - else: - return self.value <= other + return self.value <= "%s" % other def __eq__(self, other): - if isinstance(other, HTML): - return self.value == other.value - else: - return self.value == other + return self.value == "%s" % other def __ne__(self, other): - if isinstance(other, HTML): - return self.value != other.value - else: - return self.value != other + return self.value != "%s" % other def __gt__(self, other): - if isinstance(other, HTML): - return self.value > other.value - else: - return self.value > other + return self.value > "%s" % other def __ge__(self, other): - if isinstance(other, HTML): - return self.value >= other.value - else: - return self.value >= other + return self.value >= "%s" % other def __len__(self): @@ -209,6 +185,21 @@ class HTML(object): return self.value.index(item) + def lstrip(self, stripstr): + self.value = self.value.lstrip(stripstr) + return self + + + def rstrip(self, stripstr): + self.value = self.value.rstrip(stripstr) + return self + + + def strip(self, stripstr): + self.value = self.value.strip(stripstr) + return self + + __builtin__.HTML = HTML

7 years, 7 months

htmllib: Made shure rendering returns HTML object.

by Roland Halbig

Module: check_mk Branch: master Commit: 88f42fe71d4f0025f4dc3c2a747ad8b7ee6191bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88f42fe71d4f00… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 1 11:55:38 2016 +0100 htmllib: Made shure rendering returns HTML object. --- web/htdocs/htmllib.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9f8bbde..a88c9b6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -353,11 +353,11 @@ class HTMLGenerator(OutputFunnel): # these tags can be called by their tag names, e.g. 'self.title(content)' _shortcut_tags = set(['title', 'h1', 'h2', 'h3', 'th', 'tr', 'td', 'center', 'pre', 'style', 'iframe',\ - 'div', 'p', 'span', 'canvas', 'strong', 'sub', 'tt', 'u', 'i', 'b']) + 'div', 'p', 'span', 'canvas', 'strong', 'sub', 'tt', 'u', 'i', 'b', 'x', 'option']) # these tags can be called by open_name(), close_name() and render_name(), e.g. 'self.open_html()' _tag_names = set(['html', 'head', 'body', 'header', 'footer', 'a', 'b',\ - 'script', 'form', 'button', 'p', 'select',\ + 'script', 'form', 'button', 'p', 'select', 'fieldset',\ 'table', 'tbody', 'row', 'ul', 'li', 'br', 'nobr', 'input', 'span']) # Of course all shortcut tags can be used as well. @@ -525,12 +525,14 @@ class HTMLGenerator(OutputFunnel): def _render_attributes(self, **attrs): # TODO: REMOVE AFTER REFACTORING IS DONE!! - for key in attrs: - assert key.rstrip('_') in ['class', 'id', 'src', 'type', 'name',\ - 'onclick', 'onsubmit', 'onmouseover', 'onmouseout', 'onfocus', 'value', \ - 'content', 'href', 'http-equiv', 'rel', 'for', 'title', 'target',\ - 'align', 'valign', 'style', 'width', 'height', 'colspan', 'data-role',\ - 'cellspacing', 'cellpadding', 'border', 'allowTransparency', 'frameborder'], key + if self.testing_mode: + for key in attrs: + assert key.rstrip('_') in ['class', 'id', 'src', 'type', 'name',\ + 'onclick', 'ondblclick', 'onsubmit', 'onmouseover', 'onmouseout', 'onfocus', 'onkeydown', 'onchange',\ + 'size', 'autocomplete', 'readonly', 'value', 'checked','rows', 'cols',\ + 'content', 'href', 'http-equiv', 'rel', 'for', 'title', 'target','multiple',\ + 'align', 'valign', 'style', 'width', 'height', 'colspan', 'data-type', 'data-role','selected',\ + 'cellspacing', 'cellpadding', 'border', 'allowTransparency', 'frameborder'], key for k, v in attrs.iteritems(): if v is None: continue @@ -551,18 +553,17 @@ class HTMLGenerator(OutputFunnel): 'class', 'id', 'for' or 'type' using a trailing underscore (e.g. 'class_' or 'id_'). """ #self.indent_level += self.indent if not attrs: - return "%s<%s%s>" % (' ' * (self.indent_level - self.indent),\ - tag_name,\ - ' /' if close_tag else '') + return HTML("%s<%s%s>" % (' ' * (self.indent_level - self.indent),\ + tag_name, ' /' if close_tag else '')) else: - return "%s<%s%s%s>" % (' ' * (self.indent_level - self.indent),\ + return HTML("%s<%s%s%s>" % (' ' * (self.indent_level - self.indent),\ tag_name, ''.join(self._render_attributes(**attrs)),\ - ' /' if close_tag else '') + ' /' if close_tag else '')) def _render_closing_tag(self, tag_name): #self.indent_level -= self.indent if self.indent_level < 0 else 0 - return "%s</%s>" % (' ' * self.indent_level, tag_name) + return HTML("%s</%s>" % (' ' * self.indent_level, tag_name)) def _render_content_tag(self, tag_name, tag_content, **attrs): @@ -577,7 +578,7 @@ class HTMLGenerator(OutputFunnel): self._escape_text(tag_content),\ tag_name) #self.indent_level -= 1 - return tag + return HTML(tag) # does not escape the script content

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016