Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64501 discussions

Check_MK Git: check_mk: Added new checks for Brocade NetIron MLX switching / routing devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a2021effa295d069a9fa25e42aa57ae9a5fee40e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2021effa295d0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Nov 7 13:30:43 2013 +0100 Added new checks for Brocade NetIron MLX switching / routing devices It checks by SNMP the status of Power supplies and Fans the overall status of modules memory usage and cpu utilization of NI-MLX modules temperature measured by different temperature sensors --- .werks/80 | 12 ++++++++++++ ChangeLog | 3 ++- checkman/brocade_mlx.module_cpu | 14 ++++++-------- checkman/brocade_mlx.module_mem | 14 ++++++-------- checks/brocade_mlx | 39 +++++++++++++++++++++------------------ 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/.werks/80 b/.werks/80 new file mode 100644 index 0000000..b1b5552 --- /dev/null +++ b/.werks/80 @@ -0,0 +1,12 @@ +Title: Added new checks for Brocade NetIron MLX switching / routing devices +Level: 2 +Component: checks +Version: 1.2.3i7 +Date: 1383827175 +Class: feature + +It checks by SNMP +the status of Power supplies and Fans +the overall status of modules +memory usage and cpu utilization of NI-MLX modules +temperature measured by different temperature sensors diff --git a/ChangeLog b/ChangeLog index ccc81d3..2b6a53b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,9 @@ * 0063 veeam_client: new check to monitor status of veeam clients with special agent plugin... * 0064 veeam_jobs: new check to monitor the backup jobs of the veeam backup tool... * 0047 Add new collection of checks to monitor Fritz!Box devices... - * 0090 apc_ats_status: New Check for monitoring APC Automatic Transfer Switches... * 0027 esx_vsphere_sensors: it is now possible override the state of sensors + * 0090 apc_ats_status: New Check for monitoring APC Automatic Transfer Switches... + * 0080 Added new checks for Brocade NetIron MLX switching / routing devices... * 0024 FIX: cisco_wlc: removed configuration parameter ap_model... Multisite: diff --git a/checkman/brocade_mlx.module_cpu b/checkman/brocade_mlx.module_cpu index 5a29277..ec8be8b 100644 --- a/checkman/brocade_mlx.module_cpu +++ b/checkman/brocade_mlx.module_cpu @@ -20,7 +20,7 @@ item: examples: # set default levels to 70 and 80 percent: - brocade_mlx_cpu_default_levels = (70.0, 80.0) + brocade_mlx_cpu_default_levels = { "levels": (70.0, 80.0) } # Check Module with ID 33 on a box called my-mlx-device with default levels checks += [ @@ -29,7 +29,7 @@ examples: # or use individual levels for warn and crit checks += [ - ("my-mlx-device", "brocade_mlx.module_cpu", '33 NI-MLX-32_MR Management Module', (75.0, 85.0)), + ("my-mlx-device", "brocade_mlx.module_cpu", '33 NI-MLX-32_MR Management Module', { "levels": (75.0, 85.0) }), ] perfdata: @@ -42,11 +42,9 @@ inventory: Empty modules are omitted. [parameters] -warn(float): {WARN} state is triggered, if the CPU utilization in percent is higher - than this. -crit(float): {CRIT} state is triggered, if the CPU utilization in percent is higher - than this. +parameters (dict): with the element +{"levels"}: (float, float): levels of CPU utilization for {WARN} and {CRIT} in percent [configuration] -brocade_mlx_cpu_default_levels(float, float): The standard levels for {WARN} and - {CRIT}. Defaults are (80.0, 90.0) +brocade_mlx_cpu_default_levels(dict): The standard levels for {WARN} and + {CRIT}, preset to { "levels": (80.0, 90.0) } diff --git a/checkman/brocade_mlx.module_mem b/checkman/brocade_mlx.module_mem index df88967..bca713b 100644 --- a/checkman/brocade_mlx.module_mem +++ b/checkman/brocade_mlx.module_mem @@ -16,7 +16,7 @@ item: examples: # set default levels to 70 and 80 percent: - brocade_mlx_mem_default_levels = (70.0, 80.0) + brocade_mlx_mem_default_levels = { "levels": (70.0, 80.0) } # Check Module with ID 33 on a box called my-mlx-device with default levels checks += [ @@ -25,7 +25,7 @@ examples: # or use individual levels for warn and crit checks += [ - ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management Module', (75.0, 85.0)), + ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management Module', { "levels": (75.0, 85.0) }), ] perfdata: @@ -37,11 +37,9 @@ inventory: Empty modules are omitted. [parameters] -warn(float): {WARN} state is triggered, if the memory usage in percent is higher - than this. -crit(float): {CRIT} state is triggered, if the memory usage in percent is higher - than this. +parameters (dict): with the element +{"levels"}: (float, float): levels of memory usage for {WARN} and {CRIT} in percent [configuration] -brocade_mlx_mem_default_levels(float, float): The standard levels for {WARN} and - {CRIT}. Defaults are (80.0, 90.0) +brocade_mlx_mem_default_levels(dict): The standard levels for {WARN} and + {CRIT}, preset to { "levels": (80.0, 90.0) } diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 54af612..2a042f8 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -138,7 +138,7 @@ check_info["brocade_mlx.module_status"] = { # Modules Memory ############################################################################# -brocade_mlx_mem_default_levels = (80.0, 90.0) +brocade_mlx_mem_default_levels = { "levels": (80.0, 90.0) } def inventory_brocade_mlx_module_mem(info): inventory = [] @@ -150,30 +150,35 @@ def inventory_brocade_mlx_module_mem(info): return inventory def check_brocade_mlx_module_mem(item, params, info): - warn, crit = params + warn, crit = params["levels"] for module_id, module_descr, module_state, mem_total, mem_avail in info[2]: if combine_item(module_id, module_descr) == item: mem_avail = saveint(mem_avail) mem_total = saveint(mem_total) mem_used = mem_total - mem_avail mem_used_percent = savefloat(mem_used) / savefloat(mem_total) * 100 - warn_absolut = int(mem_total * warn / 100) - crit_absolut = int(mem_total * crit / 100) + + if type(warn) is int: + warn_absolut = warn + else: + warn_absolut = int(mem_total * warn / 100) + + if type(crit) is int: + crit_absolut = crit + else: + crit_absolut = int(mem_total * crit / 100) + perfdata = [ ('memused', str(mem_used) + 'Bytes', warn_absolut, crit_absolut, 0, mem_total) ] status = 0 - errorstring = "" - if mem_used_percent > warn: + if mem_used > warn_absolut: status = 1 - errorstring = " (!)" - if mem_used_percent > crit: + if mem_used > crit_absolut: status = 2 - errorstring = " (!!)" - return status, "%s used (%0.1f%%%s) of total %s" % \ + return status, "%s used (%0.1f%%) of total %s" % \ (get_bytes_human_readable(mem_used), mem_used_percent, \ - errorstring, get_bytes_human_readable(mem_total)), \ - perfdata + get_bytes_human_readable(mem_total)), perfdata return 3, "Module %s not found" % item @@ -184,15 +189,14 @@ check_info["brocade_mlx.module_mem"] = { "snmp_info" : brocade_mlx_info, "snmp_scan_function" : brocade_mlx_scan, "has_perfdata" : True, - # needs something like memory_of_modules - #"group" : "memory", + "group" : "memory_multiitem", } ############################################################################# # Modules CPU Utilization ############################################################################# -brocade_mlx_cpu_default_levels = (80.0, 90.0) +brocade_mlx_cpu_default_levels = { "levels" : (80.0, 90.0) } def inventory_brocade_mlx_module_cpu(info): inventory = [] @@ -204,7 +208,7 @@ def inventory_brocade_mlx_module_cpu(info): return inventory def check_brocade_mlx_module_cpu(item, params, info): - warn, crit = params + warn, crit = params["levels"] for module_id, module_descr, module_state, mem_total, mem_avail in info[2]: if combine_item(module_id, module_descr) == item: cpu_util1 = "" @@ -251,8 +255,7 @@ check_info["brocade_mlx.module_cpu"] = { "snmp_info" : brocade_mlx_info, "snmp_scan_function" : brocade_mlx_scan, "has_perfdata" : True, - # needs something like cpu_utilization_of_modules - #"group" : "cpu_utilization", + "group" : "cpu_utilization_multiitem", } #############################################################################

