Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: FIX Trying to prevent problem when restarting mkeventd

by Lars Michelsen

Module: check_mk Branch: master Commit: 25fb5bf35a8ccb62039eea129f828c6279502587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25fb5bf35a8ccb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 17:27:05 2013 +0100 FIX Trying to prevent problem when restarting mkeventd In some situation, when restarting the mkeventd, the old process has been stopped, but when the new process comes up, the builtin syslog server can not open the port, because it is somehow still opened. The error message is: Cannot bind TCP socket for syslog-tcp to port: Address already in use This change tries to prevent the problem. --- .werks/384 | 17 +++++++++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 8 +++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/384 b/.werks/384 new file mode 100644 index 0000000..1827a4a --- /dev/null +++ b/.werks/384 @@ -0,0 +1,17 @@ +Title: Trying to prevent problem when restarting mkeventd +Level: 1 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387297403 +Targetversion: future + +In some situation, when restarting the mkeventd, the old process has +been stopped, but when the new process comes up, the builtin syslog +server can not open the port, because it is somehow still opened. +The error message is: + +Cannot bind TCP socket for syslog-tcp to port: Address already in use + +This change tries to prevent the problem. diff --git a/ChangeLog b/ChangeLog index a50f947..3ab8733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ * 0304 FIX: Escaping several unwanted chars from incoming log messages... * 0089 FIX: CSV export of event console was broken... * 0359 FIX: Fixed exception in event simulator when one match group did not match + * 0384 FIX: Trying to prevent problem when restarting mkeventd... Livestatus: * 0337 New header for limiting the execution time of a query... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 940f2b6..1f11de9 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2366,7 +2366,6 @@ def run_eventd(): time.sleep(1) - #. # .--EventStatus---------------------------------------------------------. # | _____ _ ____ _ _ | @@ -3266,6 +3265,13 @@ try: g_event_server.output_hash_stats() + # Closing fds which might be still open + for fd in [ opt_syslog_fd, opt_syslog_tcp_fd, opt_snmptrap_fd ]: + try: + os.close(fd) + except: + pass + log("Successfully shut down.") os.remove(g_pid_file) sys.exit(0)

10 years, 6 months

Check_MK Git: check_mk: fixed typo in werk 245

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 44250960c0db8dd171bc18d30e312d20a4c6bb67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44250960c0db8d… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Dec 17 16:53:45 2013 +0100 fixed typo in werk 245 --- .werks/245 | 2 +- ChangeLog | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.werks/245 b/.werks/245 index beabc34..d8a5c33 100644 --- a/.werks/245 +++ b/.werks/245 @@ -1,4 +1,4 @@ -Title: Inline SNMP now longer throws an exception when using SNMPv3 credentials +Title: Inline SNMP no longer throws an exception when using SNMPv3 credentials Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index 13ba59a..9ab4e73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,14 +48,14 @@ * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... * 0345 FIX: Linux agent: fix detaching of background plugins... * 0378 FIX: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts - * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials... + * 0245 FIX: Inline SNMP no longer throws an exception when using SNMPv3 credentials... * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... * 0381 FIX: win_printers: Fixed creation of duplicate services... * 0347 FIX: smart.stats: Remove duplicate disks... - * 0109 FIX: cisco_fantray: Prevent inventory for not available fans - * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs * 0349 FIX: winperf.cpuusage: update man page: this check is deprecated * 0383 FIX: solaris_mem: Is now compatible to more systems... + * 0109 FIX: cisco_fantray: Prevent inventory for not available fans + * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs Multisite: * 0371 Added log class filter to hostsvcevents view

10 years, 6 months

Check_MK Git: check_mk: fixed merge conflict in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 21d9d53ce0a139f0ae367e96ee2e248dc3463137 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21d9d53ce0a139… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Dec 17 16:54:43 2013 +0100 fixed merge conflict in ChangeLog ---

10 years, 6 months

