Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1926 FIX ps: reenable compatiblity with existing configurations

by Mathias Kettner

Module: check_mk Branch: master Commit: b5895f080633bdcea277503e08f34bdf03581926 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5895f080633bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 30 14:44:29 2015 +0100 #1926 FIX ps: reenable compatiblity with existing configurations In werk #1563 we moved all parameters for the process check to a check parameter rule set in normal Check_MK style. Previously these parameters (like process count, CPU levels, etc.) had been set only during discovery. But that way existing configuration with rules for process inventory would not work anymore. This werk fixes this. All old inventory rule (now called discovery) work again. Also they are ediable via WATO. You can set the process parameters now in two places: during discovery and in the parameter rule. The preferred way is the new way: to set these in the parameter rule. That way changes will immediately get active without a need for a new discovery. --- .werks/1926 | 21 ++++ ChangeLog | 1 + checks/ps.include | 17 ++- web/plugins/wato/check_parameters.py | 203 +++++++++++++++++++--------------- 4 files changed, 150 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b5895f0806…

9 years, 5 months

Check_MK Git: check_mk: #1969 FIX apc_symmetra: Fix wrong critical state " 0 batteries need replacement"

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e5550b900116e1a7ea116e06228dce479cf54e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e5550b900116e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 14:26:13 2015 +0100 #1969 FIX apc_symmetra: Fix wrong critical state "0 batteries need replacement" --- .werks/1969 | 10 ++++++++++ ChangeLog | 1 + checks/apc_symmetra | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1969 b/.werks/1969 new file mode 100644 index 0000000..534f524 --- /dev/null +++ b/.werks/1969 @@ -0,0 +1,10 @@ +Title: apc_symmetra: Fix wrong critical state "0 batteries need replacement" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422624333 + + diff --git a/ChangeLog b/ChangeLog index 8709a6e..ea1b8ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * 1924 FIX: cisco_power: Fixed missing power supplies in case where name is not unique * 1886 FIX: win_printers: Fixed exception in WATO when displaying default parameters * 1887 FIX: Logwatch event console forwarding: Better dealing with logwatch states + * 1969 FIX: apc_symmetra: Fix wrong critical state "0 batteries need replacement" Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 752b6f5..4efbd42 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -121,7 +121,7 @@ def check_apc(item, params, info): if AdvBatteryNumOfBadBattPacks == 1: infotxt = "one battery needs replacement(!)" state = 1 - else: + elif AdvBatteryNumOfBadBattPacks > 1: infotxt = "%i batteries need replacement(!!)" % AdvBatteryNumOfBadBattPacks state = 2 single_states.append( (state, infotxt, None) )

9 years, 5 months

Check_MK Git: check_mk: #1968 qlogic_fcport, qlogic_sanbox,

by Lars Michelsen

qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now Message-ID: <54cb84ae.RqvzLZyctYgTIbqc%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9fdf7a3d891143267d6e48ee2bc9fc63ce1af647 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fdf7a3d891143… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 14:18:35 2015 +0100 #1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now --- .werks/1968 | 9 +++++++++ ChangeLog | 1 + checks/qlogic_fcport | 6 +++++- checks/qlogic_sanbox | 14 ++++++++++---- checks/qlogic_sanbox_fabric_element | 6 +++++- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.werks/1968 b/.werks/1968 new file mode 100644 index 0000000..5485be5 --- /dev/null +++ b/.werks/1968 @@ -0,0 +1,9 @@ +Title: qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422623907 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3dd6ebe..8709a6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * 1948 Livedump: Host names can now be prefixed with an individual string... * 1958 akcp_daisy_smoke: added new check for smoke sensors on expansion boards which are daisy chained to an AKCP securityProbe 5E... * 1219 synology_disks, synology_fans, synology_info, synology_raid, synology_status, synology_update: Multiple Synology NAS Checks + * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/qlogic_fcport b/checks/qlogic_fcport index fda98c7..4c5f279 100644 --- a/checks/qlogic_fcport +++ b/checks/qlogic_fcport @@ -200,7 +200,11 @@ check_info["qlogic_fcport"] = { "4.3.1.4", # fcFxPortC3OutOctets "4.3.1.5", # fcFxPortC3Discards ]), - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), 'group': 'qlogic_fcport', 'default_levels_variable': 'qlogic_fcport_default_levels', } diff --git a/checks/qlogic_sanbox b/checks/qlogic_sanbox index db858c2..ae2622a 100644 --- a/checks/qlogic_sanbox +++ b/checks/qlogic_sanbox @@ -91,7 +91,11 @@ check_info["qlogic_sanbox.temp"] = { 7, # connUnitSensorType 8, # connUnitSensorCharacteristic OID_END]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), } #. @@ -148,7 +152,9 @@ check_info["qlogic_sanbox.psu"] = { 7, # connUnitSensorType 8, # connUnitSensorCharacteristic OID_END]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), } - -#. diff --git a/checks/qlogic_sanbox_fabric_element b/checks/qlogic_sanbox_fabric_element index 8f8f7dd..6995326 100644 --- a/checks/qlogic_sanbox_fabric_element +++ b/checks/qlogic_sanbox_fabric_element @@ -53,5 +53,9 @@ check_info["qlogic_sanbox_fabric_element"] = { "has_perfdata" : False, "snmp_info" : (".1.3.6.1.2.1.75.1.1.4.1", [4, # fcFeModuleOperStatus OID_END]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14"), + # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch + # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + 'snmp_scan_function' : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), }

