Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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

Check_MK Git: check_mk: FIX: netapp_*: scan functions now detect IBM versions of firmware

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0f781c9db7ef831c31bcd2f2483945aa31ca00e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f781c9db7ef83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 10:55:12 2011 +0100 FIX: netapp_*: scan functions now detect IBM versions of firmware --- ChangeLog | 1 + checks/netapp_cluster | 3 ++- checks/netapp_vfiler | 3 ++- checks/netapp_volumes | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc9e769..75134f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,7 @@ not working but interface has been used since last reboot. This 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 1.1.12p4: Multisite: diff --git a/checks/netapp_cluster b/checks/netapp_cluster index 6accb22..e723647 100644 --- a/checks/netapp_cluster +++ b/checks/netapp_cluster @@ -109,4 +109,5 @@ check_info["netapp_cluster"] = (check_netapp_cluster, "metrocluster_w_%s", 0, in # Run inventory only on Data Ontap OS with cluster enabled snmp_scan_functions["netapp_cluster"] = \ - lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789") diff --git a/checks/netapp_vfiler b/checks/netapp_vfiler index 1b44ec4..3c6809d 100644 --- a/checks/netapp_vfiler +++ b/checks/netapp_vfiler @@ -68,4 +68,5 @@ check_info["netapp_vfiler"] = (check_netapp_vfiler, "vFiler Status %s", 0, inven snmp_scan_functions["netapp_vfiler"] = \ - lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789") diff --git a/checks/netapp_volumes b/checks/netapp_volumes index a7ff567..05394c5 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -125,4 +125,5 @@ snmp_info["netapp_volumes"] = ( ".1.3.6.1.4.1.789.1.5.8.1", ["2", # volName ] ) snmp_scan_functions['netapp_volumes'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith('NetApp Release') + lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith('NetApp Release') or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789")

12 years, 9 months

Check_MK Git: check_mk: commentss -> fix typo in command

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe964edfba4172e81ec0cb9049ddb62c1051e7cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe964edfba4172… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 10:44:20 2011 +0100 commentss -> fix typo in command --- web/plugins/views/commands.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 039ad47..6ecadbe 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -418,7 +418,7 @@ multisite_commands.append({ multisite_commands.append({ "tables" : [ "comment" ], "permission" : "action.addcomment", - "title" : _("commentss"), + "title" : _("Comments"), "render" : lambda: \ html.button("_remove_comments", _("Remove")), "action" : lambda cmdtag, spec, row: \

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: 737af5df55f599f20b56d74c5d26599f88387bea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=737af5df55f599… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 10:44:22 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: FIX: Fixed duplicate view plugin loading when using localized multisite

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 334369b8b29c86d16e9c7ab8bf5dc6d5aec2139a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=334369b8b29c86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 10:36:01 2011 +0100 FIX: Fixed duplicate view plugin loading when using localized multisite --- ChangeLog | 1 + web/htdocs/views.py | 21 +++++++++++---------- web/plugins/views/commands.py | 3 +++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a514bc..6e84116 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * New (hidden) button for reloading a snapin (left to the close button) * Automatically falling back to hardcoded default language if configured language is not available + * FIX: Fixed duplicate view plugin loading when using localized multisite BI: * Host/Service elements are now iterable via FOREACH_HOST, e.g. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f91b7df..fc41ac7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -41,16 +41,6 @@ except NameError: # Datastructures and functions needed before plugins can be loaded loaded_with_language = False -multisite_datasources = {} -multisite_filters = {} -multisite_layouts = {} -multisite_painters = {} -multisite_sorters = {} -multisite_builtin_views = {} -multisite_painter_options = {} -multisite_commands = [] -ubiquitary_filters = [] # Always show this filters -view_hooks = {} # Load all view plugins def load_plugins(): @@ -59,6 +49,17 @@ def load_plugins(): return loaded_with_language = current_language + global multisite_datasources ; multisite_datasources = {} + global multisite_filters ; multisite_filters = {} + global multisite_layouts ; multisite_layouts = {} + global multisite_painters ; multisite_painters = {} + global multisite_sorters ; multisite_sorters = {} + global multisite_builtin_views ; multisite_builtin_views = {} + global multisite_painter_options ; multisite_painter_options = {} + global multisite_commands ; multisite_commands = [] + global ubiquitary_filters ; ubiquitary_filters = [] # Always show this filters + global view_hooks ; view_hooks = {} + config.declare_permission_section("action", _("Commands on host and services")) load_web_plugins("views", globals()) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 039ad47..eaac3b1 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -36,6 +36,9 @@ # - function that outputs the HTML input fields # - function that creates the nagios command and title +#import datetime, traceback +#file('/tmp/1', 'a').write('%s %s\n%s' % (datetime.datetime.now(), current_language, ''.join(traceback.format_stack()))) + # RESCHEDULE ACTIVE CHECKS config.declare_permission("action.reschedule", _("Reschedule checks"),

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: 899024198d4a2098a880555538fb247be282a0d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=899024198d4a20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 10:36:32 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 9 months

Check_MK Git: check_mk: Solaris agent: changed shell to /usr/bin/bash ( fixes problems with LC_ALL=C)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54e97035ec9c52c4e5269c993e1b4daa803e3472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54e97035ec9c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 09:52:55 2011 +0100 Solaris agent: changed shell to /usr/bin/bash (fixes problems with LC_ALL=C) --- ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31488f9..5998071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ should work on Debian now. * fsc_*: added missing scan functions * printer_alerts: added further state codes (thanks to Matthew Stew) + * Solaris agent: changed shell to /usr/bin/bash (fixes problems with LC_ALL=C) 1.1.12p5: Multisite: diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index df0fe41..c81a7d3 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/bash # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / |

12 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011