Check_MK Git: check_mk: FIX nfsmounts: correctly handle mount points with spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 752396a0e7b5285818a3299788fb7fe7d490233e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=752396a0e7b528… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 16:23:55 2013 +0100 FIX nfsmounts: correctly handle mount points with spaces If you have a space in the name of your <b>moint point</b> (not in the name of the export) then the Linux agent would show this mount point always as <tt>hanging</tt>. The reason is that in <tt>/proc/mounts</tt> spaces are displayed as <tt>\040</tt>. This has now been fixed in the agent, which outputs spaces correctly. Also the according check has been modified so that it can deal with spaces in the names of the mount points. --- .werks/350 | 15 +++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 1 + checks/nfsmounts | 16 ++++++++++------ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.werks/350 b/.werks/350 new file mode 100644 index 0000000..f3d4647 --- /dev/null +++ b/.werks/350 @@ -0,0 +1,15 @@ +Title: nfsmounts: correctly handle mount points with spaces +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387293636 +Targetversion: future + +If you have a space in the name of your <b>moint point</b> (not in the name +of the export) then the Linux agent would show this mount point always as +<tt>hanging</tt>. The reason is that in <tt>/proc/mounts</tt> spaces are +displayed as <tt>\040</tt>. This has now been fixed in the agent, which +outputs spaces correctly. Also the according check has been modified so that +it can deal with spaces in the names of the mount points. diff --git a/ChangeLog b/ChangeLog index c67a9ac..d0b1e3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 0383 FIX: solaris_mem: Is now compatible to more systems... * 0109 FIX: cisco_fantray: Prevent inventory for not available fans * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs + * 0350 FIX: nfsmounts: correctly handle mount points with spaces... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2f67328..7c24e92 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -138,6 +138,7 @@ then echo '<<<nfsmounts>>>' sed -n '/ nfs4\? /s/[^ ]* $[^ ]*$ .*/\1/p' < /proc/mounts | + sed 's/\\040/ /g' | while read MP do if [ $STAT_VERSION != $STAT_BROKE ]; then diff --git a/checks/nfsmounts b/checks/nfsmounts index 60df36b..e86cfa7 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -24,22 +24,26 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Example out from agent: +# <<<nfsmounts>>> +# /foobar hanging 0 0 0 0 +# /with spaces ok 217492 123563 112515 524288 def inventory_nfsmounts(info): - return [ (line[0], None) for line in info ] + return [ (" ".join(line[:-5]), None) for line in info ] def check_nfsmounts(item, _no_params, info): for line in info: - mountpoint = line[0] + mountpoint = " ".join(line[:-5]) if mountpoint == item: - size_blocks = int(line[2]) - free_blocks = int(line[4]) # for non-root user - blocksize = int(line[5]) + size_blocks = int(line[-4]) + free_blocks = int(line[-2]) # for non-root user + blocksize = int(line[-1]) if size_blocks < 0 or free_blocks < 0 or blocksize > 1024*1024: return (2, "Stale NFS handle") - if line[1] == 'ok': + if line[-5] == 'ok': gb = 1024 * 1024 * 1024.0 size_gb = (size_blocks * blocksize) / gb if size_gb == 0:

10 years, 6 months

Check_MK Git: check_mk: cisco_fantray: fixed new syntax error

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e86b399dce8819bed1235eb16741120d5217c6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e86b399dce881… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 16:10:42 2013 +0100 cisco_fantray: fixed new syntax error --- ChangeLog | 4 ++-- checks/cisco_fantray | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13ba59a..c67a9ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,10 +52,10 @@ * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... * 0381 FIX: win_printers: Fixed creation of duplicate services... * 0347 FIX: smart.stats: Remove duplicate disks... - * 0109 FIX: cisco_fantray: Prevent inventory for not available fans - * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs * 0349 FIX: winperf.cpuusage: update man page: this check is deprecated * 0383 FIX: solaris_mem: Is now compatible to more systems... + * 0109 FIX: cisco_fantray: Prevent inventory for not available fans + * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/cisco_fantray b/checks/cisco_fantray index 3ea17e1..6c3fc18 100644 --- a/checks/cisco_fantray +++ b/checks/cisco_fantray @@ -30,7 +30,7 @@ def inventory_cisco_fantray(info): if info and info[0]: #Some Cisco switches reporting not available fans as down, #so we cant invenorize fans reported as down - return [ (line[0], None) for line in info if line[1] != '3' + return [ (line[0], None) for line in info if line[1] != '3' ] def check_cisco_fantray(item, params, info): for line in info:

