Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: Updated bug entries #2300

by Goetz Golla

Module: check_mk Branch: master Commit: 17549d2a230569f5bc1b71c78f8ed5755bcb0d9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17549d2a230569… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue May 26 15:02:27 2015 +0200 Updated bug entries #2300 --- .bugs/2300 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2300 b/.bugs/2300 new file mode 100644 index 0000000..e6bc8d8 --- /dev/null +++ b/.bugs/2300 @@ -0,0 +1,14 @@ +Title: WATOs check_plugin browser crashes when local man pages dont have a catalog entry +Component: wato +State: open +Date: 2015-05-26 14:59:59 +Targetversion: future +Class: bug + +Example output, if lmsensors man page does not contain catalog entry: + +Error running check_mk --automation get-check-catalog --. Invalid output from webservice (invalid syntax (<string>, line 1)): + +ERROR: Skipping invalid manpage: lmsensors (Catalog info missing) + +({'generic': [{'agents': ['linux', 'windows', 'aix', 'solaris', 'freebsd', 'netbsd', 'openbsd'], 'name': 'local', 'title': 'local: Integrate custom checks via arbitrary scripts on the agent'}, {'agents': ['linux', 'aix', 'solaris', 'hpux', 'macosx', 'netbsd', 'openbsd', 'freebsd'], 'name': 'mrpe', 'title': "MRPE: MK's Remote Plugin Executor"}, {'agents': ['linux', 'windows'], 'name': 'check_mk.only_from', 'title': 'Check IP restriction of Check_MK agent'}], 'app': {'qmail': [{'agents': ['linux'], 'name': 'qmail_stats', 'title': 'Length of the qmail Mailqueue'}], 'pfsense': [{'agents': ['snmp'], 'name': 'pfsense_status', 'title': 'pfSense Status'}, {'agents': ['snmp'], 'name': 'pfsense_if', 'title': 'pfSense Interface'}], 'citrix': [{'agents': ['windows'], 'name': 'citrix_sessions', 'title': 'Citrix Sessions'}, {'agents': ['windows'], 'name': 'citrix_serverload', 'title': 'Citrix Server load (Score)'}, {'agents': ['windows'], 'name': 'citrix_licenses', 'title': 'Citrix licenses'}], 'libelle': [{'agents': ['linux', 'aix', 'solaris', 'hpux'], 'name': 'libelle_business_shadow.process', 'title': 'Libelle Business Shadow: Active Process'}, {'agents': ['linux', 'aix', 'solaris', 'hpux'], 'name': 'libell

9 years, 4 months

Check_MK Git: check_mk: alcatel_fans: Hopefully the last syntax fix

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8c94e365b7e792480e800456f60368d1049377e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c94e365b7e792… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 14:59:42 2015 +0200 alcatel_fans: Hopefully the last syntax fix --- checks/alcatel_fans | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/checks/alcatel_fans b/checks/alcatel_fans index 221cc06..623f53b 100644 --- a/checks/alcatel_fans +++ b/checks/alcatel_fans @@ -27,8 +27,7 @@ def inventory_alcatel_fan(info): # parameter start in enumerate only works since python 2.6 for nr, value in enumerate(info): - loop_item = nr + 1 - yield loop_item, None + yield nr+1, None def check_alcatel_fan(item, _no_params, info): fan_states = { @@ -37,8 +36,7 @@ def check_alcatel_fan(item, _no_params, info): 2 : "running", } for nr, value in enumerate(info): - loop_item = nr + 1 - if loop_item == item: + if nr+1 == item: fan_state = int(value[0]) state = 0 if fan_state != 2:

9 years, 4 months

Check_MK Git: check_mk: alcatel_fans: changed var names

by Bastian Kuhn

Module: check_mk Branch: master Commit: 51a9d7af14de4f580a08302409cfa7114683824f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51a9d7af14de4f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 14:18:50 2015 +0200 alcatel_fans: changed var names --- checks/alcatel_fans | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/alcatel_fans b/checks/alcatel_fans index 201e07f..221cc06 100644 --- a/checks/alcatel_fans +++ b/checks/alcatel_fans @@ -27,8 +27,8 @@ def inventory_alcatel_fan(info): # parameter start in enumerate only works since python 2.6 for nr, value in enumerate(info): - nr += 1 - yield nr, None + loop_item = nr + 1 + yield loop_item, None def check_alcatel_fan(item, _no_params, info): fan_states = { @@ -37,8 +37,8 @@ def check_alcatel_fan(item, _no_params, info): 2 : "running", } for nr, value in enumerate(info): - nr += 1 - if nr == item: + loop_item = nr + 1 + if loop_item == item: fan_state = int(value[0]) state = 0 if fan_state != 2:

9 years, 4 months

Check_MK Git: check_mk: Tescommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ae6b00155e6bf958a072754c23f552b3f5982e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae6b00155e6bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 26 14:35:29 2015 +0200 Tescommit --- agents/windows/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 51419f8..2adb605 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -22,6 +22,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + SHELL = /bin/bash VERSION = 1.2.7i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@

9 years, 4 months

Check_MK Git: check_mk: Tescommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 727a15bc4793f5fa8857a7e389604eb93079e6f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=727a15bc4793f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 26 14:33:56 2015 +0200 Tescommit --- agents/windows/check_mk_agent.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ba02dcb..5c15956 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. - // Looking for documentation on Win32-API? Here are some of the // documents that I used:

9 years, 4 months

Check_MK Git: check_mk: hitachi_hus_status: Fixed case of OK

by Bastian Kuhn

Module: check_mk Branch: master Commit: 5fea245c97e0c6d4ad8ae8f569fc0d90f1100f41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fea245c97e0c6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 14:20:33 2015 +0200 hitachi_hus_status: Fixed case of OK --- checks/hitachi_hus_status | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/hitachi_hus_status b/checks/hitachi_hus_status index 03e6096..8763928 100644 --- a/checks/hitachi_hus_status +++ b/checks/hitachi_hus_status @@ -30,7 +30,7 @@ def inventory_hitatchi_hus_status(info): def check_hitatchi_hus_status(_no_item, _no_params, info): status_values = { - 0 : ( 0, "Array in normal status" ), + 0 : ( 0, "Array in normal status" ), 1 : ( 2, "Drive blocked" ), 2 : ( 2, "Spare drive blockade" ), 4 : ( 2, "Data drive blockade" ), @@ -52,8 +52,12 @@ def check_hitatchi_hus_status(_no_item, _no_params, info): for status, output in status_values.items(): state, message = output + found_error = False if status & int(info[0][0]): + found_error = True yield state, message + if found_error: + yield 0, "Array in normal status" check_info["hitatchi_hus_status"] = { "check_function" : check_hitatchi_hus_status,

9 years, 4 months

Check_MK Git: check_mk: #2278 FIX printer_supply: now able to toggle the point of view for used and remaining material

by Andreas Boesl

Module: check_mk Branch: master Commit: 5c34c0bbeff04bb939b087a01448a6d6de7c8735 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c34c0bbeff04b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 26 14:11:30 2015 +0200 #2278 FIX printer_supply: now able to toggle the point of view for used and remaining material There is a Upturn toner levels option available which allows you to switch the point of view from the remaining- to the used-perspective. This was useful, because there are waste toner boxes which count in the different direction. In case of waste toner boxes the upturn feature was hardcoded on. However, depending on the manufacturer the count direction differs... With this change the upturn option now toggles the direction every time, so it doesn't matter if the component is a cartridge or a waste toner box. After updating to this version, you should check the toner levels and set the Upturn toner levels accordingly. --- .werks/2278 | 21 +++++++++++++++++++++ ChangeLog | 2 ++ checks/printer_supply | 8 +++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.werks/2278 b/.werks/2278 new file mode 100644 index 0000000..2ce7c2d --- /dev/null +++ b/.werks/2278 @@ -0,0 +1,21 @@ +Title: printer_supply: now able to toggle the point of view for used and remaining material +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.2.7i1 +Date: 1432641270 + +There is a Upturn toner levels option available which allows you +to switch the point of view from the remaining- to the used-perspective. +This was useful, because there are waste toner boxes which count in the +different direction. + +In case of waste toner boxes the upturn feature was hardcoded on. +However, depending on the manufacturer the count direction differs... +With this change the upturn option now toggles the direction every time, +so it doesn't matter if the component is a cartridge or a waste toner box. + +After updating to this version, you should check the toner levels and +set the Upturn toner levels accordingly. diff --git a/ChangeLog b/ChangeLog index bb685eb..767614f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -383,6 +383,8 @@ * 2268 FIX: db2_tablespaces: no longer throws exception in checks when complete db2 instance vanishes * 2272 FIX: mrpe: made UNKNOWN message more clear in case of an invalid state char * 2255 FIX: checkpoint_*: Fixed exception in scan function when sysDescr has less than 2 spaces... + * 2278 FIX: printer_supply: now able to toggle the point of view for used and remaining material... + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/printer_supply b/checks/printer_supply index 488b86b..ed206a5 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -140,9 +140,15 @@ def check_printer_supply(item, params, info): return (0, "current level is %d" % current, [("pages", current)]) leftperc = 100.0 * float(current) / maxlevel - if upturn or unit_type == 4: + + if unit_type == 4: + leftperc = 100 - leftperc + # Some printers handle the used / remaining material differently + # With the upturn option we can toggle the point of view (again) + if upturn: leftperc = 100 - leftperc + infotext = "%.0f%% (levels at %.0f%% / %.0f%%)" % (leftperc, warn, crit) if leftperc <= crit: return (2, infotext, perfdata)

9 years, 4 months

Check_MK Git: check_mk: alcatel_fans: Support for python 2.4

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9b916c0c27b21d8dde933cd5408bf86f08a60865 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b916c0c27b21d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 13:21:30 2015 +0200 alcatel_fans: Support for python 2.4 --- checks/alcatel_fans | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/checks/alcatel_fans b/checks/alcatel_fans index 37dc370..201e07f 100644 --- a/checks/alcatel_fans +++ b/checks/alcatel_fans @@ -25,16 +25,19 @@ # Boston, MA 02110-1301 USA. def inventory_alcatel_fan(info): - for nr, value in enumerate(info, start=1): + # parameter start in enumerate only works since python 2.6 + for nr, value in enumerate(info): + nr += 1 yield nr, None def check_alcatel_fan(item, _no_params, info): fan_states = { - 0 : "has no Status", - 1 : "Not running", - 2 : "Running", + 0 : "has no status", + 1 : "not running", + 2 : "running", } - for nr, value in enumerate(info, start=1): + for nr, value in enumerate(info): + nr += 1 if nr == item: fan_state = int(value[0]) state = 0

9 years, 4 months

Check_MK Git: check_mk: hitachi_hus_status: Minor code changes

by Bastian Kuhn

Module: check_mk Branch: master Commit: f128b582c016ea5d5d57b00d154ac60a8a6cc52d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f128b582c016ea… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 13:25:41 2015 +0200 hitachi_hus_status: Minor code changes --- checks/hitachi_hus_status | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/checks/hitachi_hus_status b/checks/hitachi_hus_status index fe99761..03e6096 100644 --- a/checks/hitachi_hus_status +++ b/checks/hitachi_hus_status @@ -30,30 +30,30 @@ def inventory_hitatchi_hus_status(info): def check_hitatchi_hus_status(_no_item, _no_params, info): status_values = { - 0 : ( "Array in normal status", 0 ), - 1 : ( "Drive blocked", 2 ), - 2 : ( "Spare drive blockade", 2 ), - 4 : ( "Data drive blockade", 2 ), - 8 : ( "ENC alarm", 1 ), - 64 : ( "Warned array", 1 ), - 128 : ( "Mate controller blocked",2 ), - 256 : ( "UPS alarm", 2 ), - 1024 : ( "Path blocked", 2 ), - 16384 : ( "Drive I/O module failure", 2 ), - 32768 : ( "Controller failure by related parts", 2 ), - 65536 : ( "Battery alarm", 1 ), - 131072 : ( "Power supply failure", 2 ), - 1048576 : ( "Fan alarm", 1 ), - 4194304 : ( "Host I/O module failure", 2 ), - 838608 : ( "Management module failure", 2 ), - 16777216 : ( "Host connector alarm", 2 ), - 268436456 : ( "Host connector alarm", 2 ), + 0 : ( 0, "Array in normal status" ), + 1 : ( 2, "Drive blocked" ), + 2 : ( 2, "Spare drive blockade" ), + 4 : ( 2, "Data drive blockade" ), + 8 : ( 1, "ENC alarm" ), + 64 : ( 1, "Warned array" ), + 128 : ( 2, "Mate controller blocked" ), + 256 : ( 2, "UPS alarm" ), + 1024 : ( 2, "Path blocked" ), + 16384 : ( 2, "Drive I/O module failure" ), + 32768 : ( 2, "Controller failure by related parts" ), + 65536 : ( 1, "Battery alarm" ), + 131072 : ( 2, "Power supply failure" ), + 1048576 : ( 1, "Fan alarm" ), + 4194304 : ( 2, "Host I/O module failure" ), + 838608 : ( 2, "Management module failure" ), + 16777216 : ( 2, "Host connector alarm" ), + 268436456 : ( 2, "Host connector alarm" ), } for status, output in status_values.items(): state, message = output if status & int(info[0][0]): - return state, message + yield state, message check_info["hitatchi_hus_status"] = { "check_function" : check_hitatchi_hus_status,

9 years, 4 months

Check_MK Git: check_mk: hitachi_hus_status: initial version of check

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1dcf30a211b35de408db314a1c6e137499b482df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dcf30a211b35d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 13:02:01 2015 +0200 hitachi_hus_status: initial version of check --- checks/hitachi_hus_status | 65 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/checks/hitachi_hus_status b/checks/hitachi_hus_status new file mode 100644 index 0000000..fe99761 --- /dev/null +++ b/checks/hitachi_hus_status @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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 inventory_hitatchi_hus_status(info): + return [ (None, None)] + +def check_hitatchi_hus_status(_no_item, _no_params, info): + status_values = { + 0 : ( "Array in normal status", 0 ), + 1 : ( "Drive blocked", 2 ), + 2 : ( "Spare drive blockade", 2 ), + 4 : ( "Data drive blockade", 2 ), + 8 : ( "ENC alarm", 1 ), + 64 : ( "Warned array", 1 ), + 128 : ( "Mate controller blocked",2 ), + 256 : ( "UPS alarm", 2 ), + 1024 : ( "Path blocked", 2 ), + 16384 : ( "Drive I/O module failure", 2 ), + 32768 : ( "Controller failure by related parts", 2 ), + 65536 : ( "Battery alarm", 1 ), + 131072 : ( "Power supply failure", 2 ), + 1048576 : ( "Fan alarm", 1 ), + 4194304 : ( "Host I/O module failure", 2 ), + 838608 : ( "Management module failure", 2 ), + 16777216 : ( "Host connector alarm", 2 ), + 268436456 : ( "Host connector alarm", 2 ), + } + + for status, output in status_values.items(): + state, message = output + if status & int(info[0][0]): + return state, message + +check_info["hitatchi_hus_status"] = { + "check_function" : check_hitatchi_hus_status, + "inventory_function" : inventory_hitatchi_hus_status, + "service_description" : "Status", + "snmp_info" : (".1.3.6.1.4.1.116.5.11.1.2.2", [ 1 ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116"), +} +

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015