Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

Check_MK Git: check_mk: gb: target version is now an enum list

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 99ad65e8121744b8d648a83afb5128586265d11e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99ad65e8121744… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 14:03:50 2011 +0200 gb: target version is now an enum list --- .bugs/105 | 2 +- .bugs/400 | 2 +- .bugs/401 | 2 +- .bugs/402 | 2 +- .bugs/403 | 2 +- .bugs/404 | 2 +- .bugs/405 | 2 +- .bugs/config | 8 +++++++- gb | 18 +++++++++++------- 9 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.bugs/105 b/.bugs/105 index 0f1d95d..77bb133 100644 --- a/.bugs/105 +++ b/.bugs/105 @@ -5,7 +5,7 @@ State: open Cost: 5 Date: 2011-01-24 16:22:26 Class: cleanup -Targetversion: 1.1.12p1 +Targetversion: 1.1.12 All SNMP checks must define scan functions. Otherwise the scan can take a long time on some slow devices. diff --git a/.bugs/400 b/.bugs/400 index 601f09f..3bb55e5 100644 --- a/.bugs/400 +++ b/.bugs/400 @@ -4,7 +4,7 @@ Benefit: 2 State: open Cost: 2 Date: 2011-10-27 15:00:16 -Targetversion: 1.1.12p1 +Targetversion: 1.1.12 Class: bug The service hard state filter uses the HTML variables hst0, hst1, ... diff --git a/.bugs/401 b/.bugs/401 index 16fcd01..37ecb08 100644 --- a/.bugs/401 +++ b/.bugs/401 @@ -4,7 +4,7 @@ Benefit: 1 State: open Cost: 1 Date: 2011-10-27 18:51:44 -Targetversion: 1.1.12p1 +Targetversion: 1.1.12 Class: bug When in a view in Checkbox mode hovering over the rows diff --git a/.bugs/402 b/.bugs/402 index c511803..386e62b 100644 --- a/.bugs/402 +++ b/.bugs/402 @@ -4,7 +4,7 @@ Benefit: 1 State: open Cost: 1 Date: 2011-10-27 18:52:58 -Targetversion: 1.1.12p1 +Targetversion: 1.1.12 Class: bug When hitting Enter in Quicksearch when no host matches, a service diff --git a/.bugs/403 b/.bugs/403 index 8e3aac8..db7173c 100644 --- a/.bugs/403 +++ b/.bugs/403 @@ -6,7 +6,7 @@ State: done Class: bug Benefit: 2 Fun: 0 -Targetversion: 1.1.12p1 +Targetversion: 1.1.12 Take the allhosts_mini View. Add a service column with the 1.st service perfdata variable. Now click diff --git a/.bugs/404 b/.bugs/404 index 1e9a4d2..beb0e63 100644 --- a/.bugs/404 +++ b/.bugs/404 @@ -4,7 +4,7 @@ Benefit: 2 State: open Cost: 2 Date: 2011-10-27 18:55:56 -Targetversion: +Targetversion: 1.2.0 Class: todo So that we can filter events for the alert state. diff --git a/.bugs/405 b/.bugs/405 index eeb183d..85518f2 100644 --- a/.bugs/405 +++ b/.bugs/405 @@ -4,7 +4,7 @@ Benefit: 1 State: open Cost: 1 Date: 2011-10-27 18:56:40 -Targetversion: +Targetversion: 1.2.0 Class: todo Do we have filters for the hard service state? At least in diff --git a/.bugs/config b/.bugs/config index e56e56b..52e04cf 100644 --- a/.bugs/config +++ b/.bugs/config @@ -3,7 +3,7 @@ states = { "done" : tty_green, "closed" : tty_normal, "wontfix" : tty_magenta, - "discuss" : tty_red, + "discuss" : tty_red, } components = [ @@ -24,3 +24,9 @@ classes = [ "phantasm", "feature", ] + +targetversions = [ + "1.1.12", + "1.2.0", + "future", +] diff --git a/gb b/gb index e4f4def..3726f7f 100755 --- a/gb +++ b/gb @@ -115,7 +115,7 @@ def load_bug(bugid): "state" : "unknown", "title" : "unknown", "component" : "general", - "targetversion" : "", + "targetversion" : "future", } f = file(str(bugid)) @@ -252,7 +252,11 @@ def main_list(args): hit = False for tp, values in [ - ( "component", components ), ( "state", states ), ( "class", classes ), ]: + ( "component", components ), + ( "state", states ), + ( "class", classes ), + ( "targetversion", targetversions), + ]: for v in values: if v.startswith(a): entries = filters.get(tp, []) @@ -367,11 +371,11 @@ def main_new(args): if bug["title"] == "": sys.stderr.write("Cancelled.\n") sys.exit(0) - bug["class"] = input_choice("Class", classes) - bug["component"] = input_choice("Component", components) - bug["targetversion"] = get_input("Target Version") - bug["cost"] = input_choice("Cost", "123456789") - bug["benefit"] = input_choice("Benefit", "123456789") + bug["class"] = input_choice("Class", classes) + bug["component"] = input_choice("Component", components) + bug["targetversion"] = input_choice("Target Version", targetversions) + bug["cost"] = input_choice("Cost", "123456789") + bug["benefit"] = input_choice("Benefit", "123456789") bug["description"] = get_long_input("description") g_bugs[bug["id"]] = bug

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0400

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c2d183ac8ba933a52af8e78c24c19bc7105775a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c2d183ac8ba93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 15:01:57 2011 +0200 Updated bug entries #0400 --- .bugs/400 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/.bugs/400 b/.bugs/400 new file mode 100644 index 0000000..601f09f --- /dev/null +++ b/.bugs/400 @@ -0,0 +1,15 @@ +Title: Service Hardstate-Filter conflicts with Hoststate filter +Component: multisite +Benefit: 2 +State: open +Cost: 2 +Date: 2011-10-27 15:00:16 +Targetversion: 1.1.12p1 +Class: bug + +The service hard state filter uses the HTML variables hst0, hst1, ... +just like the host state filter. Change this to hdst0, hdst1, .... +Otherwise the filter will also have the same setting as the +host state filter. + +This might affect builtin views. Check them...