10 years, 11 months

Check_MK Git: check_mk: Reserved 100 Werk IDS

by Bastian Kuhn

Module: check_mk Branch: master Commit: f9a9b7a82440387cfedb0015afe982a77f48c037 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9a9b7a8244038… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 12:59:27 2013 +0100 Reserved 100 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d61f00d..598ed30 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -90 +190

10 years, 11 months

Check_MK Git: check_mk: Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 33dc8fbe75f4da75f4a549481b2367c2c89ea192 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33dc8fbe75f4da… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 13:03:00 2013 +0100 Merge conflict ---

10 years, 11 months

Check_MK Git: check_mk: Missing git add cause of werk...

by Bastian Kuhn

Module: check_mk Branch: master Commit: f6bef77bb2389a1f4f058179cf3eeff863f1504e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6bef77bb2389a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 13:02:09 2013 +0100 Missing git add cause of werk... --- checkman/apc_ats | 14 +++++++ checks/apc_ats_status | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/checkman/apc_ats b/checkman/apc_ats new file mode 100644 index 0000000..0f640af --- /dev/null +++ b/checkman/apc_ats @@ -0,0 +1,14 @@ +title: APC ATS ( Automatic Transfer Swichtes ) +agents: snmp +catalog: hw/power +license: GPL +distribution: check_mk +description: + Checks the status of APC Automatic Transfer Switch. + This means it throws {CRIT} if: + The power source has changed since last inventory, + the communication status gets lost, + the redundancy is lost, + the current ouput power exceeded the maximum limit for swiching to the alternate power source + or the 5V or 24V supply fails + diff --git a/checks/apc_ats_status b/checks/apc_ats_status new file mode 100644 index 0000000..7681472 --- /dev/null +++ b/checks/apc_ats_status @@ -0,0 +1,99 @@ +#!/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_apc_ats_status(info): + if len(info) == 1: + return [ (None, saveint(info[0][1]) ) ] + return [] + +def check_apc_ats_status(_no_item, source, info): + comstatus, selected_source, redundancy, overcurrent, ps5, ps24 = map(saveint, info[0]) + state = 0 + messages = [] + + #current source of power + sources = { 1 : "A", 2 : "B" } + if source != selected_source: + state = 2 + messages.append("Power source Changed from %s to %s(!!)" % \ + (source[source], sources[selected_source])) + else: + messages.append("Power source %s selected" % sources[source]) + + #current communication status of the Automatic Transfer Switch. + if comstatus == 1: + state = max(1,state) + messages.append("Communication Status: never Discovered(!)") + elif comstatus == 3: + state = 2 + messages.append("Communication Status: lost(!!)") + + # current redundancy state of the ATS. + # Lost(1) indicates that the ATS is unable to switch over to the alternate power source + # if the current source fails. Redundant(2) indicates that the ATS will switch + # over to the alternate power source if the current source fails. + if redundancy != 2: + state = 2 + messages.append("redundancy lost(!!)") + else: + messages.append("Device fully redundant") + + # current state of the ATS. atsOverCurrent(1) indicates that the ATS has i + # exceeded the output current threshold and will not allow a switch + # over to the alternate power source if the current source fails. + # atsCurrentOK(2) indicates that the output current is below the output current threshold. + if overcurrent == 1: + state = 2 + messages.append("exceedet ouput current threshold(!!)") + + # 5Volt power supply + if ps5 != 2: + state = 2 + messages.append("5V power supply failed(!!)") + + # 24Volt power supply + if ps24 != 2: + state = 2 + messages.append("24V power suppy failed(!!)") + + return state, ", ".join(messages) + +check_info["apc_ats_status"] = { + "check_function" : check_apc_ats_status, + "inventory_function" : inventory_apc_ats_status, + "service_description" : "apc_ats_status", + "has_perfdata" : False, + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.318.1.3.11" in oid(".1.3.6.1.2.1.1.2.0"), + "snmp_info" : ( ".1.3.6.1.4.1.318.1.1.8.5.1", [ + "1.0", # atsStatusCommStatus + "2.0", # atsStatusSelectedSource + "3.0", # atsStatusRedundancyState + "4.0", # atsStatusOverCurrentState + "5.0", # atsStatus5VPowerSupply + "6.0", # atsStatus24VPowerSupply + ] ), +} +

