Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 discussions

Check_MK Git: check_mk: Fix HTML bugs in permissions pages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55fdd9c83b97ffa86a8d4cccac33abc159113b8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fdd9c83b97ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 24 11:15:32 2011 +0200 Fix HTML bugs in permissions pages --- web/htdocs/page_logwatch.py | 4 +--- web/htdocs/permissions.py | 8 ++------ web/htdocs/views.py | 8 ++------ web/htdocs/weblib.py | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/web/htdocs/page_logwatch.py b/web/htdocs/page_logwatch.py index 41eeef2..ac4c7ad 100644 --- a/web/htdocs/page_logwatch.py +++ b/web/htdocs/page_logwatch.py @@ -29,9 +29,7 @@ from lib import * import views -def page(h): - global html - html = h +def page(): host = html.var('host') filename = html.var('file') diff --git a/web/htdocs/permissions.py b/web/htdocs/permissions.py index 1c5bb28..a1a4e21 100644 --- a/web/htdocs/permissions.py +++ b/web/htdocs/permissions.py @@ -32,9 +32,7 @@ from lib import * # * Permissions for actions -def page_view_permissions(h): - global html - html = h +def page_view_permissions(): html.header("My permissions") html.write("<p>You have the following permissions:</p>") html.write("<h2>General permissions</h2>\n<ul>") @@ -53,9 +51,7 @@ def page_view_permissions(h): html.write("</ul>\n") html.footer() -def page_edit_permissions(h): - global html - html = h +def page_edit_permissions(): if not config.may("edit_permissions"): raise MKAuthException("You are not allowed to edit permissions.") diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 29b2555..238156f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -723,9 +723,7 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): html.write("</td></tr></table>") html.write("</div>") -def ajax_get_edit_column(h): - global html - html = h +def ajax_get_edit_column(): if not config.may("edit_views"): raise MKAuthException("You are not allowed to edit views.") @@ -1991,9 +1989,7 @@ def get_context_link(user, viewname): else: return None -def ajax_export(h): - global html - html = h +def ajax_export(): load_views() for name, view in html.available_views.items(): view["owner"] = '' diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index b316091..5794541 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -56,7 +56,7 @@ def set_tree_states(tree, val): load_tree_states() treestates[tree] = val -def ajax_tree_openclose(h): +def ajax_tree_openclose(): load_tree_states() tree = html.var("tree")

13 years, 5 months

Check_MK Git: check_mk: f5_bigip_psu: fix missing dot in oid

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d7fc8afc1e8e11deab9d7795b0ac2708ba02739 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d7fc8afc1e8e1… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 24 10:16:12 2011 +0200 f5_bigip_psu: fix missing dot in oid --- checks/f5_bigip_psu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/f5_bigip_psu b/checks/f5_bigip_psu index 6d45abb..73611e5 100644 --- a/checks/f5_bigip_psu +++ b/checks/f5_bigip_psu @@ -70,7 +70,7 @@ def check_f5_bigip_psu(item, _no_params, info): # Get ID and status from the SysChassisPowerSupplyTable snmp_info["f5_bigip_psu"] = \ - [ ("1.3.6.1.4.1.3375.2.1.3.2.2.2.1", [ 1, 2 ]), ] + [ (".1.3.6.1.4.1.3375.2.1.3.2.2.2.1", [ 1, 2 ]), ] check_info["f5_bigip_psu"] = (check_f5_bigip_psu, "PSU %s", 1, inventory_f5_bigip_psu )

13 years, 5 months

