Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

Check_MK Git: check_mk: WATO: visibility fix for attributes.

by git＠mathias-kettner.de

uncheck checkboxes of hidden fields User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bcae94d5ce4607d4a7c6394019ab348e146370ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcae94d5ce4607… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 31 17:55:12 2012 +0200 WATO: visibility fix for attributes. uncheck checkboxes of hidden fields --- web/htdocs/js/wato.js | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index f83c5a0..4408194 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -54,6 +54,12 @@ function wato_check_all(css_class) { function wato_toggle_attribute(oCheckbox, attrname) { var oEntry = document.getElementById("attr_entry_" + attrname); var oDefault = document.getElementById("attr_default_" + attrname); + + // Permanent invisible attributes do + // not have attr_entry / attr_default + if( !oEntry ){ + return; + } if (oCheckbox.checked) { oEntry.style.display = ""; oDefault.style.display = "none"; @@ -170,6 +176,11 @@ function wato_fix_visibility() { oTr.appendChild(oAttrDisp); } if ( display == "none" ) { + // Uncheck checkboxes of hidden fields + var chkbox = oAttrDisp.parentNode.childNodes[0].childNodes[1].childNodes[0]; + chkbox.checked = false; + wato_toggle_attribute(chkbox, attrname); + oAttrDisp.value = "0"; } else { oAttrDisp.value = "1";

11 years, 10 months

Check_MK Git: check_mk: Fixed optical output of airlaser check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 39f666d6a5f05661532a71a9809897270f2749ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39f666d6a5f056… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 17:50:56 2012 +0200 Fixed optical output of airlaser check --- checks/cbl_airlaser | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/cbl_airlaser b/checks/cbl_airlaser index f1a068b..d38fdfd 100644 --- a/checks/cbl_airlaser +++ b/checks/cbl_airlaser @@ -43,11 +43,11 @@ def check_cbl_airlaser_status(item, _no_params, info): if status == "1": return (0, "OK - Airlaser: normal operation") elif status == "2": - return (1, "WARNING - (!)Airlaser: testing mode") + return (1, "WARN - Airlaser: testing mode") elif status == "3": - return (1, "WARNING - (!)Airlaser: warning condition") + return (1, "WARN - Airlaser: warning condition") elif status == "4": - return (2, "CRITICAL - (!!)Airlaser: a component has failed self-tests") + return (2, "CRIT - Airlaser: a component has failed self-tests") return (3, "UNKNOWN - Unknown data from agent")

11 years, 10 months

Check_MK Git: check_mk: Fix syntax error in OpenVMS agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d1f2f4ecc43018bb4783caa5d5561665b7dd89a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1f2f4ecc43018… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 15:12:48 2012 +0200 Fix syntax error in OpenVMS agent --- agents/check_mk_agent.openvms | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 6c847af..f6fd470 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -147,8 +147,8 @@ $if f$element(0," ",cLine) .eqs. "Free" then - freeMem = f$element(0,".",f$element(4," ",cLine)) $if f$element(0," ",cLine) .eqs. "Process" then - sys3 = f$element(3," ",cLine) -$if f$element(0," ",cLine) .eqs. "Direct" then - sys1 = f$element(4," ",cLine) +$if f$element(0," ",cLine) .eqs. "Direct" then - +sys1 = f$element(4," ",cLine) $if f$element(0," ",cLine) .eqs. "Buffered" then - sys2 = f$element(4," ",cLine) $goto CMSline

11 years, 10 months

Check_MK Git: check_mk: OpenVMS Agent: removed comment

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 461ebd1d77b73b16c1fdd185a89e05254a5a9b26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=461ebd1d77b73b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 15:05:59 2012 +0200 OpenVMS Agent: removed comment --- agents/check_mk_agent.openvms | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index bb5e03f..6c847af 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -23,18 +23,6 @@ $!# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, $!# Boston, MA 02110-1301 USA. $!# $!# Author: Paul Aebersold, netPuls info(a)netpuls.info -$!/<snip> -$!############################################################################# -$!# File: check_mk.openvms -$!# -$!# Created: 7-Jul-2012 -$!# Modified: 31-Jul-2012 -$!# Version: RC2 (2.5-6) -$!# -$!# Parameter: none -$!# Abstract: New version intended for use with check_MK -$!############################################################################# -$!<snip>/ $if p1 .nes. "" then set verify $msgOff := set message/nofacility/noseverity/noidentification/notext $msgOn := set message/facility/severity/identification/text

11 years, 10 months

Check_MK Git: check_mk: Fixed version in VMS agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 35824f05f42355bda79d7301f3aa0810a1a78b5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35824f05f42355… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 15:05:01 2012 +0200 Fixed version in VMS agent --- agents/check_mk_agent.openvms | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index e09cec2..bb5e03f 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -174,7 +174,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 2.5-6" +$say "Version: 1.2.0p3" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'"

11 years, 10 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: 65bfaebed1c1f22e4b2446353cf680b893425e71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65bfaebed1c1f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 14:48:57 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Neu Version of OpenVMS agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b8b398eae89a7c9aed72e54af621377e39420cac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8b398eae89a7c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 31 14:48:51 2012 +0200 Neu Version of OpenVMS agent --- agents/check_mk_agent.openvms | 498 ++++++++++++++++++++++------------------- 1 files changed, 262 insertions(+), 236 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b8b398eae8…

11 years, 10 months

Check_MK Git: check_mk: New check: CAREL Uniflair airconditioning

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 88068373778204cae123fab8ac6e72ff49f2eca6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88068373778204… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 31 13:40:20 2012 +0200 New check: CAREL Uniflair airconditioning --- ChangeLog | 1 + checkman/carel_uniflair_cooling | 37 ++++++++++++++++ checks/carel_uniflair_cooling | 82 ++++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 8 ++++ 4 files changed, 128 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b80b58..ea692af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * FIX: windows agent: try to fix crash in event log handling * FreeBSD Agent: Added swapinfo call to mem section to make mem check work again * windows_multipath: Added the missing check for multipath.vbs (Please test) + * carel_uniflair_cooling: new check for monitoring datacenter air conditioning by "CAREL" WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/carel_uniflair_cooling b/checkman/carel_uniflair_cooling new file mode 100644 index 0000000..50c3453 --- /dev/null +++ b/checkman/carel_uniflair_cooling @@ -0,0 +1,37 @@ +title: Check Carel Uniflair Cooling devices +agents: snmp +author: Andreas Boesl <ab(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors parameters of datacenter cooling devices + using a SNMP interface made by CAREL, which is i.e. used in the + Uniflair series of ACs. + + The check only monitors part of the data supported by the MIB + since the MIB does not give info about potential values in + some OIDs. + + The check queries and goes to {CRIT} for any of these values: + the global status (this should catch any error) + water loss (one of multiple water-related values), + emergency operation mode (this is triggered following a + failure, running at maximum performance) + + The check also queries the air humidity level, but currently + does not allow setting a level on this. + + +item: + This check generates no item. + +perfdata: + None + +inventory: + The check first looks for a cooling device vendor (this + is where it needs to be extended to cover other Carel devices), + then for the SNMP management device, and then for the MIB region + for cooling devices. + If all of these are found, the inventory creates a single service. + diff --git a/checks/carel_uniflair_cooling b/checks/carel_uniflair_cooling new file mode 100755 index 0000000..de60c4c --- /dev/null +++ b/checks/carel_uniflair_cooling @@ -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. + + +# snmp_scan_function +#.1.3.6.1.2.1.1.4.0 = STRING: x.name(a)green-cooling.de < green-cooling match +#.1.3.6.1.2.1.1.5.0 = STRING: pCOWeb < pcoweb match +#.1.3.6.1.4.1.9839.1 < exists + +# snmp_info +#.1.3.6.1.4.1.9839.2.1.1.31.0 = INTEGER: 0 < Waterloss +#.1.3.6.1.4.1.9839.2.1.1.51.0 = INTEGER: 1 < Global +#.1.3.6.1.4.1.9839.2.1.1.67.0 = INTEGER: 0 < Unit in Emergeny operation +#.1.3.6.1.4.1.9839.2.1.2.6.0 = INTEGER: 246 < Humidifier: Relative Humidity + + +def inventory_carel_uniflair_cooling(info): + return [ (None, None) ] + + +def check_carel_uniflair_cooling(item, _no_params, info): + waterloss, global_status, ermergency_op, humidity = info[0] + + err_waterloss = waterloss != "0" + err_global_status = global_status != "1" + err_emergency_op = ermergency_op != "0" + humidity = float(humidity)/10 + + output = "" + output = output + ( "Global Status:%s" % (err_global_status and "(!!)Error, " or "OK, " )) + output = output + ( "Emergency Operation:%s" % (err_emergency_op and "(!!)Active, " or "Inactive, ")) + output = output + ( "Humidifier:%s" % (err_waterloss and "(!!)Water Loss, " or "No Water Loss, " )) + output = output + "Humidity: %3.1f%%" % humidity + + + perfdata = [ ("humidity", humidity) ] + if err_waterloss or err_global_status or err_emergency_op: + return (2, "CRITICAL - %s" % output, perfdata) + else: + return (0, "OK - %s" % output, perfdata) + + return (3, "UNKNOWN - Unknown data from agent", perfdata) + + +check_info["carel_uniflair_cooling"] = { + "check_function" : check_carel_uniflair_cooling, + "inventory_function" : inventory_carel_uniflair_cooling, + "service_description" : "Carel uniflair cooling", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: "green-cooling" in oid(".1.3.6.1.2.1.1.4.0").lower() \ + and "pcoweb" in oid(".1.3.6.1.2.1.1.5.0").lower() \ + and oid(".1.3.6.1.4.1.9839.1.2.0"), + "snmp_info" : (".1.3.6.1.4.1.9839.2.1", [ + "1.31.0", # Waterloss + "1.51.0", # Global + "1.67.0", # Unit in Emergency operation + "2.6.0", # Relative Humidity + ]), +} diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 43c719e..9f4cfdf 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -582,3 +582,11 @@ def perfometer_cmc_lcp(row, check_command, perf_data): return "%.1f %s" % (val,unit), perfometer_logarithmic(val, 4, 2, color) perfometers["check_mk-cmc_lcp"] = perfometer_cmc_lcp + + +def perfometer_carel_uniflair_cooling(row, check_command, perf_data): + humidity = float(perf_data[0][1]) + return "%3.1f%%" % humidity, perfometer_linear(humidity, '#6f2') + +perfometers['check_mk-carel_uniflair_cooling'] = perfometer_carel_uniflair_cooling +

11 years, 10 months

Check_MK Git: check_mk: Fix errors in Check manpage

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1a427555bf9d060ff053b454c8a5eebe032880e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1a427555bf9d0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 31 13:40:42 2012 +0200 Fix errors in Check manpage --- checkman/wut_webio_io | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/checkman/wut_webio_io b/checkman/wut_webio_io index c800d4c..83ac8ae 100644 --- a/checkman/wut_webio_io +++ b/checkman/wut_webio_io @@ -17,10 +17,3 @@ perfdata: inventory: All channels are automatically inventorized with their state. - - -[parameters] - This check has no user-configurable parameters. - -[configuration] - This check has no user-configurable parameters.

11 years, 10 months

Check_MK Git: check_mk: Add windows_multipath

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 620dc1adbb882cd64f51fe79c15e369f43ce0ac7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=620dc1adbb882c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 31 11:34:22 2012 +0200 Add windows_multipath --- ChangeLog | 1 + checkman/windows_multipath | 21 ++++++++++++++ checks/windows_multipath | 67 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c07cbab..6b80b58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ Please refer to the check manpage of df for details * FIX: windows agent: try to fix crash in event log handling * FreeBSD Agent: Added swapinfo call to mem section to make mem check work again + * windows_multipath: Added the missing check for multipath.vbs (Please test) WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/windows_multipath b/checkman/windows_multipath new file mode 100644 index 0000000..92d586a --- /dev/null +++ b/checkman/windows_multipath @@ -0,0 +1,21 @@ +title: Check Multipathing on Windows +agents: windows +author: Florian Heigl <fh(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors number of active multipaths on a Windows host. + If this number equals the number recorded at inventory time, + the check will return {OK}, or otherwise {WARN} if there are still + more than 50% of paths left operative. + Anything less than 50% of working paths will turn into a {CRIT} state. + + +item: + No item is generated by the check. + + +inventory: + One service is created if there's a number of paths returned from the + API. In our tests this was only if the system had actual storage assigned. + diff --git a/checks/windows_multipath b/checks/windows_multipath new file mode 100755 index 0000000..320a963 --- /dev/null +++ b/checks/windows_multipath @@ -0,0 +1,67 @@ +#!/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. + + +# Agent output: +#<<<windows_multipath>>> +#4 +# (yes, thats all) + + +def inventory_windows_multipath(info): + if len(info) > 0: + num_paths = saveint(info[0][0]) + if num_paths > 0: + return [ (None, num_paths ) ] + return [] + + +def check_windows_multipath(item, params, info): + num_paths = saveint(info[0][0]) + all_paths = params + + # Anything less than 51% of paths is considered crit + if num_paths == all_paths: + state = 0 + elif num_paths <= all_paths / 2: + state = 2 + elif num_paths < all_paths: + state = 1 + + + return (state, nagios_state_names[state] + " - paths reported %d, expected paths %d" % (num_paths, all_paths) + state * "!") + + + + return (3, "UNKNOWN - Data not in agent output") + + +check_info["windows_multipath"] = { + "check_function" : check_windows_multipath, + "inventory_function" : inventory_windows_multipath, + "service_description": "Multipath", + "has_perfdata" : False, +}

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012