Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

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: 10a75aeef19a9cc689101566496c88b0320c0bbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10a75aeef19a9c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 11:36:35 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO: add changelog button to ruleset mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90fab849ae61e4eec4d943f4bbac39d99e656839 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90fab849ae61e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:34:08 2011 +0100 WATO: add changelog button to ruleset mode --- web/htdocs/wato.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 10bc735..fc83eca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8711,7 +8711,7 @@ def mode_edit_ruleset(phase): return title elif phase == "buttons": - home_button() + global_buttons() html.context_button(_("All rulesets"), make_link([("mode", "rulesets"), ("host", hostname)]), "back") if hostname: @@ -9272,12 +9272,11 @@ def mode_edit_rule(phase): return _("Edit rule %s") % rulespec["title"] elif phase == "buttons": - home_button() - html.context_button(_("All rules"), + html.context_button(_("Abort"), make_link([("mode", "edit_ruleset"), ("varname", varname), ("host", html.var("host", "")), - ("item", html.var("item", "None"))]), "back") + ("item", html.var("item", "None"))]), "abort") return folder = g_folders[html.var("rule_folder")]

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0419

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa71abc94b22f01a2c5b6c8d563da02b0d7c124b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa71abc94b22f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:28:16 2011 +0100 Updated bug entries #0419 --- .bugs/419 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/419 b/.bugs/419 index 5e7027d..7e8114e 100644 --- a/.bugs/419 +++ b/.bugs/419 @@ -1,11 +1,11 @@ Title: mem.vmalloc falsche Default Limits Component: checks +State: done +Class: cleanup Benefit: 2 -State: open Cost: 1 Date: 2011-12-13 14:50:04 Targetversion: 1.1.13i1 -Class: cleanup kann es sein, dass die Default-LImits von mem.vmalloc bzgl. largest free(!) chunk unsinnig sind: @@ -19,3 +19,6 @@ Da es sich um free mem handelt, sollte die Warning kommen, wenn es weniger als 64MB sind, und Crit bei < 32MB, also: (80.0, 90.0, 64, 32) + +2011-12-16 11:28:12: changed state open -> done +Swapped

12 years, 9 months

Check_MK Git: check_mk: FIX: mem.vmalloc: fix default levels

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cdb16046ff61095b9e36330b948ab19cf0812848 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdb16046ff6109… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:27:52 2011 +0100 FIX: mem.vmalloc: fix default levels --- ChangeLog | 1 + checkman/mem.vmalloc | 2 +- checks/mem | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18eff2c..a6a9b0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * FIX: snmp_uptime: handels alternative timeformat * FIX: netapp_*: scan functions now detect IBM versions of firmware * FIX: bluecoat_diskcpu: repair scan function + * FIX: mem.vmalloc: fix default levels (32 and 64 was swapped) 1.1.12p4: Multisite: diff --git a/checkman/mem.vmalloc b/checkman/mem.vmalloc index a4f2ef0..f530555 100644 --- a/checkman/mem.vmalloc +++ b/checkman/mem.vmalloc @@ -52,5 +52,5 @@ crit_chunk (int or float): critical level for the size of the [configuration] mem_vmalloc_default_levels (int/float, int/float, int/float, int/float): Levels used by checks created by inventory. The default value is set - to {(80.0, 90.0, 32, 64)}. + to {(80.0, 90.0, 64, 32)}. diff --git a/checks/mem b/checks/mem index f2d3321..92112aa 100644 --- a/checks/mem +++ b/checks/mem @@ -208,7 +208,7 @@ check_info['mem.win'] = (check_mem_windows, "Memory and pagefile", 1, inventory_ # +----------------------------------------------------------------------+ # warn, crit, warn_chunk, crit_chunk. Integers are in MB, floats are in percent -mem_vmalloc_default_levels = ( 80.0, 90.0, 32, 64 ) +mem_vmalloc_default_levels = ( 80.0, 90.0, 64, 32 ) def inventory_mem_vmalloc(info): meminfo = parse_proc_meminfo(info)

12 years, 9 months

Check_MK Git: check_mk: FIX: bluecoat_diskcpu: repair scan function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ef163e3642f8ffc622b86d2958a8fde6b5250b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ef163e3642f8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:10:53 2011 +0100 FIX: bluecoat_diskcpu: repair scan function --- ChangeLog | 1 + checks/bluecoat_diskcpu | 2 +- checks/bluecoat_sensors | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75134f9..7961d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ fixes the problem where interface are not found by inventory. * FIX: snmp_uptime: handels alternative timeformat * FIX: netapp_*: scan functions now detect IBM versions of firmware + * FIX: bluecoat_diskcpu: repair scan function 1.1.12p4: Multisite: diff --git a/checks/bluecoat_diskcpu b/checks/bluecoat_diskcpu index 8ea8597..1229fda 100644 --- a/checks/bluecoat_diskcpu +++ b/checks/bluecoat_diskcpu @@ -49,5 +49,5 @@ snmp_info['bluecoat_diskcpu'] = ( ".1.3.6.1.4.1.3417.2.4.1.1.1", [ 3, 4, 6 ]) # BLUECOAT disk und CPU-Tabelle -snmp_scan_functions["bluecoat_sensors"] = \ +snmp_scan_functions["bluecoat_diskcpu"] = \ lambda oid: '1.3.6.1.4.1.3417.1.1' in oid(".1.3.6.1.2.1.1.2.0") diff --git a/checks/bluecoat_sensors b/checks/bluecoat_sensors index aa2d521..e9073cc 100644 --- a/checks/bluecoat_sensors +++ b/checks/bluecoat_sensors @@ -49,6 +49,5 @@ snmp_info['bluecoat_sensors'] = ( ".1.3.6.1.4.1.3417.2.1.1.1.1.1", [ 9, 5, 7, 4 ]) # BLUECOAT fan, voltage, temperatures, scale - snmp_scan_functions["bluecoat_sensors"] = \ lambda oid: '1.3.6.1.4.1.3417.1.1' in oid(".1.3.6.1.2.1.1.2.0")

12 years, 9 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: 4f48748ccde2c253a382a1d30787507e79bb6fb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f48748ccde2c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 11:10:57 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Speed-O-Meter snapin: Fixed title variable type; Catching exceptions during rendering

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b5a09126ef8b3b19bfdbeb838058274a90f501c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5a09126ef8b3b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 11:01:31 2011 +0100 Speed-O-Meter snapin: Fixed title variable type; Catching exceptions during rendering --- web/plugins/sidebar/shipped.py | 51 +++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1efe577..41ac15a 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -667,30 +667,33 @@ function show_speed(percentage) { function speedometer_show_speed(last_perc, program_start, scheduled_rate) { - text = get_url_sync("sidebar_ajax_speedometer.py" + - "?last_perc=" + last_perc + - "&scheduled_rate=" + scheduled_rate + - "&program_start=" + program_start); - code = eval(text); - scheduled_rate = code[0]; - program_start = code[1]; - percentage = code[2]; - last_perc = code[3]; - title = code[4]; - - oDiv = document.getElementById('speedometer'); - oDiv.title = title - oDiv = document.getElementById('speedometerbg'); - oDiv.title = title - oDiv = null; - - - move_needle(last_perc, percentage); // 50 * 100ms = 5s = refresh time + try { + text = get_url_sync("sidebar_ajax_speedometer.py" + + "?last_perc=" + last_perc + + "&scheduled_rate=" + scheduled_rate + + "&program_start=" + program_start); + code = eval(text); + scheduled_rate = code[0]; + program_start = code[1]; + percentage = code[2]; + last_perc = code[3]; + title = code[4]; + + oDiv = document.getElementById('speedometer'); + oDiv.title = title + oDiv = document.getElementById('speedometerbg'); + oDiv.title = title + oDiv = null; + + move_needle(last_perc, percentage); // 50 * 100ms = 5s = refresh time + } catch(ie) { + // Ignore errors during re-rendering. Proceed with reschedule... + } // large timeout for fetching new data via Livestatus - setTimeout("speedometer_show_speed(" - + percentage + "," - + program_start + "," + setTimeout("speedometer_show_speed(" + + percentage + "," + + program_start + "," + scheduled_rate + ");", 5000); } @@ -719,7 +722,7 @@ def ajax_speedometer(): last_perc = float(html.var("last_perc")) scheduled_rate = float(html.var("scheduled_rate")) last_program_start = int(html.var("program_start")) - + # Get the current rates and the program start time. If there # are more than one site, we simply add the start times. data = html.live.query_summed_stats("GET status\n" @@ -751,7 +754,7 @@ def ajax_speedometer(): last_perc = 0 title = _("No performance data: ") + str(e) - html.write(repr([scheduled_rate, program_start, percentage, last_perc, title])) + html.write(repr([scheduled_rate, program_start, percentage, last_perc, str(title)])) sidebar_snapins["speedometer"] = {

12 years, 9 months

Check_MK Git: check_mk: FIX: Host-/Servicegroup snapin: Showing group names when no alias is available

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cfd908aa4cb42a80513151551e557689b4eabe78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfd908aa4cb42a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 10:55:12 2011 +0100 FIX: Host-/Servicegroup snapin: Showing group names when no alias is available --- ChangeLog | 1 + web/plugins/sidebar/shipped.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc9e769..fba87f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ language is not available * Repair layout of Perf-O-Meter in single dataset layout * FIX: Fixed duplicate view plugin loading when using localized multisite + * FIX: Host-/Servicegroup snapin: Showing group names when no alias is available BI: * Host/Service elements are now iterable via FOREACH_HOST, e.g. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a7bb565..1efe577 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -142,7 +142,7 @@ def render_groups(what): html.write('<ul>') for alias_lower, alias, name in groups: url = "view.py?view_name=%sgroup&%sgroup=%s" % (what, what, htmllib.urlencode(name)) - bulletlink(alias, url) + bulletlink(alias or name, url) html.write('</ul>') sidebar_snapins["hostgroups"] = {

12 years, 9 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: d512c6e783793033adc2abce63dd6610b0cf5d45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d512c6e7837930… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 10:57:25 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Shortened WATO snapin title

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 00c2afb50d4fa378431d9231c375225d3b82d815 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00c2afb50d4fa3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 10:55:25 2011 +0100 Shortened WATO snapin title --- web/plugins/sidebar/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 83ff5ce..5825aa7 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -48,7 +48,7 @@ def render_wato(): sidebar_snapins["admin"] = { - "title" : _("WATO: Check_MK Administration"), + "title" : _("WATO · Configuration"), "description" : _("Direct access to WATO - the web administration GUI of Check_MK"), "author" : "Mathias Kettner", "render" : render_wato,

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits