Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 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: 9fc11c673b4aae9a966d2c11e99037ce64a1256f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fc11c673b4aae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 18 14:14:27 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog checks/lnx_if ---

13 years, 3 months

Check_MK Git: check_mk: Dashboard: make shadow border, fix computation problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 821e4fa4fc33ff45fb3fedb7517813a65a4e8a8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=821e4fa4fc33ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 18 12:12:45 2011 +0200 Dashboard: make shadow border, fix computation problems --- web/htdocs/check_mk.css | 68 ++++++++++++++++++++++++++++++++--- web/htdocs/config.py | 2 +- web/htdocs/dashboard.py | 73 +++++++++++++++++++++++++++---------- web/htdocs/images/dashadow-e.png | Bin 0 -> 197 bytes web/htdocs/images/dashadow-n.png | Bin 0 -> 202 bytes web/htdocs/images/dashadow-ne.png | Bin 0 -> 371 bytes web/htdocs/images/dashadow-nw.png | Bin 0 -> 333 bytes web/htdocs/images/dashadow-s.png | Bin 0 -> 199 bytes web/htdocs/images/dashadow-se.png | Bin 0 -> 363 bytes web/htdocs/images/dashadow-sw.png | Bin 0 -> 363 bytes web/htdocs/images/dashadow-w.png | Bin 0 -> 200 bytes web/htdocs/js/dashboard.js | 35 ++++++++++++++++-- web/plugins/dashboard/builtin.py | 50 ++++++++++++++++--------- 13 files changed, 181 insertions(+), 47 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=821e4fa4fc…

13 years, 3 months

Check_MK Git: check_mk: lnx_if: treat non-ethtool-aware interfaces as softwareLoopback

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cc2b26c74adbd110a2369da15b61c3209b312ba7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc2b26c74adbd1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 16 11:09:26 2011 +0200 lnx_if: treat non-ethtool-aware interfaces as softwareLoopback --- ChangeLog | 3 +++ checks/lnx_if | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 458f230..30d9edc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ default thresholds to 5/10 refclock offset * brocade_port: parameter for phystate, opstate and admstate can now 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. + (Thanks to Karl-Heinz Fiebig) Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checks/lnx_if b/checks/lnx_if index 0a9e776..6af982f 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -85,6 +85,7 @@ def if_lnx_convert_to_if64(info): speed_text = attr.get("Speed") if speed_text == None: ifSpeed = '' + ifType = 24 else: if speed_text == '65535Mb/s': # unknown ifSpeed = '' @@ -96,6 +97,7 @@ def if_lnx_convert_to_if64(info): ifSpeed = int(speed_text[:-4]) * 1000000000 else: ifSpeed = '' + ifType = 24 # Link state from ethtool. If ethtool has no information about # this NIC, we set the state to unknown.

13 years, 3 months

Check_MK Git: check_mk: Dashboard: make links of views target main frame

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c613d33edef76ec76cfd86c735a253fe2f9494f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c613d33edef76… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 18 14:13:29 2011 +0200 Dashboard: make links of views target main frame --- web/htdocs/dashboard.py | 2 +- web/htdocs/htmllib.py | 14 +++++++++++++- web/htdocs/views.py | 9 ++++++++- web/plugins/dashboard/builtin.py | 13 +++++++------ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 3070810..000c63b 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -41,7 +41,7 @@ builtin_dashboards = {} # in order to allow the user to customize this. header_height = 40 # Distance from top of the screen to the lower border of the heading -screen_margin = 10 # Distance from the left border of the main-frame to the dashboard area +screen_margin = 5 # Distance from the left border of the main-frame to the dashboard area dashlet_padding = 8 # Margin between outer border of dashlet and its content raster = 32, 32 # Raster the dashlet choords are measured in diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d9c1ad2..430448c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -159,6 +159,7 @@ class html: self.header_sent = False self.output_format = "html" self.status_icons = {} + self.link_target = None def plugin_stylesheets(self): global plugin_stylesheets @@ -179,6 +180,9 @@ class html: def set_output_format(self, f): self.output_format = f + def set_link_target(self, framename): + self.link_target = framename + def write(self, text): if type(text) == unicode: text = text.encode("utf-8") @@ -476,6 +480,13 @@ class html: self.write(title) self.write('''</title> <link rel="stylesheet" type="text/css" href="check_mk.css">''') + + # If the variable _link_target is set, then all links in this page + # should be targetted to the HTML frame named by _link_target. This + # is e.g. useful in the dash-board + link_target = self.var("_link_target") + if self.link_target: + self.write('<base target="%s">' % link_target) # Load all style sheets in htdocs/css for css in self.plugin_stylesheets(): @@ -649,7 +660,8 @@ class html: self.req.vars[varname] = value def del_var(self, varname): - del self.req.vars[varname] + if varname in self.req.vars: + del self.req.vars[varname] def javascript(self, code): self.write("<script language=\"javascript\">\n%s\n</script>\n" % code) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4955d45..29b2555 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1006,7 +1006,7 @@ def get_needed_columns(painters): # Display view with real data. This is *the* function everying # is about. def show_view(view, show_heading = False, show_buttons = True, show_footer = True): - all_display_options = "HTBFCEOZRSIXD" + all_display_options = "HTBFCEOZRSIXDM" # Parse display options and if html.output_format == "html": @@ -1023,6 +1023,13 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru display_options += c html.display_options = display_options + # If display option 'M' is set, then all links are targetet to the 'main' + # frame. Also the display options are removed since the view in the main + # frame should be displayed in standard mode. + if 'M' not in display_options: + html.set_link_target("main") + html.del_var("display_options") + # [1] Datasource datasource = multisite_datasources[view["datasource"]] tablename = datasource["table"] diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 2d20fc7..e54cf74 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -6,19 +6,20 @@ builtin_dashboards = { "title" : "Host problems", "content" : "0", "position" : (1, 1), - "size" : (4, 4), + "size" : (20, 0), }, { "title" : "Host problems", - "content" : "1", - "position" : (5, 5), - "size" : (4, 4), + # "content" : "1", + "content" : '<iframe width="100%" height="100%" src="http://localhost/lancom/check_mk/view.py?host=&opthostgroup=&view_name=allh…"></iframe>', + "position" : (21, 1), + "size" : (0, 0), }, { "title" : "Host problems", "content" : "2x1 @ 4,2", - "position" : (5, 1), - "size" : (0, 0), + "position" : (1, -1), + "size" : (0, 8), }, # { # "title" : "Anderer Host",

13 years, 3 months

Check_MK Git: check_mk: new check: f5_bigip PSU - powersupply status for f5 load balancers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 968e8df53efe5891e4f924599c61e7bb506233f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=968e8df53efe58… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 17 10:18:45 2011 +0200 new check: f5_bigip PSU - powersupply status for f5 load balancers --- checkman/f5_bigip_psu | 21 +++++++++++++ checks/f5_bigip_psu | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/checkman/f5_bigip_psu b/checkman/f5_bigip_psu new file mode 100644 index 0000000..6325a39 --- /dev/null +++ b/checkman/f5_bigip_psu @@ -0,0 +1,21 @@ +title: Check status of system fans on F5 Big-IP +agents: snmp +author: Florian Heigl <fh(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) for the + status of the power supplies. These may be redundant or not. + + It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 + devices. + + + +inventory: + The check gather a list of the existing power supplies in a system. + One service is created per power supply (PSU) + + +perfdata: + the check does not generate performance data. diff --git a/checks/f5_bigip_psu b/checks/f5_bigip_psu new file mode 100644 index 0000000..6d45abb --- /dev/null +++ b/checks/f5_bigip_psu @@ -0,0 +1,81 @@ +#!/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. + + +# Agent / MIB output +#SysChassisPowerSupplyEntry ::= +# SEQUENCE { +# sysChassisPowerSupplyIndex INTEGER, +# sysChassisPowerSupplyStatus INTEGER +# } + +# sysChassisPowerSupplyStatus +# bad(0), +# good(1), +# notpresent(2) + + + + +def inventory_f5_bigip_psu(checkname, info): + inventory = [] + for line in info: + psu, state = line[0] + # inventorize the PSU unless it's in state 2 (notpresent) + if state != "2": + inventory.append([("%s" % psu), None]) + return inventory + + +def check_f5_bigip_psu(item, _no_params, info): + for line in info: + psu = line[0][0] + state = int(line[0][1]) + if psu == item: + if state == 1: + return (0, "OK - PSU state: good") + elif state == 0: + return (2, "CRIT - PSU state: bad!!") + elif state == 2: + return (1, "WARN - PSU state: notpresent!") + else: + return (3, "UNKNOWN - PSU state is unknown") + + + return (3, "UNKNOWN - item not found in SNMP output") + + +# 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 ]), ] + + +check_info["f5_bigip_psu"] = (check_f5_bigip_psu, "PSU %s", 1, inventory_f5_bigip_psu ) + + +# Check using the vendor mib Id and verify it's a loadbalancer +snmp_scan_functions["f5_bigip_psu"] = \ + lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower()

