Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: fixed invalid name of checkman

by Andreas Boesl

Module: check_mk Branch: master Commit: 57bcf19e548924b7c0b32690053b9847939d5f10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57bcf19e548924… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 12 12:51:17 2013 +0200 fixed invalid name of checkman --- checkman/{cisco_wlc_connections => cisco_wlc_clients} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/cisco_wlc_connections b/checkman/cisco_wlc_clients similarity index 100% rename from checkman/cisco_wlc_connections rename to checkman/cisco_wlc_clients

11 years, 1 month

Check_MK Git: check_mk: New check: etherbox (messpc), supported sensors:

by Andreas Boesl

Module: check_mk Branch: master Commit: 1ae15dc1d1698e29e069b87d6069c349d3e0d339 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ae15dc1d1698e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 12 12:43:41 2013 +0200 New check: etherbox (messpc), supported sensors: temperature, humidity, smoke and switch contact --- ChangeLog | 3 + checkman/etherbox.humidity | 24 +++ checkman/etherbox.smoke | 19 +++ checkman/etherbox.switch | 23 +++ checkman/etherbox.temp | 25 ++++ checks/etherbox | 206 ++++++++++++++++++++++++++ pnp-templates/check_mk-etherbox.humidity.php | 44 ++++++ 7 files changed, 344 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1ae15dc1d1…

11 years, 1 month

Check_MK Git: check_mk: The check group akcp_humidity has been reduced to

by Andreas Boesl

Module: check_mk Branch: master Commit: 4f4a55b9b2581efaf59fe1c33c4907a2a9ff2c90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f4a55b9b2581e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 12 12:39:13 2013 +0200 The check group akcp_humidity has been reduced to its basic type humidity. The check akcp_sensor_humidity has been changed accordingly. Noted in migration notes, too --- checks/akcp_sensor_humidity | 2 +- web/plugins/wato/check_parameters.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/checks/akcp_sensor_humidity b/checks/akcp_sensor_humidity index b91ef4e..9f373ae 100644 --- a/checks/akcp_sensor_humidity +++ b/checks/akcp_sensor_humidity @@ -86,5 +86,5 @@ check_info["akcp_sensor_humidity"] = { ), 'snmp_scan_function': \ lambda oid: "AKCP" in oid(".1.3.6.1.4.1.3854.1.1.6.0") and "sensorProbe" in oid(".1.3.6.1.4.1.3854.1.1.8.0"), - 'group': 'akcp_humidity', + 'group': 'humidity', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 29473cc..8d1a6fc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2019,11 +2019,10 @@ register_check_parameters( register_check_parameters( subgroup_environment, - "akcp_humidity", - _("AKCP Humidity Levels"), + "humidity", + _("Humidity Levels"), Tuple( - help = _("This Rulset sets the threshold limits for humidity sensors attached to " - "AKCP Sensor Probe "), + help = _("This Rulset sets the threshold limits for humidity sensors"), elements = [ Integer(title = _("Critical if below"), unit="%" ), Integer(title = _("Warning if below"), unit="%" ),

11 years, 1 month

Check_MK Git: check_mk: Added multiple host mode to check_form_submit active check

by Lars Michelsen

Module: check_mk Branch: master Commit: c4b450049f8c963587de6dcc78aa9cc9a3ea52fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b450049f8c96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 12 12:03:22 2013 +0200 Added multiple host mode to check_form_submit active check --- doc/treasures/active_checks/check_form_submit | 141 +++++++++++++++++-------- 1 file changed, 96 insertions(+), 45 deletions(-) diff --git a/doc/treasures/active_checks/check_form_submit b/doc/treasures/active_checks/check_form_submit index ac6c23a..dcd3858 100755 --- a/doc/treasures/active_checks/check_form_submit +++ b/doc/treasures/active_checks/check_form_submit @@ -54,9 +54,12 @@ def usage(): sys.stderr.write(""" USAGE: check_form_submit -I <HOSTADDRESS> [-u <URI>] [-p <PORT>] [-s] [-H <VHOST>] [-f <FORMNAME>] [-q <QUERYPARAMS>] [-e <REGEX>] [-t <TIMEOUT> ] + [-n <WARN>,<CRIT>] OPTIONS: - -I HOSTADDRESS The IP address or hostname of the host to contact + -I HOSTADDRESS The IP address or hostname of the host to contact. + This option can be given multiple times to contact + several hosts with the same query. -u URI The URL string to query, "/" by default -p PORT TCP Port to communicate with -s Encrypt the connection using SSL @@ -67,12 +70,14 @@ OPTIONS: -e REGEX Expected regular expression in the HTML response after form submission -t TIMEOUT HTTP connect timeout in seconds + -n WARN,CRIT Is only used in "multiple" mode. Number of successful + responses to result in a WARN and/or CRIT state -d Enable debug mode -h, --help Show this help message and exit """) -short_options = 'I:u:p:H:f:q:e:t:sd' +short_options = 'I:u:p:H:f:q:e:t:n:sd' try: opts, args = getopt.getopt(sys.argv[1:], short_options) @@ -80,7 +85,8 @@ except getopt.GetoptError, err: sys.stderr.write("%s\n" % err) sys.exit(1) -host = None +hosts = [] +multiple = False uri = '/' port = 80 ssl = False @@ -90,13 +96,15 @@ params = {} expect_regex = None opt_debug = False timeout = 10 # seconds +num_warn = None +num_crit = None for o,a in opts: if o == '-h': usage() sys.exit(0) elif o == '-I': - host = a + hosts.append(a) elif o == '-u': uri = a elif o == '-p': @@ -113,14 +121,22 @@ for o,a in opts: expect_regex = a elif o == '-t': timeout = int(a) + elif o == '-n': + if ',' in a: + num_warn, num_crit = map(int, a.split(',', 1)) + else: + num_warn = int(a) elif o == '-d': opt_debug = True -if host is None: +if not hosts: sys.stderr.write('Please provide the host to query via -I <HOSTADDRESS>.\n') usage() sys.exit(1) +if len(hosts) > 1: + multiple = True + if not ssl and port == 443: ssl = True @@ -128,6 +144,16 @@ def debug(s): if opt_debug: sys.stderr.write('%s\n' % s) +class HostResult(): + def __init__(self, result): + self.result = result + +def new_state(rc, s): + if multiple: + raise HostResult((rc, s)) + else: + bail_out(rc, s) + def bail_out(rc, s): stxt = ['OK', 'WARN', 'CRIT', 'UNKN'][rc] sys.stdout.write('%s - %s\n' % (stxt, s)) @@ -139,11 +165,9 @@ if (proto == 'http' and port == 80) or (proto == 'https' and port == 443): else: portspec = ':%d' % port -def get_full_uri(uri): +def get_full_uri(host, uri): return '%s://%s%s%s' % (proto, host, portspec, uri) -url = get_full_uri(uri) - def init_http(): global g_cookies, g_opener import urllib2 @@ -173,9 +197,9 @@ def open_url(url, method = 'GET', data = None): debug('GET %s' % url) fd = g_opener.open(url, timeout = timeout) # GET except urllib2.HTTPError, e: - bail_out(2, 'Unable to open %s: [%d] %s' % (url, e.code, e.reason)) + new_state(2, 'Unable to open %s: [%d] %s' % (url, e.code, e.reason)) except urllib2.URLError, e: - bail_out(2, 'Unable to open %s: %s' % (url, e.reason)) + new_state(2, 'Unable to open %s: %s' % (url, e.reason)) real_url = fd.geturl() code = fd.getcode() content = fd.read() @@ -223,23 +247,23 @@ def parse_form(content): num_forms = len(forms) if num_forms == 0: - bail_out(2, 'Found no form element in HTML code') + new_state(2, 'Found no form element in HTML code') elif num_forms == 1 and form_name is not None and form_name in forms: - bail_out(2, 'Found one form with name "%s" but expected name "%s"' % + new_state(2, 'Found one form with name "%s" but expected name "%s"' % (forms.keys()[0], form_name)) elif num_forms == 1: form = forms[forms.keys()[0]] elif form_name is None: - bail_out(2, 'No form name provided but found multiple forms (Names: %s)' % + new_state(2, 'No form name provided but found multiple forms (Names: %s)' % (', '.join([ f for f in forms.keys() ]))) else: form = forms.get(form_name) if form is None: - bail_out(2, 'Found no form with name "%s" (Available: %s)' % + new_state(2, 'Found no form with name "%s" (Available: %s)' % (form_name, ', '.join([ f for f in forms.keys() ]))) return form @@ -252,37 +276,64 @@ def update_form_vars(form): try: init_http() - # Perform first HTTP request to fetch the page containing the form(s) - code, real_url, content = open_url(url) - - form = parse_form(content) - - # Get all fields and prefilled values from that form - # Put the values of the given query params in these forms - form_vars = update_form_vars(form) - - # Issue a HTTP request with those parameters - # Extract the form target and method - method = form['attrs'].get('method', 'GET') - target = form['attrs'].get('action', real_url) - if target[0] == '/': - # target is given as absolute path, relative to hostname - target = get_full_uri(target) - elif target[0] != '': - # relative URL - target = '%s/%s' % ('/'.join(real_url.rstrip('/').split('/')[:-1]), target) - - code, real_url, content = open_url(target, method, form_vars) - - # If a expect_regex is given, check wether or not it is present in the response - if expect_regex is not None: - matches = re.search(expect_regex, content) - if matches is not None: - bail_out(0, 'Found expected regex "%s" in form response' % expect_regex) - else: - bail_out(2, 'Expected regex "%s" could not be found in form response' % expect_regex) - else: - bail_out(0, 'Form has been submitted') + states = {} + for host in hosts: + try: + # Perform first HTTP request to fetch the page containing the form(s) + url = get_full_uri(host, uri) + code, real_url, content = open_url(url) + + form = parse_form(content) + + # Get all fields and prefilled values from that form + # Put the values of the given query params in these forms + form_vars = update_form_vars(form) + + # Issue a HTTP request with those parameters + # Extract the form target and method + method = form['attrs'].get('method', 'GET') + target = form['attrs'].get('action', real_url) + if target[0] == '/': + # target is given as absolute path, relative to hostname + target = get_full_uri(host, target) + elif target[0] != '': + # relative URL + target = '%s/%s' % ('/'.join(real_url.rstrip('/').split('/')[:-1]), target) + + code, real_url, content = open_url(target, method, form_vars) + + # If a expect_regex is given, check wether or not it is present in the response + if expect_regex is not None: + matches = re.search(expect_regex, content) + if matches is not None: + new_state(0, 'Found expected regex "%s" in form response' % expect_regex) + else: + new_state(2, 'Expected regex "%s" could not be found in form response' % expect_regex) + else: + new_state(0, 'Form has been submitted') + except HostResult, e: + states[host] = e.result + + if multiple: + failed = [ pair for pair in states.items() if pair[1][0] != 0 ] + success = [ pair for pair in states.items() if pair[1][0] == 0 ] + max_state = max([ state for state, output in states.values() ]) + + sum_state = 0 + if num_warn is None and num_crit is None: + # use the worst state as summary state + sum_state = max_state + + elif num_crit is not None and len(failed) >= num_crit: + sum_state = 2 + + elif num_warn is not None and len(failed) >= num_warn: + sum_state = 1 + + txt = '%d succeeded, %d failed' % (len(success), len(failed)) + if failed: + txt += ' (%s)' % ', '.join([ '%s: %s' % (n, s[1]) for n, s in failed ]) + bail_out(sum_state, txt) except Exception, e: if opt_debug:

11 years, 1 month

Check_MK Git: check_mk: Some rewording in check group switch_state -> switch_contact

by Andreas Boesl

Module: check_mk Branch: master Commit: caeecd7d337c95480bfd26ee6e13c7800d63b724 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=caeecd7d337c95… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 12 11:22:11 2013 +0200 Some rewording in check group switch_state -> switch_contact --- web/plugins/wato/check_parameters.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 47c66a5..29473cc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2864,15 +2864,15 @@ register_check_parameters( register_check_parameters( subgroup_environment, - "switch_state", - _("State of physical switch"), + "switch_contact", + _("Switch contact state"), DropdownChoice( - help = _("This Rule sets the required state of a physical switch"), - label = _("Required switch state"), + help = _("This rule sets the required state of a switch contact"), + label = _("Required switch contact state"), choices = [ - ( "open", "Switch is <b>open</b>" ), - ( "closed", "Switch is <b>closed</b>" ), - ( "ignore", "Ignore switch state" ), + ( "open", "Switch contact is <b>open</b>" ), + ( "closed", "Switch contact is <b>closed</b>" ), + ( "ignore", "Ignore switch contact state" ), ], ), TextAscii(

11 years, 1 month

Check_MK Git: check_mk: Not preselecting the "Alert Statistics" datasource on view creation anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 41799fecc2a87be40c64cd7133e1cf442779d223 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41799fecc2a87b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 12 11:15:26 2013 +0200 Not preselecting the "Alert Statistics" datasource on view creation anymore --- web/htdocs/views.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1a70694..6f9bfc3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -366,11 +366,22 @@ def page_edit_views(msg=None): save_views(config.user_id) html.reload_sidebar() - html.begin_form("create_view", "edit_view.py") + if html.var('mode') == 'create': + datasource = html.var('datasource') + if not datasource: + html.show_error(_('Please select a datasource. The datasource specifies which kind of objects ' + 'can be rendered within the view.')) + else: + html.immediate_browser_redirect(1, "edit_view.py?mode=create&datasource=%s" % datasource) + return + html.begin_form("create_view") + html.hidden_field('mode', 'create') html.button("create", _("Create New View")) html.write(_(" for datasource: ")) - html.sorted_select("datasource", [ (k, v["title"]) for k, v in multisite_datasources.items() ]) + html.sorted_select("datasource", [('', _('--- Select a Datasource ---'))] + + [ (k, v["title"]) for k, v in multisite_datasources.items() ]) + html.end_form() html.write('<h3>' + _("Existing Views") + '</h3>') html.write('<table class=data>') @@ -447,7 +458,6 @@ def page_edit_views(msg=None): html.write("</tr>\n") html.write("</table>\n") - html.end_form() html.footer() @@ -517,7 +527,7 @@ def page_edit_view(): mode = 'create' datasourcename = html.var("datasource") else: - raise MKInternalError(_("No view name and not datasource defined.")) + raise MKInternalError(_("No view name and no datasource defined.")) if mode == 'clone': title = _('Clone View')

11 years, 1 month

Check_MK Git: check_mk: WATO new rule: switch_state, expected state of physical switch

by Andreas Boesl

Module: check_mk Branch: master Commit: f873117073c390ab8d2869c00a2695bebd41f85e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f873117073c390… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 12 11:00:20 2013 +0200 WATO new rule: switch_state, expected state of physical switch --- ChangeLog | 1 + web/plugins/wato/check_parameters.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 63b7269..59bbc78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -177,6 +177,7 @@ large" error messages during submitting forms * FIX: automation snmp scan now adhere rules for shoddy snmp devices which have no sys description + * ADD: Rule to check state of physical switch (currently used by etherbox check) Notifications: * Flexible Notification can now filter service levels diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0a4f9a0..47c66a5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2864,6 +2864,25 @@ register_check_parameters( register_check_parameters( subgroup_environment, + "switch_state", + _("State of physical switch"), + DropdownChoice( + help = _("This Rule sets the required state of a physical switch"), + label = _("Required switch state"), + choices = [ + ( "open", "Switch is <b>open</b>" ), + ( "closed", "Switch is <b>closed</b>" ), + ( "ignore", "Ignore switch state" ), + ], + ), + TextAscii( + title = _("Sensor"), + allow_empty = False), + None +) + +register_check_parameters( + subgroup_environment, "room_temperature", _("Room temperature (external thermal sensors)"), Tuple(

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0938

by Andreas Boesl

Module: check_mk Branch: master Commit: 9fb02ddf0d1213ab2e9e567ee6d6615f807cac24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fb02ddf0d1213… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 12 11:00:59 2013 +0200 Updated bug entries #0938 --- .bugs/938 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/938 b/.bugs/938 new file mode 100644 index 0000000..e115d35 --- /dev/null +++ b/.bugs/938 @@ -0,0 +1,11 @@ +Title: snmp check without inventory +Component: checks +State: open +Date: 2013-09-10 15:06:00 +Targetversion: 1.2.3i2 +Class: bug + +The snmp_scan_function needs to be set in order to +complete a cmk -II call. Otherwise the inventory process +exits with Sorry. No inventory possible for check type etherbox_dew +and other checks are skipped

11 years, 1 month

Check_MK Git: check_mk: Basic implementation of new active check check_form_submit

by Lars Michelsen

Module: check_mk Branch: master Commit: 5445c17a56035a643104266ff3e192735dad493c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5445c17a56035a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 12 10:58:03 2013 +0200 Basic implementation of new active check check_form_submit --- ChangeLog | 13 +- checks/check_form_submit | 72 ++++++ doc/treasures/active_checks/.f12 | 2 + doc/treasures/active_checks/check_form_submit | 290 +++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 87 +++++++- 5 files changed, 457 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5445c17a56…

11 years, 1 month

Check_MK Git: check_mk: Producing valid HTML/XML for login dialog now ...

by Lars Michelsen

Module: check_mk Branch: master Commit: f087624e589a5c0f87a551785d0d5a661de1a9ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f087624e589a5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 11 16:10:14 2013 +0200 Producing valid HTML/XML for login dialog now ... --- web/htdocs/htmllib.py | 29 +++++++++++++++-------------- web/htdocs/login.py | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6547a43..f754d33 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -200,7 +200,8 @@ class html: def hidden_field(self, var, value, id = None, add_var = False): if value != None: id = id and ' id="%s"' % id or '' - self.write("<input type=hidden name=\"%s\" value=\"%s\"%s>" % (self.attrencode(var), self.attrencode(value), id)) + self.write("<input type=\"hidden\" name=\"%s\" value=\"%s\"%s />\n" % + (self.attrencode(var), self.attrencode(value), id)) if add_var: self.add_form_var(var) @@ -253,7 +254,7 @@ class html: def image_button(self, varname, title, cssclass = ''): if not self.mobile: - self.write('<label for="%s" class=image_button>' % varname) + self.write('<label for="%s" class="image_button">' % varname) self.raw_button(varname, title, cssclass) if not self.mobile: self.write('</label>') @@ -263,8 +264,8 @@ class html: def raw_button(self, varname, title, cssclass=""): self.write("<input onfocus=\"if (this.blur) this.blur();\" " - "type=submit name=\"%s\" id=\"%s\" value=\"%s\" " - "class=\"%s\">\n" % \ + "type=\"submit\" name=\"%s\" id=\"%s\" value=\"%s\" " + "class=\"%s\" />\n" % \ ( varname, varname, title, cssclass)) @@ -282,18 +283,18 @@ class html: title = ' disabled="%s"' % disabled if not self.mobile: - self.write('<label for="%s" class=image_button>' % obj_id) - self.write('<input%s%s%s%s value="%s" class=buttonlink type=button onclick="location.href=\'%s\'">' % \ + self.write('<label for="%s" class="image_button">' % obj_id) + self.write('<input%s%s%s%s value="%s" class="buttonlink" type="button" onclick="location.href=\'%s\'" />\n' % \ (obj_id, style, title, disabled, text, href)) if not self.mobile: self.write('</label>') def icon(self, help, icon): - self.write('<img align=absmiddle class=icon title="%s" src="images/icon_%s.png">' % ( + self.write('<img align=absmiddle class=icon title="%s" src="images/icon_%s.png" />' % ( help, icon)) def empty_icon(self): - self.write('<img class=icon src="images/trans.png">') + self.write('<img class=icon src="images/trans.png" />') def icon_button(self, url, help, icon, id="", onclick="", style="", target="", cssclass=""): if id: @@ -400,7 +401,7 @@ class html: if args["size"] == "max": add_style = "width: 100%; " else: - addprops += " size=%d" % (args["size"] + 1) + addprops += " size=\"%d\"" % (args["size"] + 1) if "width:" not in args.get("style", "") and not self.mobile: add_style = "width: %d.8ex; " % args["size"] @@ -428,17 +429,17 @@ class html: error = self.user_errors.get(varname) html = "" if error: - html = "<x class=inputerror>" + html = "<x class=\"inputerror\">" if label: if not id: id = "ti_%s" % varname html += '<label for="%s">%s</label>' % (id, label) if id: - addprops += " id='%s'" % id + addprops += ' id="%s"' % id attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) - html += "<input type=%s class=%s value=\"%s\" name=\"%s\"%s%s>" % \ + html += "<input type=\"%s\" class=\"%s\" value=\"%s\" name=\"%s\"%s%s />\n" % \ (mytype, cssclass, self.attrencode(value), varname, addprops, attributes) if error: html += "</x>" @@ -662,7 +663,7 @@ class html: self.write( u'''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html><head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8">\n''') +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n''') self.write('<title>') self.write(title) self.write('</title>\n') @@ -675,7 +676,7 @@ class html: # Load all specified style sheets and all user style sheets in htdocs/css for css in [ "check_mk" ] + stylesheets: - self.write('<link rel="stylesheet" type="text/css" href="%s.css">\n' % css) + self.write('<link rel="stylesheet" type="text/css" href="%s.css" />\n' % css) self.write('\n') diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 051850f..5cb2f23 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -249,37 +249,37 @@ def normal_login_page(called_directly = True): html.immediate_browser_redirect(0.5, origtarget and origtarget or 'index.py') return apache.OK - html.write("<div id=login>") - html.write("<img id=login_window src=\"images/login_window.png\">") - html.write("<div id=version>%s</div>" % defaults.check_mk_version) + html.write('<div id="login">\n') + html.write('<img id="login_window" src="images/login_window.png" />\n') + html.write('<div id="version">%s</div>\n' % defaults.check_mk_version) html.begin_form("login", method = 'POST', add_transid = False, action = 'login.py') 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 />" % _('Username')) + 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 />" % _('Password')) + html.write('<label id="label_pass" class="legend" for="_password">%s:</label><br />\n' % _('Password')) html.password_input("_password", id="input_pass", size=None) if html.has_user_errors(): - html.write('<div id=login_error>') + html.write('<div id="login_error">') html.show_user_errors() - html.write('</div>') + html.write('</div>\n') - html.write("<div id=button_text>") + html.write('<div id="button_text">') html.image_button("_login", _('Login')) - html.write("</div>") + html.write("</div>\n") - html.write("<div id=foot>Version: %s - © " - "<a href=\"http://mathias-kettner.de\">Mathias Kettner</a><br><br>" % defaults.check_mk_version) - html.write(_("You can use, modify and distribute Check_MK under the terms of the <a href='%s'>" - "GNU GPL Version 2</a>." % "http://mathias-kettner.de/gpl.html")) - html.write("</div>") + html.write('<div id="foot">Version: %s - © ' + '<a href="http://mathias-kettner.de">Mathias Kettner</a><br /><br />' % defaults.check_mk_version) + html.write(_('You can use, modify and distribute Check_MK under the terms of the <a href="%s">' + 'GNU GPL Version 2</a>.' % "http://mathias-kettner.de/gpl.html")) + html.write("</div>\n") - html.write("</div>") html.set_focus('_username') html.hidden_fields() html.end_form() + html.write("</div>\n") html.footer() return apache.OK

11 years, 1 month

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013