9 years, 5 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 7028b18ebf8afa1907057b8660c7a82c87b69363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7028b18ebf8afa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 14:17:33 2015 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6f137db..1cb1a4d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1968 +1988

9 years, 5 months

Check_MK Git: check_mk: #1887 FIX Logwatch event console forwarding: Better dealing with logwatch states

by Lars Michelsen

Module: check_mk Branch: master Commit: aaf09d6a7263df56147d5503c4cf6645d8470ef4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaf09d6a7263df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 13:56:41 2015 +0100 #1887 FIX Logwatch event console forwarding: Better dealing with logwatch states --- .werks/1887 | 10 ++++++++++ ChangeLog | 1 + checks/logwatch | 11 +++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/1887 b/.werks/1887 new file mode 100644 index 0000000..1569219 --- /dev/null +++ b/.werks/1887 @@ -0,0 +1,10 @@ +Title: Logwatch event console forwarding: Better dealing with logwatch states +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422622576 + + diff --git a/ChangeLog b/ChangeLog index ffced7a..3dd6ebe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 1923 FIX: cisco_qos: Fixed exception in discovery that might lead to missing services * 1924 FIX: cisco_power: Fixed missing power supplies in case where name is not unique * 1886 FIX: win_printers: Fixed exception in WATO when displaying default parameters + * 1887 FIX: Logwatch event console forwarding: Better dealing with logwatch states Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/logwatch b/checks/logwatch index f8d50b3..fa7750d 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -500,9 +500,10 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): import socket, time -# OK -> priority 5 -# WARN -> priority 4 -# CRIT -> priority 2 +# OK -> priority 5 (notice) +# WARN -> priority 4 (warning) +# CRIT -> priority 2 (crit) +# context -> priority 6 (info) # u = Uknown def logwatch_to_prio(level): if level == 'W': @@ -511,7 +512,9 @@ def logwatch_to_prio(level): return 2 elif level == 'O': return 5 - elif level == 'u': + elif level == '.': + return 6 + else: return 4 def syslog_time():

9 years, 5 months

