Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 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: 0874b3af0bb4d515d467d0fc766d03957dbfa4d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0874b3af0bb4d5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 11 14:59:53 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Added check blade_bx_powerfan

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a72cfbcb9cda69148fcf44a4d63d94380d7c840d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a72cfbcb9cda69… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 11 14:59:32 2012 +0200 Added check blade_bx_powerfan --- checks/blade_bx_powerfan | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/checks/blade_bx_powerfan b/checks/blade_bx_powerfan new file mode 100644 index 0000000..4229cd3 --- /dev/null +++ b/checks/blade_bx_powerfan @@ -0,0 +1,82 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + +blade_bx_fan_default_error_levels = (50, 40) # percentages or errors! + +blade_bx_status = { "1" : "unknow", + "2" : "disabled", + "3" : "ok", + "4" : "fail", + "5" : "prefailure-predicted", + "6" : "redundant-fan-failed", + "7" : "not-manageable", + "8" : "not-present", + "9" : "not-available" } + +def check_blade_bx_powerfan(item, params, info): + warn_perc, crit_perc = params + for index, status, descr, rpm, max_speed, speed, ctrlstate in info: + if descr != item: continue + he = 1 + speedperc = (int(rpm) * 100) / int(max_speed) + perfdata=[ ('perc', speedperc, warn_perc, crit_perc, "0", "100" ), + ('rpm', rpm ) ] + speedperc_int = saveint(speedperc) + + if ctrlstate != "2": + return (2, "CRIT - Fan not present or poweroff", perfdata) + elif status != "3": + return (2, "CRIT - Status not OK (Status %s)" % blade_bx_status(status) , perfdata) + elif speedperc_int <= crit_perc: + return (2, "CRIT - Speed at %d%% of max (crit at %d%%)" % (speedperc_int, crit_perc), perfdata) + elif speedperc_int <= warn_perc: + return (1, "WARNING - Speed at %d%% of max (warning at %d%%)" % (speedperc_int, warn_perc), perfdata) + else: + return (0, "OK - Speed at %s RPM (%d%% of max)" % (rpm, speedperc_int), perfdata) + return (3, "UNKNOWN - Device %s not found in SNMP data %s " % (item, perfdata ) ) + + return (3, "UNKNOWN - Device %s not found in SNMP data" % item) + + +check_info['blade_bx_powerfan'] = { + "check_function" : check_blade_bx_powerfan, + "inventory_function" : lambda info: [ (line[2], "blade_bx_fan_default_error_levels" ) for line in info ] , + "service_description" : "Blade Cooling %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.3.1.1", [ + 1, #index + 2, #status + 3, #desc + 4, #rpm + 5, #max_speed + 6, #speed + 7 # ctrlstate + + ]), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), +} +

11 years, 11 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: 2e526c8a7682cef005c2cabe0a8976f72cb79ac5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e526c8a7682ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 11 14:47:50 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: FIX: remove line about number of rules in rule set overview

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ca6e63d4006e4a0722d284e55ceb2d9106188dc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca6e63d4006e4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 11 14:47:48 2012 +0200 FIX: remove line about number of rules in rule set overview --- ChangeLog | 4 ++++ web/htdocs/wato.py | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2eb3c72..4044b1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ Checks & Agents: * mssql_backup: Fixed problems with datetime/timezone calculations + WATO: + * FIX: remove line about number of rules in rule set overview + (that garbled the logical layout) + BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b2e87fd..0954aa5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9341,11 +9341,6 @@ def mode_rulesets(phase): html.write('<a class="%s" href="%s">%s</a>' % (num_rules and "nonzero" or "zero", view_url, rulespec["title"])) html.write('<span class=dots>%s</span></div>' % ("." * 100)) - if num_local_rules: - if only_host: - title = _("There are %d rules explicitely listing this host." % num_local_rules) - else: - title = _("There are %d rules defined in the current folder." % num_local_rules) html.write('<div class="rulecount %s" title="%s">%d</div>' % (num_rules and "nonzero" or "zero", title, num_rules)) html.write('</div>')

11 years, 11 months

Check_MK Git: check_mk: Added blade_bx_load check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d789c21f867acb6183553ca5b8a674afa18373b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d789c21f867acb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 11 14:45:22 2012 +0200 Added blade_bx_load check --- checks/blade_bx_blades | 6 ++-- checks/blade_bx_load | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/checks/blade_bx_blades b/checks/blade_bx_blades index d6a3a91..b8ed7c4 100644 --- a/checks/blade_bx_blades +++ b/checks/blade_bx_blades @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_bx_blades(item, no_params, info): +def check_blade_bx_blades(item, no_params, info): blade_status_codes = { 1 : "Unknown", 2 : "OK", 3 : "not-present", 4 : "Error", 5 : "Critical", 6 : "Standby" } for blade_id, blade_status, blade_serial, blade_name in info: state = 0 @@ -38,7 +38,7 @@ def check_bx_blades(item, no_params, info): return (3, "UNKNOWN - no data for '%s' in SNMP info" % item) check_info['blade_bx_blades'] = { - "check_function" : check_bx_blades, + "check_function" : check_blade_bx_blades, "inventory_function" : lambda info: [ (line[0], None) for line in info if int(line[1]) != 3] , "service_description" : "Blade %s", "has_perfdata" : False, diff --git a/checks/blade_bx_load b/checks/blade_bx_load new file mode 100644 index 0000000..fef32b5 --- /dev/null +++ b/checks/blade_bx_load @@ -0,0 +1,56 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +blade_bx_cpuload_default_levels = ( 5, 20 ) + +def check_blade_bx_load(item, params, info): + try: + load = [] + for i in [ 0, 1, 2 ]: + load.append(float(info[i][2])) + except: + return (3, "Unknown - invalid or incomplete output from plugin %s - %s - %s " % (float(info[0][2]), float(info[1][2]), float(info[2][2]) ) ) + + warn, crit = params + + perfdata = [ ('load' + str(z), l, warn, crit, 0 ) for (z,l) in [ (1,load[0]), (5,load[1]), (15, load[2]) ] ] + + if load[2] >= crit: + return (2, "CRIT - 15min Load %.2f (critical at %.2f)" % (load[2], crit), perfdata) + elif load[2] >= warn: + return (1, "WARN - 15min Load %.2f (warning at %.2f)" % (load[2], warn), perfdata) + else: + return (0, "OK - 15min Load %.2f " % (load[2]), perfdata) + +check_info['blade_bx_load'] = { + "check_function" : check_blade_bx_load, + "inventory_function" : lambda info: [ (None, "blade_bx_cpuload_default_levels")] , + "service_description" : "Load", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.2021.10.1", [ 1, 2, 6 ]), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), + "group" : "cpu_utilization", +}

11 years, 11 months

Check_MK Git: check_mk: Added blades_bx check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9420494d26e41a9917d248c46aaad759f46d2284 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9420494d26e41a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 11 14:20:45 2012 +0200 Added blades_bx check --- ChangeLog | 1 + checks/blade_bx_blades | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2eb3c72..33aa77e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0p3: Checks & Agents: * mssql_backup: Fixed problems with datetime/timezone calculations + * New Checks for Siemens Blades (BX600) BI: * Great speed up of rule compilation in large environments diff --git a/checks/blade_bx_blades b/checks/blade_bx_blades new file mode 100644 index 0000000..d6a3a91 --- /dev/null +++ b/checks/blade_bx_blades @@ -0,0 +1,52 @@ +#!/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. + +def check_bx_blades(item, no_params, info): + blade_status_codes = { 1 : "Unknown", 2 : "OK", 3 : "not-present", 4 : "Error", 5 : "Critical", 6 : "Standby" } + for blade_id, blade_status, blade_serial, blade_name in info: + state = 0 + blade_status = saveint(blade_status) + if blade_id == item: + if blade_status == 4 or blade_status == 5: + state = 2 + + return (state, nagios_state_names[state] + " - Blade %s %s %s Status %s " % (blade_id, blade_name, blade_serial, blade_status_codes.get(blade_status, 1))) + + return (3, "UNKNOWN - no data for '%s' in SNMP info" % item) + +check_info['blade_bx_blades'] = { + "check_function" : check_bx_blades, + "inventory_function" : lambda info: [ (line[0], None) for line in info if int(line[1]) != 3] , + "service_description" : "Blade %s", + "has_perfdata" : False, + "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.4.2.1.1", [ + 1, # bladeId + 2, # bladestatus + 5, # Serialnumber + 21, # Name + ]), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), +}

11 years, 11 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: 88ec8e301e34b6eb3181ebe411b51be547c0c3d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88ec8e301e34b6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 11 14:20:53 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: ValueSpec Alternativ: fix layout in horizontal version

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 904f84ca90abeda098dfc34e77841831b68854b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=904f84ca90abed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 11 11:22:43 2012 +0200 ValueSpec Alternativ: fix layout in horizontal version --- web/htdocs/valuespec.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 546c5d5..511ebcb 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1047,9 +1047,7 @@ class MultiSelect(ListChoice): def render_input(self, varprefix, value): self.load_elements() - # background_css_hack = 'onChange="this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor"' - background_css_hack = "" - html.write("<select %s multiple name='%s'>" % (background_css_hack, varprefix)) + html.write("<select multiple name='%s'>" % varprefix) for nr, (key, title) in enumerate(self._elements): if key in value: sel = " selected" @@ -1524,6 +1522,9 @@ class Alternative(ValueSpec): checked = vs == mvs title = vs.title() + if not title and nr: + html.write("  ") + html.radiobutton(varprefix + "_use", str(nr), checked, title) if title: html.write("<ul>")

11 years, 11 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: e122fc2b0b84c51277f116ba986238a2ca68b9be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e122fc2b0b84c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 11 11:22:45 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8f02a3d4c79e9968e363b8568db779514fae706e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f02a3d4c79e99… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jul 11 10:46:28 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012