10 years, 6 months

Check_MK Git: check_mk: emc_isilon.names check manpage:

by Bernd Stroessenreuther

improved description Message-ID: <52b0684b.RMrMgL98HUVpKRX2%bs(a)mathias-kettner.de> 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: ebf6e809f1e32902c569835a0c74017f20e072ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebf6e809f1e329… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Dec 17 16:05:43 2013 +0100 emc_isilon.names check manpage: improved description --- checkman/emc_isilon.names | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkman/emc_isilon.names b/checkman/emc_isilon.names index c84b123..5774a62 100644 --- a/checkman/emc_isilon.names +++ b/checkman/emc_isilon.names @@ -4,7 +4,8 @@ catalog: hw/storagehw/emc license: GPL silon Infodistribution: check_mk description: - Reports the Cluster and Node Name. This Check always returns {OK}. + Reports the Cluster and Node Name of EMC Isilon Storage System. This + Check always returns {OK}. inventory: Finds exactly one service on each EMC Isilon System, named Isilon Info.

10 years, 6 months

Check_MK Git: check_mk: emc_isilon: New checks for EMC Isilon Storage System

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 9f27166f44dc70406fda9b10ed6965cdfb94f305 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f27166f44dc70… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Dec 17 16:03:06 2013 +0100 emc_isilon: New checks for EMC Isilon Storage System --- .werks/317 | 8 +++ ChangeLog | 1 + checkman/emc_isilon.clusterhealth | 16 ++++++ checkman/emc_isilon.names | 10 ++++ checkman/emc_isilon.nodes | 14 +++++ checks/emc_isilon | 102 ++++++++++++++++++++++++++++++++++++ modules/catalog.py | 1 + web/plugins/perfometer/check_mk.py | 1 + 8 files changed, 153 insertions(+) diff --git a/.werks/317 b/.werks/317 new file mode 100644 index 0000000..ba0e70b --- /dev/null +++ b/.werks/317 @@ -0,0 +1,8 @@ +Title: emc_isilon: New checks for EMC Isilon Storage System +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1387292523 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a50f947..1434da0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 0316 hitachi_hnas_cpu: New check for CPU utilization of Hitachi HNAS devices * 0373 wut_webtherm: Supporting several other devices now * 0377 check_http: Certificate Age mode now supports SNI... + * 0317 emc_isilon: New checks for EMC Isilon Storage System * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/emc_isilon.clusterhealth b/checkman/emc_isilon.clusterhealth new file mode 100644 index 0000000..8e2d432 --- /dev/null +++ b/checkman/emc_isilon.clusterhealth @@ -0,0 +1,16 @@ +title: EMC Isilon: ClusterHealth +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Checks the ClusterHealth (Overall Status) of an EMC Isilon Storage + System as reported by SNMP. + + Returns {OK} on status ok, {CRIT} on status attn, down or invalid + and {UNKN} on every other status. + +inventory: + Finds exactly one service on each EMC Isilon System, named + Cluster Health + diff --git a/checkman/emc_isilon.names b/checkman/emc_isilon.names new file mode 100644 index 0000000..c84b123 --- /dev/null +++ b/checkman/emc_isilon.names @@ -0,0 +1,10 @@ +title: EMC Isilon: Report Cluster and Node Name +agents: snmp +catalog: hw/storagehw/emc +license: GPL +silon Infodistribution: check_mk +description: + Reports the Cluster and Node Name. This Check always returns {OK}. + +inventory: + Finds exactly one service on each EMC Isilon System, named Isilon Info. diff --git a/checkman/emc_isilon.nodes b/checkman/emc_isilon.nodes new file mode 100644 index 0000000..058cba0 --- /dev/null +++ b/checkman/emc_isilon.nodes @@ -0,0 +1,14 @@ +title: EMC Isilon: Online Status of Nodes +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Checks the Online Status of Nodes in an EMC Isilon Storage System. + + Returns {OK} if all configured nodes are listed as online nodes + and {CRIT} otherwise. + +inventory: + Finds exactly one service on each EMC Isilon System, named Nodes. + diff --git a/checks/emc_isilon b/checks/emc_isilon new file mode 100644 index 0000000..e04d971 --- /dev/null +++ b/checks/emc_isilon @@ -0,0 +1,102 @@ +#!/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. + +emc_isilon_info = [(".1.3.6.1.4.1.12124.1.1", [1, 2, 5, 6]), + # clusterName, clusterHealth, configuredNodes, onlineNodes + (".1.3.6.1.4.1.12124.2.1", [1]), # nodeName + ] + +def emc_isilon_scan(oid): + return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") + +# .--ClusterHealth------------------------------------------------------. + +def inventory_emc_isilon_clusterhealth(info): + return [(None, None)] + +def check_emc_isilon_clusterhealth(item, _no_params, info): + status=int(info[0][0][1]) + statusmap = ("ok", "attn", "down", "invalid") + if status >= len(statusmap): + return 3, "ClusterHealth reports unidentified status %s" % status + else: + if status == 0: + rc = 0 + else: + rc = 2 + return rc, "ClusterHealth reports status %s" % statusmap[status] + +check_info["emc_isilon.clusterhealth"] = { + "check_function" : check_emc_isilon_clusterhealth, + "inventory_function" : inventory_emc_isilon_clusterhealth, + "service_description" : "Cluster Health", + "has_perfdata" : False, + "snmp_info" : emc_isilon_info, + "snmp_scan_function" : emc_isilon_scan +} + +#. +# .--Nodes------------------------------------------------------. + +def inventory_emc_isilon_nodes(info): + return [(None, None)] + +def check_emc_isilon_nodes(item, _no_params, info): + cluster_name, cluster_health, configured_nodes, online_nodes = info[0][0] + if configured_nodes == online_nodes: + rc = 0 + else: + rc = 2 + return rc, "Configured Nodes: %s / Online Nodes: %s" % (configured_nodes, online_nodes) + +check_info["emc_isilon.nodes"] = { + "check_function" : check_emc_isilon_nodes, + "inventory_function" : inventory_emc_isilon_nodes, + "service_description" : "Nodes", + "has_perfdata" : False, + "snmp_info" : emc_isilon_info, + "snmp_scan_function" : emc_isilon_scan +} + +#. +# .--Cluster- and Node Name-------------------------------------------. + +def inventory_emc_isilon_names(info): + return [(None, None)] + +def check_emc_isilon_names(item, _no_params, info): + return 0, "Cluster Name is %s, Node Name is %s" % (info[0][0][0], info[1][0][0]) + +check_info["emc_isilon.names"] = { + "check_function" : check_emc_isilon_names, + "inventory_function" : inventory_emc_isilon_names, + "service_description" : "Isilon Info", + "has_perfdata" : False, + "snmp_info" : emc_isilon_info, + "snmp_scan_function" : emc_isilon_scan +} + +#. diff --git a/modules/catalog.py b/modules/catalog.py index 7c546c5..6cbd5f0 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -30,6 +30,7 @@ manpage_catalog_titles = { "mcdata" : "McDATA", "netapp" : "NetApp", "hitachi" : "Hitachi", + "emc" : "EMC", "phone" : "Telephony", "app" : "Applications", diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 2abf9db..dca0387 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -430,6 +430,7 @@ perfometers["check_mk-cisco_cpu"] = perfometer_cpu_utilization perfometers["check_mk-juniper_cpu"] = perfometer_cpu_utilization perfometers["check_mk-brocade_mlx.module_cpu"] = perfometer_cpu_utilization perfometers["check_mk-hitachi_hnas_cpu"] = perfometer_cpu_utilization +perfometers["check_mk-hr_cpu"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data])

10 years, 6 months

Check_MK Git: check_mk: cisco_sys_mem: Changed check_group

by Bastian Kuhn

Module: check_mk Branch: master Commit: f59994ee99778477ce24d44446d5c37d67939ee2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f59994ee997784… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 17 15:05:14 2013 +0100 cisco_sys_mem: Changed check_group --- checks/cisco_sys_mem | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/cisco_sys_mem b/checks/cisco_sys_mem index ddadfe1..a56af93 100644 --- a/checks/cisco_sys_mem +++ b/checks/cisco_sys_mem @@ -33,9 +33,9 @@ def inventory_cisco_sys_mem(info): if info: return [ (None, "cisco_mem_default_levels") ] else: - return (3, "no snmp data found") + return [] -def check_cisco_sys_mem(item, params, info): +def check_cisco_sys_mem(_no_item, params, info): warn, crit = params if info[0][0]: mem_used = float(info[0][0]) @@ -56,7 +56,7 @@ check_info["cisco_sys_mem"] = { "inventory_function" : inventory_cisco_sys_mem, "service_description" : "Supervisor Mem Used", "has_perfdata" : True, - "group" : "cisco_mem", + "group" : "memory", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.305.1.1.2.0"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.305.1.1.2", "0" ), }

10 years, 6 months

Check_MK Git: check_mk: Changed checkgroup of cisco_sys_mem

by Bastian Kuhn

Module: check_mk Branch: master Commit: de1bb08206a574341a3f6256c86eb79fd4e254a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1bb08206a574… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 17 14:52:13 2013 +0100 Changed checkgroup of cisco_sys_mem --- checks/cisco_sys_mem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cisco_sys_mem b/checks/cisco_sys_mem index e202981..ddadfe1 100644 --- a/checks/cisco_sys_mem +++ b/checks/cisco_sys_mem @@ -56,7 +56,7 @@ check_info["cisco_sys_mem"] = { "inventory_function" : inventory_cisco_sys_mem, "service_description" : "Supervisor Mem Used", "has_perfdata" : True, - "group" : "cisco_sys_mem", + "group" : "cisco_mem", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.305.1.1.2.0"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.305.1.1.2", "0" ), }

10 years, 6 months

Check_MK Git: check_mk: FIX cisco_fantray: Prevent inventory for not available fans

by Bastian Kuhn

Module: check_mk Branch: master Commit: e90c87e47110cfdc6da2e3d2aff3036de15a096a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e90c87e47110cf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 17 14:23:59 2013 +0100 FIX cisco_fantray: Prevent inventory for not available fans --- .werks/109 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_fantray | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/109 b/.werks/109 new file mode 100644 index 0000000..c322562 --- /dev/null +++ b/.werks/109 @@ -0,0 +1,10 @@ +Title: cisco_fantray: Prevent inventory for not available fans +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387286606 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index c05775e..45fb10d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... * 0381 FIX: win_printers: Fixed creation of duplicate services... * 0347 FIX: smart.stats: Remove duplicate disks... + * 0109 FIX: cisco_fantray: Prevent inventory for not available fans Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/cisco_fantray b/checks/cisco_fantray index 65a1e36..3ea17e1 100644 --- a/checks/cisco_fantray +++ b/checks/cisco_fantray @@ -28,7 +28,9 @@ cisco_fan_states = ('', 'unknown', 'up', 'down', 'warning') def inventory_cisco_fantray(info): if info and info[0]: - return [ (line[0], None) for line in info ] + #Some Cisco switches reporting not available fans as down, + #so we cant invenorize fans reported as down + return [ (line[0], None) for line in info if line[1] != '3' def check_cisco_fantray(item, params, info): for line in info:

10 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013