10 years, 11 months

Check_MK Git: check_mk: apc_ats_status: New Check for monitoring APC Automatic Transfer Switches

by Bastian Kuhn

Module: check_mk Branch: master Commit: 22102738e5ab9f2d7902266143153f0b6921a2fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22102738e5ab9f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 13:01:16 2013 +0100 apc_ats_status: New Check for monitoring APC Automatic Transfer Switches --- .werks/90 | 8 ++++++++ ChangeLog | 1 + 2 files changed, 9 insertions(+) diff --git a/.werks/90 b/.werks/90 new file mode 100644 index 0000000..16a783c --- /dev/null +++ b/.werks/90 @@ -0,0 +1,8 @@ +Title: apc_ats_status: New Check for monitoring APC Automatic Transfer Switches +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1383825581 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 42fffe9..571d527 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 0063 veeam_client: new check to monitor status of veeam clients with special agent plugin... * 0064 veeam_jobs: new check to monitor the backup jobs of the veeam backup tool... * 0047 Add new collection of checks to monitor Fritz!Box devices... + * 0090 apc_ats_status: New Check for monitoring APC Automatic Transfer Switches... * 0024 FIX: cisco_wlc: removed configuration parameter ap_model... Multisite:

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0945

by Andreas Boesl

Module: check_mk Branch: master Commit: 576461a1c9abadc1a2ecfd6eb0fc2c0cedc0ecba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=576461a1c9abad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 7 10:46:47 2013 +0100 Updated bug entries #0945 --- .bugs/945 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/945 b/.bugs/945 new file mode 100644 index 0000000..605a6db --- /dev/null +++ b/.bugs/945 @@ -0,0 +1,10 @@ +Title: windows_agent: processing of eventlog messages is time consuming +Component: checks +State: open +Date: 2013-11-07 10:42:10 +Targetversion: future +Class: nastiness + +To resolve the text from an eventlog entry the windows agent opens +the corresponding dll file and reads the text for the given event id. +It seems that for each line the dll is opened again by LoadLibrary()

10 years, 11 months

Check_MK Git: check_mk: esx_vsphere_sensors: it is now possible override the state of sensors

by Andreas Boesl

Module: check_mk Branch: master Commit: 745c3de0a9fe4b839c0a35043281864ccab77d5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=745c3de0a9fe4b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 7 10:40:03 2013 +0100 esx_vsphere_sensors: it is now possible override the state of sensors --- .werks/27 | 7 +++++++ ChangeLog | 1 + checkman/esx_vsphere_sensors | 11 +++++++++++ checks/esx_vsphere_sensors | 32 ++++++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 33 ++++++++++++++++++++++++++++++++- 5 files changed, 75 insertions(+), 9 deletions(-) diff --git a/.werks/27 b/.werks/27 new file mode 100644 index 0000000..4b07653 --- /dev/null +++ b/.werks/27 @@ -0,0 +1,7 @@ +Title: esx_vsphere_sensors: it is now possible override the state of sensors +Level: 2 +Component: checks +Version: 1.2.3i7 +Date: 1383817062 +Class: feature + diff --git a/ChangeLog b/ChangeLog index 42fffe9..5986f3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 0063 veeam_client: new check to monitor status of veeam clients with special agent plugin... * 0064 veeam_jobs: new check to monitor the backup jobs of the veeam backup tool... * 0047 Add new collection of checks to monitor Fritz!Box devices... + * 0027 esx_vsphere_sensors: it is now possible override the state of sensors * 0024 FIX: cisco_wlc: removed configuration parameter ap_model... Multisite: diff --git a/checkman/esx_vsphere_sensors b/checkman/esx_vsphere_sensors index 0934271..62ef5c9 100644 --- a/checkman/esx_vsphere_sensors +++ b/checkman/esx_vsphere_sensors @@ -12,3 +12,14 @@ description: inventory: One check per ESX Host System will be created. +examples: + check_parameters = [ + ([{'states': {'2': 0, '1': 0}, 'name': 'VMware Rollup Health'}], [], ALL_HOSTS, ["Hardware Sensors"]), + ] + +[parameters] +a list of (dict): with the following keys + + {"name"}: The name of the sensor in question + + {"states"}: A dictionary with with the optional keys for each sensor state and its new value diff --git a/checks/esx_vsphere_sensors b/checks/esx_vsphere_sensors index 1f96016..287b108 100644 --- a/checks/esx_vsphere_sensors +++ b/checks/esx_vsphere_sensors @@ -32,25 +32,40 @@ def inventory_esx_vsphere_sensors(info): return [(None, None)] -def check_esx_vsphere_sensors(_no_item, _no_params, info): +def check_esx_vsphere_sensors(_no_item, params, info): state = 0 infos = [] + sensor_state_modified = False + for name, base_units, current_reading, sensor_type, unit_modifier, rate_units, health_key, health_label, health_summary in info: if health_key == "green": continue # usually not output by agent anyway infos.append("%s: %s (%s)" % (name, health_label, health_summary)) + + sensor_state = 0 if health_key == "yellow": - state = max(state, 1) - infos[-1] += "(!)" + sensor_state = 1 elif health_key == "unknown": - state = max(state, 1) - infos[-1] += "(!)" + sensor_state = 1 else: - state = 2 - infos[-1] += "(!!)" + sensor_state = 2 + + extra_info = "" + if params: + for entry in params: + if name.startswith(entry.get("name")): + new_state = entry.get("states").get(str(sensor_state)) + if new_state != None: + sensor_state = new_state + extra_info = "(state modified by rule)" + sensor_state_modified = True + + state = max(state, sensor_state) + infos[-1] += ["", "(!)", "(!!)", "(!)"][state] + infos[-1] += extra_info - if state > 0: + if state > 0 or sensor_state_modified: return state, ", ".join(infos) else: return 0, "All sensors are in normal state" @@ -59,4 +74,5 @@ check_info['esx_vsphere_sensors'] = { "inventory_function" : inventory_esx_vsphere_sensors, "check_function" : check_esx_vsphere_sensors, "service_description" : "Hardware Sensors", + "group" : "hostsystem_sensors" } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 3bfa502..252037a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3326,12 +3326,43 @@ register_check_parameters( register_check_parameters( subgroup_environment, + "hostsystem_sensors", + _("Hostsystem sensor alerts"), + ListOf( + Dictionary( + help = _("This rule allows to override alert levels for the given sensor names."), + elements = [("name", TextAscii(title = _("Sensor name")) ), + ("states", Dictionary( + title = _("Custom states"), + elements = [ + (element, + MonitoringState( title = "Sensor %s" % + description, label = _("Set state to"), + default_value = int(element) ) + ) for (element, description) in [ + ("0", _("OK")), + ("1", _("WARNING")), + ("2", _("CRITICAL")), + ("3", _("UNKNOWN")) + ] + ], + ))], + optional_keys = False + ), + add_label = _("Add sensor name") + ), + None, + "first" +) + +register_check_parameters( + subgroup_environment, "temperature_auto", _("Temperature sensors with builtin levels"), None, TextAscii( title = _("Sensor ID"), - help = _("The identificator of the themal sensor.")), + help = _("The identificator of the thermal sensor.")), "first" )