12 years, 8 months

Check_MK Git: check_mk: FIX: printer_alerts: handle 0-entries of Brother printers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c0563e578efb9360686945e8d3d07f16db237cd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0563e578efb93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 15:41:07 2011 +0200 FIX: printer_alerts: handle 0-entries of Brother printers --- ChangeLog | 1 + checks/printer_alerts | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b399e4f..5ebcb98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ 1.1.12p1: Checks & Agents: * FIX: mk_oracle now also detects XE databases + * FIX: printer_alerts: handle 0-entries of Brother printers 1.1.12: diff --git a/checks/printer_alerts b/checks/printer_alerts index 7841171..824001c 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -70,6 +70,8 @@ def inventory_printer_alerts(info): return [ (None, None) ] def check_printer_alerts(_not_used, _not_used1, info): + # Filter out empty status lines (e.g. sent by Brother printers) + info = [ i for i in info if i != [ "1", "0", "0", "0", "" ] ] if not info: return (0, 'OK - No alerts present')

12 years, 8 months

Check_MK Git: check_mk: FIX: fix NagStaMon-creates-high-load-BUG

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7aeec6f8d84878b02c8ea76c5d9bfe3e0cb822e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aeec6f8d84878… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 16:15:57 2011 +0200 FIX: fix NagStaMon-creates-high-load-BUG --- ChangeLog | 4 ++++ web/htdocs/htmllib.py | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ebcb98..bc93ec8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,10 @@ Checks & Agents: * FIX: mk_oracle now also detects XE databases * FIX: printer_alerts: handle 0-entries of Brother printers + + Multisite: + * FIX: finally fixed long-wanted "NagStaMon create hundreds + of Apache processes" problem! 1.1.12: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d6f5c32..f56b964 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -147,7 +147,9 @@ def strip_tags(ht): x = ht.find('<') if x == -1: break - y = ht.find('>') + y = ht.find('>', x) + if y == -1: + break ht = ht[0:x] + ht[y+1:] return ht

12 years, 8 months