Check_MK Git: check_mk: synology_update: Check return state can now be configured in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: ee8031a7746e97355d77f451f6c5c86661754e3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee8031a7746e97… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 30 13:49:33 2015 +0100 synology_update: Check return state can now be configured in wato --- checkman/synology_update | 1 + checks/synology_update | 53 ++++++++++------ web/plugins/wato/check_parameters.py | 112 +++++++++++----------------------- 3 files changed, 72 insertions(+), 94 deletions(-) diff --git a/checkman/synology_update b/checkman/synology_update index 85f1c37..4a05c49 100644 --- a/checkman/synology_update +++ b/checkman/synology_update @@ -6,6 +6,7 @@ distribution: check_mk description: This check reports if the DSM Version is out of Date or if there any issues connecting to the update service. + The resulting check state can be configured in WATO. inventory: diff --git a/checks/synology_update b/checks/synology_update index ad75820..173b14c 100644 --- a/checks/synology_update +++ b/checks/synology_update @@ -24,30 +24,45 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +factory_settings["synology_update_levels"] = { + "ok_states" : [ 2, 3 ], + "warn_states" : [ 5 ], + "crit_states" : [ 1, 4 ], +} + def inventory_synology_update(info): - return [(None, None)] + return [(None, {})] -def check_synology_update(_no_item, _no_params, info): +def check_synology_update(_no_item, params, info): states = { - 1 : ("Available", 2), - 2 : ("Unavailable", 0), - 3 : ("Connecting", 0), - 4 : ("Disconnected", 2), - 5 : ("Others", 3), + 1 : "Available", + 2 : "Unavailable", + 3 : "Connection", + 4 : "Disconnected", + 5 : "Others", } - version, state = info[0] - state = int(state) - return states[state][1], "Status: %s, Current Version: %s" % (states[state][0], version) + version, device_state = info[0] + device_state = int(device_state) + state = 3 + if device_state in params['ok_states']: + state = 0 + elif device_state in params['warn_states']: + state = 1 + elif device_state in params['crit_states']: + state = 2 + return state, "Update Status: %s, Current Version: %s" % (states[device_state], version) check_info["synology_update"] = { - "check_function" : check_synology_update, - "inventory_function" : inventory_synology_update, - "service_description" : "Update", - "snmp_scan_function" : synology_scan_function, - "snmp_info" : (".1.3.6.1.4.1.6574.1.5", [ - 3, #Version - 4, #Status - ]), - "includes" : [ "synology.include" ], + "check_function" : check_synology_update, + "inventory_function" : inventory_synology_update, + "service_description" : "Update", + "snmp_scan_function" : synology_scan_function, + "snmp_info" : (".1.3.6.1.4.1.6574.1.5", [ + 3, #Version + 4, #Status + ]), + "includes" : [ "synology.include" ], + "default_levels_variable" : "synology_update_levels", + "group" : "synology_update", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b2d33fd..f1f3421 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6291,81 +6291,6 @@ register_check_parameters( "jvm_memory", _("JVM memory levels"), Dictionary( - help = _("This rule allows to set the warn and crit levels of the heap / " - "non-heap and total memory area usage on web application servers. " - "Other keywords for this rule: Tomcat, Jolokia, JMX. "), - elements = [ - ( "totalheap", - Alternative( - title = _("Total Memory Levels"), - elements = [ - Tuple( - title = _("Percentage levels of used space"), - elements = [ - Percentage(title = _("Warning if above"), label = _("% usage")), - Percentage(title = _("Critical if above"), label = _("% usage")), - ] - ), - Tuple( - title = _("Absolute free space in MB"), - elements = [ - Integer(title = _("Warning if below"), unit = _("MB")), - Integer(title = _("Critical if below"), unit = _("MB")), - ] - ) - ])), - ( "heap", - Alternative( - title = _("Heap Memory Levels"), - elements = [ - Tuple( - title = _("Percentage levels of used space"), - elements = [ - Percentage(title = _("Warning if above"), label = _("% usage")), - Percentage(title = _("Critical if above"), label = _("% usage")), - ] - ), - Tuple( - title = _("Absolute free space in MB"), - elements = [ - Integer(title = _("Warning if below"), unit = _("MB")), - Integer(title = _("Critical if below"), unit = _("MB")), - ] - ) - ])), - ( "nonheap", - Alternative( - title = _("Nonheap Memory Levels"), - elements = [ - Tuple( - title = _("Percentage levels of used space"), - elements = [ - Percentage(title = _("Warning if above"), label = _("% usage")), - Percentage(title = _("Critical if above"), label = _("% usage")), - ] - ), - Tuple( - title = _("Absolute free space in MB"), - elements = [ - Integer(title = _("Warning if below"), unit = _("MB")), - Integer(title = _("Critical if below"), unit = _("MB")), - ] - ) - ])), - ]), - TextAscii( - title = _("Name of the virtual machine"), - help = _("The name of the application server"), - allow_empty = False, - ), - "dict" -) - -register_check_parameters( - subgroup_applications, - "sym_brightmail_queues", - "Symantec Brightmail Queues", - Dictionary( help = _("This check is used to monitor successful email delivery through " "Symantec Brightmail Scanner appliances."), elements = [ @@ -6474,6 +6399,43 @@ register_check_parameters( "first" ) +synology_update_states = [ + (1, "Available"), + (2, "Unavailable"), + (3, "Connection"), + (4, "Disconnected"), + (5, "Others"), +] + +register_check_parameters( + subgroup_applications, + "synology_update", + _("Synology Updates"), + Dictionary( + title = _("Update State"), + elements = [ + ("ok_states", ListChoice( + title = _("States which result in OK"), + choices = synology_update_states, + default_value = [2, 3] + )), + ("warn_states", ListChoice( + title = _("States which result in Warning"), + choices = synology_update_states, + default_value = [5] + )), + ("crit_states", ListChoice( + title = _("States which result in Critical"), + choices = synology_update_states, + default_value = [1,4] + )), + ], + optional_keys = None, + ), + None, + "first" +) + register_check_parameters( subgroup_applications, "antivir_update_age",

9 years, 5 months

Check_MK Git: check_mk: Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6bcbf239ef0e98e2be1c2363014acfd7b9f95e12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bcbf239ef0e98… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 30 13:51:13 2015 +0100 Merge conflict ---

9 years, 5 months

Check_MK Git: check_mk: Cleanup of new synology checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c049b1f61d103a346d649f22c491710d6d269b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c049b1f61d103… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 30 12:12:01 2015 +0100 Cleanup of new synology checks --- checks/synology.include | 4 +--- checks/synology_disks | 2 +- checks/synology_fans | 8 ++++---- checks/synology_raid | 27 +++++++++++++-------------- checks/synology_update | 10 +++++----- 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/checks/synology.include b/checks/synology.include index 45ee206..97c8b0d 100644 --- a/checks/synology.include +++ b/checks/synology.include @@ -25,6 +25,4 @@ # Boston, MA 02110-1301 USA. def synology_scan_function(oid): - if oid(".1.3.6.1.2.1.1.1.0").startswith("Linux") \ - and oid("1.3.6.1.4.1.6574.*"): - return True + return oid(".1.3.6.1.2.1.1.1.0").startswith("Linux") and oid("1.3.6.1.4.1.6574.*") diff --git a/checks/synology_disks b/checks/synology_disks index 41f2ac0..2dc2d88 100644 --- a/checks/synology_disks +++ b/checks/synology_disks @@ -43,7 +43,7 @@ def check_synology_disks(item, _no_params, info): temp = int(temperature) message = "Status: %s, Temperature: %d °C, Model: %s" % \ ( states[state][0], temp, model ) - return states[state][1], message, [("temp", temp )] + return states[state][1], message, [("temp", temp )] check_info["synology_disks"] = { "check_function" : check_synology_disks, diff --git a/checks/synology_fans b/checks/synology_fans index af3316d..d26f8b3 100644 --- a/checks/synology_fans +++ b/checks/synology_fans @@ -27,21 +27,21 @@ def inventory_synology_fans(info): return [ ("System", None), - ("CPU", None) + ("CPU", None) ] - + def check_synology_fans(item, _no_params, info): fan = {} fan['System'], fan['CPU'] = map(int, info[0]) if fan[item] != 1: - return 2, "FAN failed" + return 2, "Fan failed" return 0, "No failure reported" check_info["synology_fans"] = { "check_function" : check_synology_fans, "inventory_function" : inventory_synology_fans, - "service_description" : "FAN %s", + "service_description" : "Fan %s", "snmp_scan_function" : synology_scan_function, "snmp_info" : (".1.3.6.1.4.1.6574.1.4", [ 1, #System fan diff --git a/checks/synology_raid b/checks/synology_raid index 5bc42a4..5cdedf8 100644 --- a/checks/synology_raid +++ b/checks/synology_raid @@ -30,18 +30,18 @@ def inventory_synology_raid(info): def check_synology_raid(item, _no_params, info): states = { - 1 : ("OK", 0), - 2 : ("Repairing", 1), - 3 : ("Migrating", 1), - 4 : ("Expanding", 1), - 5 : ("Deleting", 1), - 6 : ("Creating", 1), - 7 : ("RaidSyncing", 0), - 8 : ("RaidParityChecking", 0), - 9 : ("RaidAssembling", 1), - 10 : ("Canceling", 1), - 11 : ("Degrade", 2), - 12 : ("Crashed",2 ), + 1 : ("OK" ,0), + 2 : ("Repairing" ,1), + 3 : ("Migrating" ,1), + 4 : ("Expanding" ,1), + 5 : ("Deleting" ,1), + 6 : ("Creating" ,1), + 7 : ("RaidSyncing" ,0), + 8 : ("RaidParityChecking" ,0), + 9 : ("RaidAssembling" ,1), + 10 : ("Canceling" ,1), + 11 : ("Degrade" ,2), + 12 : ("Crashed" ,2), } for raid, status in info: if raid == item: @@ -52,8 +52,7 @@ def check_synology_raid(item, _no_params, info): check_info["synology_raid"] = { "check_function" : check_synology_raid, "inventory_function" : inventory_synology_raid, - "service_description" : "Raid %s", - "has_perfdata" : True, + "service_description" : "RAID %s", "snmp_scan_function" : synology_scan_function, "snmp_info" : (".1.3.6.1.4.1.6574.3.1.1", [ 2, #raidName diff --git a/checks/synology_update b/checks/synology_update index ad75820..5962083 100644 --- a/checks/synology_update +++ b/checks/synology_update @@ -29,11 +29,11 @@ def inventory_synology_update(info): def check_synology_update(_no_item, _no_params, info): states = { - 1 : ("Available", 2), - 2 : ("Unavailable", 0), - 3 : ("Connecting", 0), - 4 : ("Disconnected", 2), - 5 : ("Others", 3), + 1: ("Available", 2), + 2: ("Unavailable", 0), + 3: ("Connecting", 0), + 4: ("Disconnected", 2), + 5: ("Other", 3), } version, state = info[0] state = int(state)

9 years, 5 months

Check_MK Git: check_mk: Fixed exception about missing variable " in_timerange" in fileinfo check

by Lars Michelsen

Module: check_mk Branch: master Commit: 066130df18a6f4aa8fb1d5be864e9ae23339805f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=066130df18a6f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 12:11:59 2015 +0100 Fixed exception about missing variable "in_timerange" in fileinfo check --- checks/fileinfo | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index a33350a..281f6b9 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -107,13 +107,14 @@ def check_fileinfo(item, params, info): if len(info) == 0: return (3, "no information sent by agent") - outof_range = fileinfo_check_timeranges(params) + outof_range_txt = fileinfo_check_timeranges(params) + in_timerange = outof_range_txt == None reftime = int(info[0][0]) check_definition = False for line in info[1:]: if item == line[0]: if line[1] == "missing": - return in_timerange and 3 or 0, "File not found" + outof_range + return in_timerange and 3 or 0, "File not found" + outof_range_txt state = 0 size = int(line[1]) age = reftime - int(line[2]) @@ -123,8 +124,8 @@ def check_fileinfo(item, params, info): ("age", age, get_age_human_readable) ] if check_definition == False: - return in_timerange and 3 or 0, "File not found" + outof_range - return fileinfo_check_function(check_definition, params, outof_range) + return in_timerange and 3 or 0, "File not found" + outof_range_txt + return fileinfo_check_function(check_definition, params, outof_range_txt) # Extracts patterns that are relevant for the current host and item. # Constructs simple list of patterns and makes them available for the check @@ -143,7 +144,7 @@ def check_fileinfo_groups(item, params, info): if not info: return 3, "No information sent by agent" - outof_range = fileinfo_check_timeranges(params) + outof_range_txt = fileinfo_check_timeranges(params) import fnmatch reftime = int(info[0][0]) @@ -207,9 +208,9 @@ def check_fileinfo_groups(item, params, info): if date_inclusion: check_definition.append(("date pattern", date_inclusion, str )) - return fileinfo_check_function(check_definition, params, outof_range) + return fileinfo_check_function(check_definition, params, outof_range_txt) -def fileinfo_check_function(check_definition, params, outof_range): +def fileinfo_check_function(check_definition, params, outof_range_txt): import operator state = 0 infos = [] @@ -230,9 +231,9 @@ def fileinfo_check_function(check_definition, params, outof_range): infos[-1] += " (%s %s)(!)" % (comp, verbfunc(warn)) perfdata.append((what, val, warn, crit)) infotext = ", ".join(infos) - if outof_range: + if outof_range_txt: state = 0 - infotext += outof_range + infotext += outof_range_txt return (state, infotext, perfdata)

9 years, 5 months

Check_MK Git: check_mk: #1886 FIX win_printers: Fixed exception in WATO when displaying default parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: e09c72737a6693f512d4cdfd6b49230cc5016e16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e09c72737a6693… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 11:57:12 2015 +0100 #1886 FIX win_printers: Fixed exception in WATO when displaying default parameters --- .werks/1886 | 10 ++++++++++ ChangeLog | 1 + checks/win_printers | 15 +++++++++------ web/plugins/wato/check_parameters.py | 20 +++++++++++++------- 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/.werks/1886 b/.werks/1886 new file mode 100644 index 0000000..d8467da --- /dev/null +++ b/.werks/1886 @@ -0,0 +1,10 @@ +Title: win_printers: Fixed exception in WATO when displaying default parameters +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422615407 + + diff --git a/ChangeLog b/ChangeLog index 3ce8c30..ffced7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 1881 FIX: omd_status: Check works now event when a site is reported as not OK... * 1923 FIX: cisco_qos: Fixed exception in discovery that might lead to missing services * 1924 FIX: cisco_power: Fixed missing power supplies in case where name is not unique + * 1886 FIX: win_printers: Fixed exception in WATO when displaying default parameters Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/win_printers b/checks/win_printers index c8c3bd0..7537ad6 100644 --- a/checks/win_printers +++ b/checks/win_printers @@ -29,11 +29,10 @@ # check is SNMP-Based, then remove this section def inventory_win_printers(info): - return [ (" ".join(x[:-3]), (None, None)) for x in info ] + return [ (" ".join(x[:-3]), None) for x in info ] def check_win_printers(item, params, info): status_map = { - 1 : "Other", 2 : "Unkown", 3 : "Idle", @@ -41,7 +40,6 @@ def check_win_printers(item, params, info): 5 : "Warming Up", 6 : "Stopped Printing", 7 : "Offline", - } error_map = { 0 : "Unkown", @@ -57,7 +55,12 @@ def check_win_printers(item, params, info): 10 : "Service Requested", 11 : "Output Bin Full" } - warn, crit = params + + if params == None: + warn, crit = None, None + else: + warn, crit = params + for line in info: name = " ".join(line[:-3]) if name == item: @@ -73,10 +76,10 @@ def check_win_printers(item, params, info): error_text = "Error State: %s(!)" % error_map[error] queue_label = "" - if crit and current_jobs >= crit: + if crit != None and current_jobs >= crit: state = 2 queue_label = "(!!)" - elif warn and current_jobs >= warn: + elif warn != None and current_jobs >= warn: state = max(1, state) queue_label = "(!)" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b2d33fd..7ea853e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3234,13 +3234,19 @@ register_check_parameters( subgroup_printing, "windows_printer_queues", _("Number of open jobs of a printer on windows" ), - Tuple( - help = _("This rule is applied to the number of print jobs " - "currently waiting in windows printer queue."), - elements = [ - Integer(title = _("Warning if above"), unit = _("jobs"), default_value = 40), - Integer(title = _("Critical if above"), unit = _("jobs"), default_value = 60), - ] + Transform( + Optional( + Tuple( + help = _("This rule is applied to the number of print jobs " + "currently waiting in windows printer queue."), + elements = [ + Integer(title = _("Warning at"), unit = _("jobs"), default_value = 40), + Integer(title = _("Critical at"), unit = _("jobs"), default_value = 60), + ] + ), + label=_('Enable thresholds on the number of jobs'), + ), + forth = lambda old: old != (None, None) and old or None, ), TextAscii( title = _("Printer Name"),

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015