13 years, 3 months

Check_MK Git: check_mk: lnx_if: treat non-ethtool-aware interfaces as softwareLoopback

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 14927b90ab4c3f0cf774cb9ab9615c65f1e01e65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14927b90ab4c3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 16 11:09:26 2011 +0200 lnx_if: treat non-ethtool-aware interfaces as softwareLoopback --- ChangeLog | 2 ++ checks/lnx_if | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 458f230..0b07818 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ default thresholds to 5/10 refclock offset * brocade_port: parameter for phystate, opstate and admstate can now 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. Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checks/lnx_if b/checks/lnx_if index 0a9e776..6477059 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -85,6 +85,7 @@ def if_lnx_convert_to_if64(info): speed_text = attr.get("Speed") if speed_text == None: ifSpeed = '' + ifType = 24 # Fiebig Karl-Heinz else: if speed_text == '65535Mb/s': # unknown ifSpeed = '' @@ -96,6 +97,7 @@ def if_lnx_convert_to_if64(info): ifSpeed = int(speed_text[:-4]) * 1000000000 else: ifSpeed = '' + ifType = 24 # Fiebig Karl-Heinz # Link state from ethtool. If ethtool has no information about # this NIC, we set the state to unknown.

13 years, 3 months

Check_MK Git: check_mk: WATO: allow comment in form subtitles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3621a863324ba0b3bcf08ce308daa8276fce5244 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3621a863324ba0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 16 10:14:38 2011 +0200 WATO: allow comment in form subtitles --- web/htdocs/check_mk.css | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index d401984..8fc70e5 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1696,7 +1696,13 @@ table.add_snapin i { font-size: 9pt; font-weight: normal; } -.wato table.form td.legend i { +.wato table.form td.title i { + font-weight: normal; + padding-bottom: 8px; +} + + +.wato table.form td.legend i, .wato table.form td.title i { margin-top: 13px; font-size: 9pt; color: #eee;

13 years, 3 months

Check_MK Git: check_mk: WATO: make API more flexible in one situation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f06a20f3b2b545a5829bfead3fb26069240e8e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f06a20f3b2b545… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 16 10:14:24 2011 +0200 WATO: make API more flexible in one situation --- web/htdocs/wato.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14933b6..48e7ee2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2524,11 +2524,12 @@ def have_folder_attributes(): # "bulk" -> bulk change # parent: The parent file/folder of the objects to configure # myself: For mode "folder" the folder/file itself -def configure_attributes(hosts, for_what, parent, myself=None): - # html.write("<pre>%s</pre>" % pprint.pformat(hosts)) +def configure_attributes(hosts, for_what, parent, myself=None, without_attributes = []): for attr in host_attributes: attrname = attr.name() + if attrname in without_attributes: + continue # e.g. needed to skip ipaddress in CSV-Import # In folder/file not all attributes are shown if for_what == "folder" and not attr.show_in_folder():

13 years, 3 months

Check_MK Git: check_mk: brocade_fcport: allow list of states

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a948c81763d63f8d794f67d17df23ae9c62cfc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a948c81763d63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 14 13:25:55 2011 +0200 brocade_fcport: allow list of states --- ChangeLog | 2 ++ checkman/brocade_fcport | 8 ++++---- checks/brocade_fcport | 9 ++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22b4d32..458f230 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) * mbg_lantime_state: Handling refclock offsets correctly now; Changed default thresholds to 5/10 refclock offset + * brocade_port: parameter for phystate, opstate and admstate can now + also be lists of allowed states. Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checkman/brocade_fcport b/checkman/brocade_fcport index 0a0ff8e..8837d99 100644 --- a/checkman/brocade_fcport +++ b/checkman/brocade_fcport @@ -102,14 +102,14 @@ parameters (dict): This check works with dictionary based parameters. The is turned on and all levels will be applied to the averaged values, not the the current ones. Per default, averaging is turned off. - {"phystate"}: The expected physical state of the port or {None} if that should - not be checked. + {"phystate"}: The expected physical state (integer) of the port or {None} if that should + not be checked. It is also allowed to specify a list of allowed states, e.g. {[1, 2, 3]}. {"opstate"}: The expected operational state of the port or {None} if that should - not be checked. + not be checked. It is also allowed to specify a list here. {"admstate"}: The expected adminstrative state of the port of {None} if that should - not be checked. + not be checked. It is also allowed to specify a list here. [configuration] diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 58f0ef2..d66ee53 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -247,7 +247,8 @@ def check_brocade_fcport(item, params, info): # P O R T S T A T E # Port Status (physical layer) errorflag = "" - if params.get("phystate") != None and phystate != params['phystate']: + if params.get("phystate") != None and phystate != params['phystate'] \ + and not (type(params['phystate']) == list and phystate in params['phystate']): # noCard (1), noTransceiver (2), laserFault (3), noLight (4), # noSync (5), inSync (6), portFault (7), diagFault (8), lockRef (9) if phystate in [1, 6]: @@ -260,7 +261,8 @@ def check_brocade_fcport(item, params, info): errorflag = "" #unknown(0) online(1) offline(2) testing(3) faulty(4) ] - if params.get("opstate") != None and opstate != params['opstate']: + if params.get("opstate") != None and opstate != params['opstate'] \ + and not (type(params['opstate']) == list and opstate in params['opstate']): if opstate in [1, 3]: errorflag = "(!)" summarystate = max(summarystate, 1) @@ -271,7 +273,8 @@ def check_brocade_fcport(item, params, info): errorflag = "" # online(1) offline(2) testing(3) faulty(4) - if params.get("admstate") and admstate != params['admstate']: + if params.get("admstate") and admstate != params['admstate'] \ + and not (type(params['admstate']) == list and admstate in params['admstate']): if admstate not in [2, 4]: errorflag = "(!)" summarystate = max(summarystate, 1)

13 years, 3 months

Check_MK Git: check_mk: Dashboards: intermediate state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0a920e67ea13e07aa967fabeb7b03d4efc8224d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a920e67ea13e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 13 18:16:55 2011 +0200 Dashboards: intermediate state --- web/.f12 | 3 +- web/htdocs/bi.py | 30 +--- web/htdocs/check_mk.css | 25 +++- web/htdocs/dashboard.py | 289 ++++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 10 +- web/htdocs/index.py | 16 +-- web/htdocs/js/check_mk.js | 68 +++++++++ web/htdocs/js/dashboard.js | 80 +++++++++++ web/htdocs/js/sidebar.js | 64 +-------- web/htdocs/lib.py | 24 +++ web/htdocs/main.py | 6 +- web/htdocs/sidebar.py | 34 +---- web/htdocs/views.py | 38 +---- web/htdocs/wato.py | 26 +--- web/plugins/dashboard/builtin.py | 43 ++++++ web/plugins/pages/shipped.py | 4 + web/plugins/sidebar/shipped.py | 4 +- web/plugins/sidebar/wato.py | 8 +- web/plugins/views/bi.py | 1 - web/plugins/views/painters.py | 2 +- web/plugins/views/perfometer.py | 14 +-- 21 files changed, 587 insertions(+), 202 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0a920e67ea…

13 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011