10 years, 11 months

Check_MK Git: check_mk: apc_symmetra: added the current output load in percent

by Bastian Kuhn

Module: check_mk Branch: master Commit: c3b4146cdfed6960f029b4caa33377405e71ab18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3b4146cdfed69… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 10:12:00 2013 +0100 apc_symmetra: added the current output load in percent --- checkman/apc_symmetra | 10 ++++++---- checks/apc_symmetra | 24 ++++++++++++++++++++++-- web/plugins/wato/check_parameters.py | 19 ++++++++++++++++++- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/checkman/apc_symmetra b/checkman/apc_symmetra index 9ea8259..f3252f4 100644 --- a/checkman/apc_symmetra +++ b/checkman/apc_symmetra @@ -8,7 +8,8 @@ description: {(2)} the output status, {(3)} the battery capacity, {(4)} the battery temperature, {(5)} the battery current, {(6)} the output voltage and {(7)} the output current, {(8)} the remaing run time. The output current and - remaining run time are not checked against a level but are just displayed. + remaining run time are not checked against a level but are just displayed, {(9)} the current + load in percent. The check output includes the calibration status of the UPS. During a calibration the check result in section {(2)} is OK even though the UPS is running @@ -47,15 +48,16 @@ examples: checkgroup_parameters['apc_symentra'] += [ # All UPS in production get other critical levels ( { "levels": (85, 35, 2, 210) }, ["prod"], ALL_HOSTS ), + ( { "output_load": (40, 50) }, ["power"], ALL_HOSTS ), # All UPS get post calibration level of 50% ( { "post_calibration_levels": { "altcapacity": 50 } }, ["prod"],ALL_HOSTS ), ( { "post_calibration_levels": { "additional_time_span": 60 } }, ["prod"], ALL_HOSTS ), ] perfdata: - This check outputs five performance values: the battery capacity, - the battery temperature, the battery current, the output voltage and - the output current. + This check outputs six performance values: the battery capacity, + the battery temperature, the battery current, the output voltage, + the output current in percent and the output current. inventory: The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 2fa5e82..2ed3b97 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -65,6 +65,9 @@ # mm/dd/yy format." # ::= { upsAdvTest 4 } # +# AdvOutputLoad 1.3.6.1.4.1.318.1.1.1.4.2.3.0 +# Returns The current UPS load expressed in percent of rated capacity. +# Monitoring Condition Pass if less than 50 # old format: # apc_default_levels = ( 95, 40, 1, 220 ) @@ -74,8 +77,8 @@ apc_default_levels = { "levels": ( 95, 40, 1, 220 ) } def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ AdvBatteryTemperature, AdvBatteryCurrent, AdvInputVoltage, AdvOutputVoltage, \ - AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults \ - = [ saveint(x) for x in info[0][:10] ] + AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults, AdvOutputLoad \ + = [ saveint(x) for x in info[0][:11] ] LastDiagnosticsDate = info[0][-1] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 @@ -179,6 +182,21 @@ def check_apc(item, params, info): single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), ("runtime", RunTimeRemaining/60)) ) + # 9. Adv Output load (load in percent) + load_state = 0 + loadwarn, loadcrit = None, None + label = "" + if params.get('output_load'): + loadwarn, loadcrit = params['output_load'] + if AdvOutputLoad >= loadcrit: + load_state = 2 + label = "(!!)" + elif AdvOutputLoad >= loadwarn: + load_state = 1 + label = "(!)" + single_states.append( ( load_state, "current output load %d%%%s" % (AdvOutputLoad, label), \ + ( "OutputLoad", AdvOutputLoad, loadwarn, loadcrit ) ) ) + # create summary state worst_state = max([x[0] for x in single_states]) info_text = ", ".join([x[1] for x in single_states]) @@ -209,6 +227,8 @@ check_info['apc_symmetra'] = { "4.2.4.0", # AdvOutputCurrent, "2.2.3.0", # AdvBatteryRunTimeRemaining, "7.2.6.0", # AdvTestCalibrationResults + "4.2.3.0", # AdvOutputLoad "7.2.4.0", # LastDiagnosticsDate ] ) } + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c19e5e3..3bfa502 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3400,6 +3400,23 @@ register_check_parameters( ), ] )), + ("output_load", + Tuple( + title = _("Current Output Load"), + help = _("Indicates that the percentage load attached to the UPS " + "This load affects the running time of all components being supplied " + " with battery power."), + elements = [ + Percentage( + title = _("Warning level"), + ), + Percentage( + title = _("Critical level"), + ), + ] + + ) + ), ("post_calibration_levels", Dictionary( title = _("Levels of battery parameters after calibration"), @@ -3428,7 +3445,7 @@ register_check_parameters( optional_keys = False, )), ], - optional_keys = ['post_calibration_levels'], + optional_keys = ['post_calibration_levels', 'output_load'], ), None, "first"

10 years, 11 months

Check_MK Git: check_mk: Removed fritz. uptime check and moved the value to the connection check

by Lars Michelsen

Module: check_mk Branch: master Commit: b3597d8071061f494e38182d432d10a7457bfabd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3597d8071061f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 7 08:52:52 2013 +0100 Removed fritz.uptime check and moved the value to the connection check --- checkman/fritz.uptime | 28 ---------------------------- checks/fritz | 33 +++++++++------------------------ 2 files changed, 9 insertions(+), 52 deletions(-) diff --git a/checkman/fritz.uptime b/checkman/fritz.uptime deleted file mode 100644 index 5b7e0ae..0000000 --- a/checkman/fritz.uptime +++ /dev/null @@ -1,28 +0,0 @@ -title: Uptime of Fritz!Box -agents: fritzbox -catalog: hw/network/avm -license: GPL -distribution: check_mk -description: - This check is always OK and simply outputs the uptime of the target - Fritz!Box device (when the last boot was and how much time has elapsed since). - - The check uses data provided by the fritzbox special agent. You need to - configure this agent to be used for the Fritz!Box you like to monitor. The - special agent uses uPnP to get the needed information from the device. - -perfdata: - The uptime in seconds. - -inventory: - One check per system is created if the agent has a section {<<<fritz>>>} and - the key {NewUptime} in this section. - -[parameters] -parameters (dict): A dictionary with the following optional keys: - - {"min"}: Pair of integers of warn and crit: the minimum required uptime - uptime in seconds. - - {"max"}: Pair of integers of warn and crit: the maximum allowed uptime - uptime in seconds. diff --git a/checks/fritz b/checks/fritz index 2793506..812d519 100644 --- a/checks/fritz +++ b/checks/fritz @@ -60,13 +60,20 @@ def check_fritz_conn(_unused, _no_params, info): if last_err and last_err != 'ERROR_NONE': output += ', Last Error: %s' % last_err - return nag_state, output + perfdata = [] + if data.get('NewUptime'): + conn_time = check_uptime_seconds({}, float(data['NewUptime'])) + output += ', %s' % conn_time[1] + perfdata = conn_time[2] + + return nag_state, output, perfdata check_info['fritz.conn'] = { "inventory_function" : inventory_fritz_conn, "check_function" : check_fritz_conn, "service_description" : "Connection", - "has_perfdata" : False, + "includes" : [ "uptime.include" ], + "has_perfdata" : True, } @@ -106,28 +113,6 @@ check_info['fritz.config'] = { } # -# Uptime -# - -def inventory_fritz_uptime(info): - data = fritz_parse_info(info) - if 'NewUptime' in data: - return [ (None, {}) ] - -def check_fritz_uptime(_no_item, params, info): - data = fritz_parse_info(info) - return check_uptime_seconds(params, float(data['NewUptime'])) - -check_info["fritz.uptime"] = { - 'check_function': check_fritz_uptime, - 'inventory_function': inventory_fritz_uptime, - 'service_description': 'Uptime', - 'has_perfdata': True, - 'includes': [ 'uptime.include' ], - 'group': 'uptime', -} - -# # WAN Interface Check #

10 years, 11 months

Check_MK Git: check_mk: Add new collection of checks to monitor Fritz!Box devices

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a302fb476ce3b577b1ea3e07bbacd0be0507ded URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a302fb476ce3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 6 18:54:37 2013 +0100 Add new collection of checks to monitor Fritz!Box devices This feature introduces a special agent, which uses the uPnP API of Fritz!Box routers to retrieve several monitoring information, like the current connection state, bandwith, update and several other things. New checks are: <table> <tr><td class=tt>fritz.conn</td><td>Connection State / Info</td></tr> <tr><td class=tt>fritz.config</td><td>Internet Connection related config.</td></tr> <tr><td class=tt>fritz.uptime</td><td>Device Uptime</td></tr> <tr><td class=tt>fritz.wan_if</td><td>Traffic of the WAN network interface</td></tr> <tr><td class=tt>fritz.link</td><td>Network Link State / Info</td></tr> </table> --- .werks/47 | 21 +++++++++++---------- ChangeLog | 2 +- agents/.f12 | 2 ++ agents/special/.f12 | 2 ++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.werks/47 b/.werks/47 index b3a3073..f41b6cd 100644 --- a/.werks/47 +++ b/.werks/47 @@ -1,19 +1,20 @@ -Title: Add new collection of check to monitor Fritz!Box devices +Title: Add new collection of checks to monitor Fritz!Box devices Level: 1 Component: checks Version: 1.2.3i7 Date: 1383759137 Class: feature -This feature introduces a special agent, which uses the uPnP API -of Fritz!Box routers to retrieve several monitoring information, -like the current connection state, bandwith, update and several -other things. +This feature introduces a special agent, which uses the uPnP API of Fritz!Box +routers to retrieve several monitoring information, like the current connection +state, bandwith, update and several other things. New checks are: -fritz.conn - Connection State / Info -fritz.config - Internet Connection related config -fritz.uptime - Device Uptime -fritz.wan_if - Traffic of the WAN network interface -fritz.link - Network Link State / Info +<table> +<tr><td class=tt>fritz.conn</td><td>Connection State / Info</td></tr> +<tr><td class=tt>fritz.config</td><td>Internet Connection related config.</td></tr> +<tr><td class=tt>fritz.uptime</td><td>Device Uptime</td></tr> +<tr><td class=tt>fritz.wan_if</td><td>Traffic of the WAN network interface</td></tr> +<tr><td class=tt>fritz.link</td><td>Network Link State / Info</td></tr> +</table> diff --git a/ChangeLog b/ChangeLog index a7515cd..42fffe9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ * 0061 cisco_cpu: check now recognizes new object cpmCPUTotal5minRev... * 0063 veeam_client: new check to monitor status of veeam clients with special agent plugin... * 0064 veeam_jobs: new check to monitor the backup jobs of the veeam backup tool... - * 0047 Add new collection of check to monitor Fritz!Box devices... + * 0047 Add new collection of checks to monitor Fritz!Box devices... * 0024 FIX: cisco_wlc: removed configuration parameter ap_model... Multisite: diff --git a/agents/.f12 b/agents/.f12 index f46aa52..7bac9e0 100644 --- a/agents/.f12 +++ b/agents/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo cp -r * /omd/sites/$SITE/share/check_mk/agents/ if [ -e /etc/check_mk ] diff --git a/agents/special/.f12 b/agents/special/.f12 index ef2e2a3..84ed3ba 100644 --- a/agents/special/.f12 +++ b/agents/special/.f12 @@ -1,2 +1,4 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo cp -r * /omd/sites/$SITE/share/check_mk/agents/special

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits