Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 discussions

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50cfab0988ba0ec77547457f21fe3834cb6378d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50cfab0988ba0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 3 10:23:32 2011 +0100 Updated bug entries --- .bugs/98 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/98 b/.bugs/98 index 71ab2a2..2d91ae1 100644 --- a/.bugs/98 +++ b/.bugs/98 @@ -1,10 +1,11 @@ Title: Restart of Nagios makes Multisite murk Component: multisite +State: done +Class: bug +Date: 2011-01-22 14:20:58 Benefit: 2 -State: open Cost: 2 -Date: 2011-01-22 14:20:58 -Class: bug +Fun: 0 When Nagios is restarted (e.g. via WATO), then for a short time the Livestatus socket is gone. This leads to error messages in various @@ -14,3 +15,6 @@ errors. We need to find a solution for a cleaner handling of this. Couldn't be a site in the state "restarting". If yes - how can we detect such a state. The livestatus socket is missing in such a case. + +2011-02-03 10:23:30: changed state open -> done +jQuery was removed - the window is gone.

13 years, 4 months

Check_MK Git: check_mk: Multisite: handle non-ascii chars in hostgroups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 555f522fd89ffda1f9003e5e16f19463326f6567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555f522fd89ffd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 3 10:13:01 2011 +0100 Multisite: handle non-ascii chars in hostgroups --- ChangeLog | 5 +++++ web/htdocs/htmllib.py | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c93718e..9819a6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,9 +9,14 @@ same as incoming, errors and discards were swapped (thanks to Paul Freeman) + Multisite: + * Fix encoding problem when host/service groups contain non-ascii + characters. + WATO: * Fix too-long-URL problem in cases of many services on one host + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d231791..d19f7bb 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -64,7 +64,10 @@ class uriinfo: if i[0] not in omit ]) def attrencode(value): - return cgi.escape(str(value), True) + if type(value) in [str, unicode]: + return cgi.escape(value) + else: + return cgi.escape(str(value), True) # This function returns a str object, never unicode! def urlencode_vars(vars): @@ -342,11 +345,13 @@ class html: def html_head(self, title): if not self.req.header_sent: self.req.write( - '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + 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"> - <title>%s</title> - <link rel="stylesheet" type="text/css" href="check_mk.css">''' % title) + <title>''') + self.req.write(title.encode("utf-8")) + self.req.write('''</title> + <link rel="stylesheet" type="text/css" href="check_mk.css">''') if config.custom_style_sheet: self.req.write(' <link rel="stylesheet" type="text/css" href="%s">' % config.custom_style_sheet) self.req.write('''

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 77c43e454aee70829d8fc8b3eaab32359cba7d0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77c43e454aee70… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 3 10:13:04 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7fd0f837d20cefbf725c6bd9381ff51d462ebce6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fd0f837d20cef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 3 10:11:56 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Linux Agent: Added suport for vdx and xvdx volumes (KVM+Virtio, XEN+xvda)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 12e3be6e7e205d0e8b3c5206a854a0994dee444d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12e3be6e7e205d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 3 10:11:49 2011 +0100 Linux Agent: Added suport for vdx and xvdx volumes (KVM+Virtio, XEN+xvda) Signed-off-by: Lars Michelsen <lm(a)mathias-kettner.de> --- ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index be45558..87e634b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * PNP templates for if/if64: fix bugs: outgoing packets had been same as incoming, errors and discards were swapped (thanks to Paul Freeman) + * Linux Agent: Added suport for vdx and xvdx volumes (KVM+Virtio, XEN+xvda) 1.1.9i6: INCOMPATIBLE CHANGES: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cd24268..436484b 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -157,7 +157,7 @@ cat /proc/mdstat # Performancecounter Platten echo '<<<diskstat>>>' date +%s -egrep ' ([sh]d[a-z]*|cciss/c[0-9]+d[0-9]+) ' < /proc/diskstats +egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+) ' < /proc/diskstats # Performancecounter Kernel echo '<<<kernel>>>'

13 years, 4 months

Check_MK Git: check_mk: WATO: converted services form from GET to POST

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b70a46ef7d72e088e7c565a94ea7843b1ec8e182 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b70a46ef7d72e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 3 09:41:59 2011 +0100 WATO: converted services form from GET to POST --- ChangeLog | 3 +++ web/htdocs/.f12 | 7 ------- web/htdocs/htmllib.py | 6 +++--- web/htdocs/index.py | 14 ++++++++++---- web/htdocs/wato.py | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index be45558..c93718e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ same as incoming, errors and discards were swapped (thanks to Paul Freeman) + WATO: + * Fix too-long-URL problem in cases of many services on one host + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 deleted file mode 100644 index 85d9910..0000000 --- a/web/htdocs/.f12 +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -sudo cp -r images *.css *.py js /omd/versions/default/share/check_mk/web/htdocs -sudo cp ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ -sudo cp ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ -sudo cp ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ -sudo omd restart eins apache diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 15d9dc2..d231791 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -158,13 +158,13 @@ class html: days = hours / 24 return "%d days" % days - def begin_form(self, name, action = None): + def begin_form(self, name, action = None, method = "GET"): self.form_vars = [] if action == None: action = self.req.myfile + ".py" self.current_form = name - self.write("<form name=%s class=%s action=\"%s\" method=GET>\n" % - (name, name, action)) + self.write("<form name=%s class=%s action=\"%s\" method=%s>\n" % + (name, name, action, method)) self.hidden_field("filled_in", "on") self.hidden_field("_transid", str(self.current_transid(self.req.user))) self.hidden_fields(self.global_vars) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 765e05b..27349bc 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -48,15 +48,21 @@ if defaults.omd_root: execfile(local_pagehandlers_dir + "/" + fn) def read_get_vars(req): - req.multivars = {} - req.vars = {} - if req.args: - req.rawvars = util.parse_qs(req.args, True) + def parse_vars(vars): + req.rawvars = util.parse_qs(vars, True) for (key,values) in req.rawvars.items(): if len(values) >= 1: req.vars[key] = values[-1] req.multivars[key] = values + req.multivars = {} + req.vars = {} + if req.args: + parse_vars(req.args) + postvars = req.read() + if postvars: + parse_vars(postvars) + def connect_to_livestatus(html): html.site_status = {} # site_status keeps a dictionary for each site with the following diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 45f76fa..7fa5f2c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -669,7 +669,7 @@ def show_service_table(hostname, firsttime): table = check_mk_automation("try-inventory", [hostname]) table.sort() - html.begin_form("checks") + html.begin_form("checks", None, "POST") fixall = 0 for entry in table: if entry[0] == 'new' and not html.has_var("_activate_all") and not firsttime:

13 years, 4 months

Check_MK Git: check_mk: Fixed error handling of clustered SNMP hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6628cf076544289e5c3ac38456b213a3bf7bdcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6628cf0765442… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 2 09:42:34 2011 +0100 Fixed error handling of clustered SNMP hosts --- ChangeLog | 1 + modules/check_mk_base.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d442f49..b75f5e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.9i7: Core, Setup, etc.: * Fix crash on Python 2.4 (e.g. RedHat) with fake_file + * Fixed clustering of SNMP hosts 1.1.9i6: INCOMPATIBLE CHANGES: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 6bfb6eb..f316ef5 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -270,10 +270,10 @@ def get_host_info(hostname, ipaddress, checkname): except MKAgentError, e: exception_texts.append(str(e)) g_broken_agent_hosts.add(node) - except SNMPErrorError, e: + except MKSNMPError, e: exception_texts.append(str(e)) g_broken_snmp_hosts.add(node) - is_snmp_error = true + is_snmp_error = True if not at_least_one_without_exception: if is_snmp_error: raise MKSNMPError(", ".join(exception_texts))

13 years, 4 months

Check_MK Git: check_mk: Fixed status ouput of Check_MK in cluster setup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 19b152a19b457349e74ff4f9b8ed98e43e3aeb19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19b152a19b4573… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 13:01:34 2011 +0100 Fixed status ouput of Check_MK in cluster setup --- ChangeLog | 1 + modules/check_mk_base.py | 10 ++++++---- modules/snmp.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b75f5e1..4a6b5ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core, Setup, etc.: * Fix crash on Python 2.4 (e.g. RedHat) with fake_file * Fixed clustering of SNMP hosts + * Fix status output of Check_MK check in mixed cluster setups 1.1.9i6: INCOMPATIBLE CHANGES: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f316ef5..78ab047 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -268,10 +268,12 @@ def get_host_info(hostname, ipaddress, checkname): info += get_realhost_info(node, ipaddress, checkname, cluster_max_cachefile_age) at_least_one_without_exception = True except MKAgentError, e: - exception_texts.append(str(e)) + if str(e) != "": # only first error contains text + exception_texts.append(str(e)) g_broken_agent_hosts.add(node) except MKSNMPError, e: - exception_texts.append(str(e)) + if str(e) != "": # only first error contains text + exception_texts.append(str(e)) g_broken_snmp_hosts.add(node) is_snmp_error = True if not at_least_one_without_exception: @@ -703,7 +705,7 @@ def do_check(hostname, ipaddress): output = "WARNING - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) status = 1 else: - output = "OK - Agent Version %s, processed %d host infos" % (agent_version, num_success) + output = "OK - Agent version %s" % (agent_version, num_success) status = 0 except MKGeneralException, e: @@ -720,7 +722,7 @@ def do_check(hostname, ipaddress): raise run_time = time.time() - start_time - output += " in %.1f sec|execution_time=%.3f\n" % (run_time, run_time) + output += ", execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) sys.stdout.write(output) sys.exit(status) diff --git a/modules/snmp.py b/modules/snmp.py index 8229b23..5ed920d 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -108,7 +108,7 @@ def get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes): if exitstatus: if opt_verbose: sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error\n") - raise MKSNMPError("SNMP Error") + raise MKSNMPError("SNMP Error on %s" % ipaddress) return info def snmpwalk_on_suboid(hostname, ip, oid): @@ -153,7 +153,7 @@ def snmpwalk_on_suboid(hostname, ip, oid): if exitstatus: if opt_verbose: sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error\n") - raise MKSNMPError("SNMP Error") + raise MKSNMPError("SNMP Error on %s" % ip) return rowinfo def get_snmp_table(hostname, ip, oid_info):

13 years, 4 months

Check_MK Git: check_mk: Multisite: fix formatting of ul in views snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dffca0f2919582411eb9cb6e95344dc5166fb25f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dffca0f2919582… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 10:43:51 2011 +0100 Multisite: fix formatting of ul in views snapin --- web/plugins/sidebar/shipped.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 2d7cac4..ef9a108 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -103,11 +103,12 @@ def render_views(): continue if t == topic: if first: - html.write("</ul>") html.write("<h3>%s</h3>\n" % topic) first = False html.write("<ul>") bulletlink(title, "view.py?view_name=%s" % name) + if first: # at least one item rendered + html.write("</ul>") s = [ (view.get("topic", "Other"), view["title"], name) for name, view in html.available_views.items() if not view["hidden"] ] s.sort()

13 years, 4 months

Check_MK Git: check_mk: Fix crash in Check_MK normal output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 240635bfafc41ac76828b251042045de00edff85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=240635bfafc41a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 13:49:59 2011 +0100 Fix crash in Check_MK normal output --- modules/check_mk_base.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 78ab047..52df50c 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -705,7 +705,7 @@ def do_check(hostname, ipaddress): output = "WARNING - old plugin version %s (should be at least %s)" % (agent_version, agent_min_version) status = 1 else: - output = "OK - Agent version %s" % (agent_version, num_success) + output = "OK - Agent version %s" % agent_version status = 0 except MKGeneralException, e:

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011