Check_MK Git: check_mk: FIX: printer_supply: fix Perf-O-Meter if no max known

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a35eb81cbbdf421c03a0d97a8ff2b469eed14beb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a35eb81cbbdf42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 16:28:37 2011 +0200 FIX: printer_supply: fix Perf-O-Meter if no max known --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc93ec8..2e30def 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ Checks & Agents: * FIX: mk_oracle now also detects XE databases * FIX: printer_alerts: handle 0-entries of Brother printers + * FIX: printer_supply: fix Perf-O-Meter if no max known Multisite: * FIX: finally fixed long-wanted "NagStaMon create hundreds diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index a836fff..1d113c5 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -330,6 +330,8 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): crit = float(perf_data[0][4]) mini = float(perf_data[0][5]) maxi = float(perf_data[0][6]) + if maxi < 0: + return "", "" # Printer does not supply a max value # If there is no 100% given, calculate the percentage if maxi != 100.0:

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0401, #0402, #0403, #0404, #0405

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9b702d332fcacffe12c23e50be3d6b004adddd3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b702d332fcacf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 18:57:58 2011 +0200 Updated bug entries #0401, #0402, #0403, #0404, #0405 --- .bugs/401 | 12 ++++++++++++ .bugs/402 | 11 +++++++++++ .bugs/403 | 14 ++++++++++++++ .bugs/404 | 10 ++++++++++ .bugs/405 | 11 +++++++++++ 5 files changed, 58 insertions(+), 0 deletions(-) diff --git a/.bugs/401 b/.bugs/401 new file mode 100644 index 0000000..16fcd01 --- /dev/null +++ b/.bugs/401 @@ -0,0 +1,12 @@ +Title: IE8: Hiliting of rows in checkbox mode is broken +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-10-27 18:51:44 +Targetversion: 1.1.12p1 +Class: bug + +When in a view in Checkbox mode hovering over the rows +should hilite those rows. In IE8 this does not work. +The red background of the CRIT is destroyed, too. diff --git a/.bugs/402 b/.bugs/402 new file mode 100644 index 0000000..c511803 --- /dev/null +++ b/.bugs/402 @@ -0,0 +1,11 @@ +Title: IE8: Hitting enter in Quicksearch does not work +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-10-27 18:52:58 +Targetversion: 1.1.12p1 +Class: bug + +When hitting Enter in Quicksearch when no host matches, a service +search should be done. In Firefox this works, in IE8 not. diff --git a/.bugs/403 b/.bugs/403 new file mode 100644 index 0000000..4ee57c7 --- /dev/null +++ b/.bugs/403 @@ -0,0 +1,14 @@ +Title: Service "1st perf data" in host view: search broken +Component: multisite +Benefit: 2 +State: open +Cost: 2 +Date: 2011-10-27 18:53:50 +Targetversion: 1.1.12p1 +Class: bug + +Take the allhosts_mini View. Add a service column +with the 1.st service perfdata variable. Now click +on the header to sort after that columns -> Error +that the column "service_perf_data" is missing. + diff --git a/.bugs/404 b/.bugs/404 new file mode 100644 index 0000000..1e9a4d2 --- /dev/null +++ b/.bugs/404 @@ -0,0 +1,10 @@ +Title: Add filter for alert state in log views (OK/CRIT, etc) +Component: multisite +Benefit: 2 +State: open +Cost: 2 +Date: 2011-10-27 18:55:56 +Targetversion: +Class: todo + +So that we can filter events for the alert state. diff --git a/.bugs/405 b/.bugs/405 new file mode 100644 index 0000000..eeb183d --- /dev/null +++ b/.bugs/405 @@ -0,0 +1,11 @@ +Title: Add filters for hard service state +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-10-27 18:56:40 +Targetversion: +Class: todo + +Do we have filters for the hard service state? At least in +the service search they should be visible. Same for hosts.

12 years, 8 months

Check_MK Git: check_mk: extra_buttons can now register a function to gather the URL to link to

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6b3310f0213bca0aa4c163ead8a50f340b27540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6b3310f0213bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 13:01:09 2011 +0200 extra_buttons can now register a function to gather the URL to link to --- ChangeLog | 1 + web/htdocs/wato.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e63e5ba..e51ba3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * Added API function num_hosts_in_folder() to count the number of hosts below the given folder * Added option to download "latest" snapshot + * extra_buttons can now register a function to gather the URL to link to Multisite: * FIX: Fixed encoding problem when opening dashboard diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8456f75..ca2072a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -370,6 +370,8 @@ def page_handler(): modefunc("buttons") for inmode, buttontext, target in extra_buttons: if inmode == current_mode: + if hasattr(target, '__call__'): + target = target() if '/' == target[0] or target.startswith('../') or '://' in target: html.context_button(buttontext, target) else:

12 years, 8 months

Check_MK Git: check_mk: wato: Added option to download "latest" snapshot

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3fa852e57d29b50d85ab08e81a1450b6a67e70f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fa852e57d29b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 27 15:51:32 2011 +0200 wato: Added option to download "latest" snapshot --- ChangeLog | 1 + web/htdocs/wato.py | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7981b2d..f38ba3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ attributes of a host * Added API function num_hosts_in_folder() to count the number of hosts below the given folder + * Added option to download "latest" snapshot Multisite: * FIX: Fixed encoding problem when opening dashboard diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3fe1acb..8456f75 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3438,13 +3438,24 @@ def mode_snapshot(phase): return elif phase == "action": if html.has_var("_download_file"): - # FIXME: HTML Variable pruefen, kein join verwenden - download_file = os.path.join(snapshot_dir, html.var("_download_file")) + download_file = html.var("_download_file") + if not download_file.startswith('wato-snapshot') and download_file != 'latest': + raise MKUserError(None, _("Invalid download file specified")) + + # Find the latest snapshot file + if download_file == 'latest': + snapshots = os.listdir(snapshot_dir) + if not snapshots: + return False + download_file = snapshots[-1] + + download_file = os.path.join(snapshot_dir, download_file) if os.path.exists(download_file): - html.req.headers_out['Content-Disposition'] = 'Attachment; filename=' + html.var("_download_file") + html.req.headers_out['Content-Disposition'] = 'Attachment; filename=' + download_file html.req.headers_out['content_type'] = 'application/x-tar' html.write(open(download_file).read()) return False + # create snapshot elif html.has_var("_create_snapshot"): if html.check_transaction():

12 years, 8 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: b789779994e235fd27725b53a56a5ec0e3bfe4f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b789779994e235… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 27 17:05:27 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: FIX: Added id parameter to render_statistics() method to allow more than one pie dashlet for host/service stats

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80963e49f60b846a2fe0ed99e0df552fd1924870 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80963e49f60b84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 27 17:05:14 2011 +0200 FIX: Added id parameter to render_statistics() method to allow more than one pie dashlet for host/service stats --- ChangeLog | 2 ++ web/htdocs/dashboard.py | 17 ++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f38ba3d..6023eaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ Multisite: * FIX: Fixed encoding problem when opening dashboard + * FIX: Added id parameter to render_statistics() method to allow more than + one pie dashlet for host/service stats 1.1.12: diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 0af4048..e2b81d1 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -437,7 +437,7 @@ def dashlet_hoststats(): ] filter = "Filter: custom_variable_names < _REALNAME\n" - render_statistics("hosts", table, filter) + render_statistics("hoststats", "hosts", table, filter) def dashlet_servicestats(): table = [ @@ -488,10 +488,10 @@ def dashlet_servicestats(): ] filter = "Filter: host_custom_variable_names < _REALNAME\n" - render_statistics("services", table, filter) + render_statistics("servicestats", "services", table, filter) -def render_statistics(what, table, filter): +def render_statistics(pie_id, what, table, filter): # Is the query restricted to a certain WATO-path? wato_folder = html.var("wato_folder") if wato_folder: @@ -509,7 +509,7 @@ def render_statistics(what, table, filter): pie_diameter = 136 html.write('<canvas class=pie width=%d height=%d id=%s_stats style="float: left"></canvas>' % - (pie_diameter, pie_diameter, what)) + (pie_diameter, pie_diameter, pie_id)) html.write('<table class="hoststats%s" style="float:left">' % ( len(pies) > 5 and " narrow" or "")) @@ -527,7 +527,7 @@ def render_statistics(what, table, filter): if total > 0: for (name, color, viewurl, q), value in pies: perc = 100.0 * value / total - pie_parts.append('chart_pie("%s", %f, %f, %r);' % (what, r, r + perc, color)) + pie_parts.append('chart_pie("%s", %f, %f, %r);' % (pie_id, r, r + perc, color)) r += perc html.javascript(""" @@ -535,8 +535,8 @@ function has_canvas_support() { return document.createElement('canvas').getContext; } -function chart_pie(what, from, to, color) { - var context = document.getElementById(what + "_stats").getContext('2d'); +function chart_pie(pie_id, from, to, color) { + var context = document.getElementById(pie_id + "_stats").getContext('2d'); if(!context) return; var pie_x = %(x)f; @@ -564,8 +564,7 @@ function rad(g) { if(has_canvas_support()) { %(p)s } -""" % { "what" : what, "x" : pie_diameter / 2, - "y": pie_diameter/2, "d" : pie_diameter, 'p': '\n'.join(pie_parts) }) +""" % { "x" : pie_diameter / 2, "y": pie_diameter/2, "d" : pie_diameter, 'p': '\n'.join(pie_parts) }) def dashlet_pnpgraph(): render_pnpgraph(html.var("site"), html.var("host"), html.var("service"), int(html.var("source", 0)))

12 years, 8 months

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011