Check_MK Git: check_mk: WATO: do not size tables to 100%

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2057804531d8f49c88eecbd8ae844e0995aa51ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2057804531d8f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 14:31:40 2011 +0200 WATO: do not size tables to 100% --- web/htdocs/check_mk.css | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a01dd33..7fd6f05 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1760,6 +1760,11 @@ table.add_snapin i { */ +/* Tables in WATO are not size to 100% per default */ +.wato table.data { + width: auto; +} + .wato th.left { border-left-style: none; -moz-border-radius: 4px 0px 0px 0px; @@ -1851,7 +1856,7 @@ table.add_snapin i { } .wato td.takeall { - width: 100%; + /* width: 100%; */ } .wato div.inherited {

13 years, 5 months

Check_MK Git: check_mk: WATO: disabled debug output of check_mk --automation again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b35cceb5a5837fc7b09615a0aeeee55ad52e62e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b35cceb5a5837f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 14:23:19 2011 +0200 WATO: disabled debug output of check_mk --automation again --- web/htdocs/wato.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c51ed0b..550bf9d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1492,8 +1492,10 @@ def check_mk_automation(command, args=[], indata=""): (html.apache_user(), sudoline)) try: - if config.debug: - html.write("<div class=message>Running <tt>%s</tt></div>\n" % " ".join(cmd)) + # This debug output makes problems when doing bulk inventory, because + # it garbles the non-HTML response output + # if config.debug: + # html.write("<div class=message>Running <tt>%s</tt></div>\n" % " ".join(cmd)) p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except Exception, e:

13 years, 5 months

Check_MK Git: check_mk: Make --profile also work in --automation mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1447e5c5ad22d87743cc8d048930d0a6f911a1e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1447e5c5ad22d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 14:05:28 2011 +0200 Make --profile also work in --automation mode --- modules/automation.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 298fa97..7cdd140 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -52,6 +52,7 @@ def do_automation(cmd, args): sys.stderr.write("%s\n" % e) if opt_debug: raise + output_profile() sys.exit(1) except Exception, e: @@ -59,6 +60,7 @@ def do_automation(cmd, args): raise else: sys.stderr.write("%s\n" % e) + output_profile() sys.exit(2) if opt_debug: @@ -66,6 +68,7 @@ def do_automation(cmd, args): sys.stdout.write(pprint.pformat(result)+"\n") else: sys.stdout.write("%r\n" % (result,)) + output_profile() sys.exit(0) # Does inventory for *one* host. Possible values for how:

13 years, 5 months

Check_MK Git: check_mk: WATO: fix bug: full scan now really only on [ Full Scan]

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 77c446133d42bf13cee9dfff213bd04ddfe2c8a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77c446133d42bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 14:06:10 2011 +0200 WATO: fix bug: full scan now really only on [Full Scan] --- modules/automation.py | 4 +++- web/htdocs/wato.py | 16 +++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 7cdd140..8bd7e1a 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -124,8 +124,10 @@ def automation_inventory(args): def automation_try_inventory(args): if args[0] == '--cache': - global opt_use_cachefile + global opt_use_cachefile, inventory_max_cachefile_age, check_max_cachefile_age opt_use_cachefile = True + check_max_cachefile_age = 1000000000 + inventory_max_cachefile_age = 1000000000 args = args[1:] hostname = args[0] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 48e7ee2..c51ed0b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -799,7 +799,7 @@ def mode_inventory(phase, firsttime): if phase == "title": title = _("Services of host %s") % hostname - if html.var("scan"): + if html.var("_scan"): title += _(" (live scan)") else: title += _(" (cached data)") @@ -808,11 +808,11 @@ def mode_inventory(phase, firsttime): elif phase == "buttons": html.context_button(_("Host list"), make_link([("mode", "file")])) html.context_button(_("Edit host"), make_link([("mode", "edithost"), ("host", hostname)])) - html.context_button(_("Full Scan"), html.makeuri([("scan", "yes")])) + html.context_button(_("Full Scan"), html.makeuri([("_scan", "yes")])) elif phase == "action": if html.check_transaction(): - cache_options = not html.var("scan") and [ '--cache' ] or [] + cache_options = not html.var("_scan") and [ '--cache' ] or [] table = check_mk_automation("try-inventory", cache_options + [hostname]) table.sort() active_checks = {} @@ -1000,11 +1000,11 @@ def mode_bulk_inventory(phase): hostname = html.var("_item") try: counts = check_mk_automation("inventory", [how, hostname]) - result = repr([ 'continue', 0 ] + list(counts)) + "\n" + result = repr([ 'continue', 1, 0 ] + list(counts)) + "\n" result += _("Inventorized %s<br>\n") % hostname log_pending(hostname, "bulk-inventory", _("Inventorized host: %d added, %d removed, %d kept, %d total services") % counts) except Exception, e: - result = repr([ 'failed', 1, 0, 0, 0, 0, ]) + "\n" + result = repr([ 'failed', 1, 1, 0, 0, 0, 0, ]) + "\n" result += _("Error during inventory of %s: %s<br>\n") % (hostname, e) html.write(result) return "" @@ -1019,7 +1019,7 @@ def mode_bulk_inventory(phase): interactive_progress( hostnames, # list of items _("Bulk inventory"), # title - [ (_("Failed hosts"), 0), (_("Services added"), 0), (_("Services removed"), 0), + [ (_("Total hosts"), 0), (_("Failed hosts"), 0), (_("Services added"), 0), (_("Services removed"), 0), (_("Services kept"), 0), (_("Total services"), 0) ], # stats table [ ("mode", "file") ], # URL for "Stop/Finish" button 50, # ms to sleep between two steps @@ -1492,6 +1492,8 @@ def check_mk_automation(command, args=[], indata=""): (html.apache_user(), sudoline)) try: + if config.debug: + html.write("<div class=message>Running <tt>%s</tt></div>\n" % " ".join(cmd)) p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) except Exception, e: @@ -1909,7 +1911,7 @@ def changelog_button(): def show_service_table(hostname, firsttime): # Read current check configuration - cache_options = not html.var("scan") and [ '--cache' ] or [] + cache_options = not html.var("_scan") and [ '--cache' ] or [] table = check_mk_automation("try-inventory", cache_options + [hostname]) table.sort()

13 years, 5 months

Check_MK Git: check_mk: vbox_guest: handle case where VBoxControl fails

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 840785f476704aaeceb6d090080d0973e28ef3d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=840785f476704a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 11:50:18 2011 +0200 vbox_guest: handle case where VBoxControl fails --- agents/check_mk_agent.linux | 1 + checks/vbox_guest | 28 ++-------------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a0777e5..d11c237 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -291,6 +291,7 @@ fi echo '<<<vbox_guest>>>' if which VBoxControl > /dev/null 2>&1 ; then VBoxControl -nologo guestproperty enumerate | cut -d, -f1,2 + [ ${PIPESTATUS[0]} = 0 ] || echo "ERROR" fi diff --git a/checks/vbox_guest b/checks/vbox_guest index 065522e..5fbcd19 100644 --- a/checks/vbox_guest +++ b/checks/vbox_guest @@ -1,35 +1,11 @@ #!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -#!/usr/bin/python def vbox_guest_make_dict(info): return dict([(l[1].split('/',2)[2].rstrip(','), l[3]) for l in info]) def check_vbox_guest(item, _no_params, info): + if len(info) == 1 and info[0][0] == "ERROR": + return (3, "UNKNOWN - Error running VBoxControl guestproperty enumerate") try: d = vbox_guest_make_dict(info) except:

13 years, 5 months

Check_MK Git: check_mk: vbox_guest: fix agent output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4401b23fdc69744446b59ea29a01433cf4e4821a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4401b23fdc6974… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 11:42:58 2011 +0200 vbox_guest: fix agent output --- agents/check_mk_agent.linux | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 6e4bbd2..a0777e5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -289,7 +289,7 @@ fi # check would not be executed in case no guest additions are installed. # And that is something the check wants to detect echo '<<<vbox_guest>>>' -if which VBoxControl ; then +if which VBoxControl > /dev/null 2>&1 ; then VBoxControl -nologo guestproperty enumerate | cut -d, -f1,2 fi

13 years, 5 months

Check_MK Git: check_mk: vbox_guest: new check for checking guest additions in VBox hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6abfb879f99a6fac29330038c3b58d24af10d9f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6abfb879f99a6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 11:37:06 2011 +0200 vbox_guest: new check for checking guest additions in VBox hosts --- ChangeLog | 1 + agents/check_mk_agent.linux | 9 ++++++ checkman/vbox_guest | 23 ++++++++++++++++ checks/vbox_guest | 59 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08aaceb..abded47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ also be lists of allowed states. * lnx_if: treat interfaces without information from ethtool as softwareLoopback interface. The will not be found by inventory now. + * vbox_guest: new check for checking guest additions of Linux virtual box hosts Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 445cbbf..6e4bbd2 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -285,6 +285,15 @@ if which vcbVmName > /dev/null 2>&1 ; then vcbVmName -s any fi +# VirtualBox Guests. Section must always been output. Otherwise the +# check would not be executed in case no guest additions are installed. +# And that is something the check wants to detect +echo '<<<vbox_guest>>>' +if which VBoxControl ; then + VBoxControl -nologo guestproperty enumerate | cut -d, -f1,2 +fi + + if which ntpq > /dev/null 2>&1 ; then echo '<<<ntp>>>' # remote heading, make first column space separated diff --git a/checkman/vbox_guest b/checkman/vbox_guest new file mode 100644 index 0000000..6db654e --- /dev/null +++ b/checkman/vbox_guest @@ -0,0 +1,23 @@ +title: Check version of VirtualBox guest additions in Linux guests +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check uses {VBoxControl} to query to version und revision of the + guest additions installed in a VirtualBox Linux guest. If no guest additions + are installed at all, the check will get critical. if the version and + revision of the guest additions do not match the version and revision + of the virtual box host, the check will warn. + +inventory: + One check will be created on each Linux VBox host having guest + additions installed(!). If you want to force the check on {all} + of your Linux guests, you need to configure explicit checks using + {checks=}. + +examples: + # Force this check on all hosts with the tags {vboxguest} and {linux}. + checks += [ + ( ["vboxguest", "linux"], ALL_HOSTS, "vbox_guest", None, None ), + ] diff --git a/checks/vbox_guest b/checks/vbox_guest new file mode 100644 index 0000000..065522e --- /dev/null +++ b/checks/vbox_guest @@ -0,0 +1,59 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +#!/usr/bin/python + +def vbox_guest_make_dict(info): + return dict([(l[1].split('/',2)[2].rstrip(','), l[3]) for l in info]) + +def check_vbox_guest(item, _no_params, info): + try: + d = vbox_guest_make_dict(info) + except: + d = {} + + if len(d) == 0: + return (2, "CRIT - No guest additions installed") + + version = d.get('GuestAdd/Version') + revision = d.get('GuestAdd/Revision') + if not version or not version[0].isdigit(): + return (3, "UNKNOWN - No guest addition version available") + infotext = " - version: %s, revision: %s" % (version, revision) + + host_version = d['HostInfo/VBoxVer'] + host_revision = d['HostInfo/VBoxRev'] + if (host_version, host_revision) != (version, revision): + return (1, "WARN" + infotext + ", Host has %s/%s" % (host_version, host_revision)) + else: + return (0, "OK" + infotext) + +def inventory_vbox_guest(checktype, info): + if len(info) > 0: + return [(None, None)] + +check_info["vbox_guest"] = ( check_vbox_guest, "VBox Guest Additions", 0, inventory_vbox_guest) +

13 years, 5 months

Check_MK Git: check_mk: Updateded file headers in some files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22916f9f2c0b2a5f5e63e3a8a4df79d36aa9b90c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22916f9f2c0b2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 23 11:40:20 2011 +0200 Updateded file headers in some files --- checks/brocade_fcport | 51 ++++++++++++++++++------------------- checks/mbg_lantime_refclock | 2 +- checks/mbg_lantime_state | 2 +- checks/omd_status | 26 +++++++++++++++++++ checks/smart | 2 +- checks/windows_updates | 2 +- modules/agent_simulator.py | 24 ++++++++++++++++++ web/htdocs/bi.py | 25 ++++++++++++++++++- web/plugins/dashboard/builtin.py | 26 ++++++++++++++++++- web/plugins/pages/bi.py | 26 +++++++++++++++++++ web/plugins/views/bi.py | 26 +++++++++++++++++++ 11 files changed, 180 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=22916f9f2c…

13 years, 5 months

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011