Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

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

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

Check_MK Git: check_mk: Updated bug entries #1049

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ecb88d8e65f9890f45ea8c625bee3003ea9ea5c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecb88d8e65f989… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Sep 12 10:32:09 2013 +0200 Updated bug entries #1049 --- .bugs/1049 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/1049 b/.bugs/1049 new file mode 100644 index 0000000..f2cdd0c --- /dev/null +++ b/.bugs/1049 @@ -0,0 +1,13 @@ +Title: Errormessage displayed when configuring distributed monitoring +Component: multisite +State: open +Date: 2013-09-12 10:27:16 +Targetversion: 1.2.3i2 +Class: bug + +in distributed monitoring a remote slave is configured +when clicking "save" butto multisite displays an error, where there seems to be none: +Internal error:: '.siteid' (Retry with debug mode) +but when klicking "Retry with debug mode" it works + +the connection is created correct within the first click on save

11 years

Check_MK Git: check_mk: Removed failing line from logwatch example

by Mathias Kettner

Module: check_mk Branch: master Commit: 83234983942506e945b27a02449d27251a60a84e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83234983942506… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 12 08:51:32 2013 +0200 Removed failing line from logwatch example --- agents/logwatch.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/logwatch.cfg b/agents/logwatch.cfg index 5a525b2..9c4045e 100644 --- a/agents/logwatch.cfg +++ b/agents/logwatch.cfg @@ -43,7 +43,6 @@ W device-mapper: thin:.*reached low water mark C device-mapper: thin:.*no free space C Error: (.*) - R There is a Error: \1 /var/log/auth.log W sshd.*Corrupted MAC on input

11 years

Check_MK Git: check_mk: GIT handling: ignore untracked files

by Mathias Kettner

Module: check_mk Branch: master Commit: fc36940d75e0013a644212065a74b6941cd91a75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc36940d75e001… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 11 16:54:48 2013 +0200 GIT handling: ignore untracked files --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1780224..cbbd96f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -397,10 +397,10 @@ def do_git_commit(): file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n") git_command(["add", ".gitignore", "*.d/wato"]) - git_command(["commit", "--author", author, "-m", shell_quote(_("Initialized GIT for Check_MK"))]) + git_command(["commit", "--untracked-files=no", "--author", author, "-m", shell_quote(_("Initialized GIT for Check_MK"))]) # Only commit, if something is changed - if os.popen("cd '%s' && git status --porcelain" % defaults.default_config_dir).read().strip(): + if os.popen("cd '%s' && git status --untracked-files=no --porcelain" % defaults.default_config_dir).read().strip(): git_command(["add", "*.d/wato"]) message = ", ".join(g_git_messages) if not message:

11 years

Check_MK Git: check_mk: Fixed sporadic exception when GIT and debug is enabled

by Mathias Kettner

Module: check_mk Branch: master Commit: 774e0446bc95bb3c88f481bd52273dc5aaeb06c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=774e0446bc95bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 11 16:45:22 2013 +0200 Fixed sporadic exception when GIT and debug is enabled --- web/htdocs/wato.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a7e58a6..1780224 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -391,7 +391,7 @@ def do_git_commit(): git_command(["init"]) # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + ".gitignore", "w").write("*\n!*.d\n!.gitignore\n") + file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n") for subdir in os.listdir(defaults.default_config_dir): if subdir.endswith(".d"): file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n") @@ -4154,8 +4154,6 @@ def check_mk_local_automation(command, args=[], indata=""): html.show_error("<h1>Cannot activate changes</h1>%s" % e) return - if config.debug: - log_audit(None, "automation", "Automation: %s" % " ".join(cmd)) try: # This debug output makes problems when doing bulk inventory, because # it garbles the non-HTML response output @@ -4174,7 +4172,6 @@ def check_mk_local_automation(command, args=[], indata=""): exitcode = p.wait() if exitcode != 0: if config.debug: - log_audit(None, "automation", "Automation command %s failed with exit code %d: %s" % (" ".join(cmd), exitcode, outdata)) raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % (" ".join(cmd), exitcode, hilite_errors(outdata), outdata.lstrip().startswith('sudo:') and sudo_msg or '')) else: @@ -4186,12 +4183,8 @@ def check_mk_local_automation(command, args=[], indata=""): call_hook_activate_changes() try: - if config.debug: - log_audit(None, "automation", "Result from automation: %s" % outdata) return eval(outdata) except Exception, e: - if config.debug: - log_audit(None, "automation", "Automation command %s failed: invalid output: %s" % (" ".join(cmd), outdata)) raise MKGeneralException("Error running <tt>%s</tt>. Invalid output from webservice (%s): <pre>%s</pre>" % (" ".join(cmd), e, outdata))

11 years

Check_MK Git: check_mk: Updated bug entries #1048

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7cf6551ddc0dec4798a82d1d0fd5f345f2ba8103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cf6551ddc0dec… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Sep 11 14:41:54 2013 +0200 Updated bug entries #1048 --- .bugs/1048 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/1048 b/.bugs/1048 new file mode 100644 index 0000000..b7f59ff --- /dev/null +++ b/.bugs/1048 @@ -0,0 +1,13 @@ +Title: Bug in staleness on dual config (SNMP + Agent) +Component: core +State: open +Date: 2013-09-11 14:37:12 +Targetversion: 1.2.3i2 +Class: bug + +Host is defined Dual (SNMP + Check-MK-Agent) +check interval for SNMP Checks is increased to e. g. 5 min, while checks of Agent run +default every minute +The problem is: Services checked by SNMP get stale too early +(in this case after 90 sec) +should get stale after 900 sec

11 years

Check_MK Git: check_mk: Updated bug entries #1002

by Götz Golla

Module: check_mk Branch: master Commit: c669d74ad7c68c8d2d9a5fa90e91f77e87fbd8e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c669d74ad7c68c… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Sep 11 13:32:58 2013 +0200 Updated bug entries #1002 --- .bugs/1002 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1002 b/.bugs/1002 new file mode 100644 index 0000000..48608b1 --- /dev/null +++ b/.bugs/1002 @@ -0,0 +1,11 @@ +Title: Use triangle as indicator that a view is hidden (or not hidden) +Component: multisite +State: open +Date: 2013-09-11 13:19:55 +Targetversion: future +Class: nastiness + +In the WATO as well as the multisite GUI views/topic can be hidden by clicking on the title. +This may confuse a user in some occasions, because it may not be clear if the topic is hidden, or +no item were found under that topic. +Therefore a triangle as indicator if the topic is hidden or not should be very useful.

11 years

Check_MK Git: check_mk: Removed "do not connect" option from site socket editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 03a0f5e9170aae522cfaa87109835f3c68e06ca1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03a0f5e9170aae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 11 11:05:31 2013 +0200 Removed "do not connect" option from site socket editor --- ChangeLog | 2 ++ web/htdocs/wato.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9b77a1..63b7269 100644 --- a/ChangeLog +++ b/ChangeLog @@ -167,6 +167,8 @@ and folders hierarchy. Those settings override the rule base config. * Require unique alias names in between the following elements: Host/Service/Contact Groups, Timeperiods and Roles + * Removed "do not connect" option from site socket editor. Use the + checkbox "Disable" to disable the site for multisite. * FIX: do validation of check items in rule editor * FIX: More consistent handling of folderpath select in rule editor * FIX: Now correctly handling depends_on_tags on page rendering for diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4c37207..a7e58a6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6858,7 +6858,6 @@ def mode_edit_site(phase): label = _("Path:"), size = 40, allow_empty = False)), - ( "disabled", _("Do not connect")), ] if config.liveproxyd_enabled: conn_choices[2:2] = [ @@ -7189,12 +7188,20 @@ def load_sites(): vars = { "sites" : {} } execfile(sites_mk, vars, vars) + + # Be compatible to old "disabled" value in socket attribute. + # Can be removed one day. + for site in vars['sites'].values(): + if site.get('socket') == 'disabled': + site['disabled'] = True + del site['socket'] + return vars["sites"] except Exception, e: if config.debug: raise MKGeneralException(_("Cannot read configuration file %s: %s" % - (filename, e))) + (sites_mk, e))) return {}

11 years

Check_MK Git: check_mk: Fixed error when disabling the livestatus connection for a remote site via config

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e3455422943db3c7540a1d912d2fe5667e8a471 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e3455422943db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 11 08:32:15 2013 +0200 Fixed error when disabling the livestatus connection for a remote site via config --- web/htdocs/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 29ef0ed..b0ec771 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -385,7 +385,8 @@ def sitenames(): def allsites(): return dict( [(name, site(name)) for name in sitenames() - if not site(name).get("disabled", False)] ) + if not site(name).get("disabled", False) + and site(name)['socket'] != 'disabled' ] ) def site(name): s = sites.get(name, {}) @@ -405,6 +406,8 @@ def site_is_local(name): sock = s.get("socket") return not sock or sock == "unix:" + defaults.livestatus_unix_socket +# FIXME: Should this return True even if all sites but one are disabled? +# -> should we use allsites() instead of "sites" directly? def is_multisite(): if len(sites) > 1: return True

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits