Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: fixed naming of check added in werk 2572

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1f038183b3cb8b06bceedd54d2f6f541d17a4980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f038183b3cb8b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Sep 7 11:48:57 2015 +0200 fixed naming of check added in werk 2572 --- .werks/2572 | 2 +- ChangeLog | 2 +- checkman/{omreport_vdisk => dell_om_vdisks} | 0 checks/dell_om.include | 37 +++++++++++++++++ checks/{omreport_vdisk => dell_om_vdisks} | 2 +- checks/omreport.include | 60 --------------------------- 6 files changed, 40 insertions(+), 63 deletions(-) diff --git a/.werks/2572 b/.werks/2572 index d2b9f5a..8ab1781 100644 --- a/.werks/2572 +++ b/.werks/2572 @@ -1,4 +1,4 @@ -Title: omreport_vdisk: New check for virtual disks on Dell OpenManage supported devices +Title: dell_om_vdisks: New check for virtual disks on Dell OpenManage supported devices Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index f0da4e0..8e27100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,7 +72,7 @@ * 2563 ipr400_temp, ipr400_in_voltage: New checks for the Omnitronics IPR400 * 2583 new check datapower_tcp: monitors the number of TCP connections in the various possible states * 2565 dell_om_disks now warns if SMART predicts disk failure - * 2572 omreport_vdisk: New check for virtual disks on Dell OpenManage supported devices + * 2572 dell_om_vdisks: New check for virtual disks on Dell OpenManage supported devices * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checkman/omreport_vdisk b/checkman/dell_om_vdisks similarity index 100% rename from checkman/omreport_vdisk rename to checkman/dell_om_vdisks diff --git a/checks/dell_om.include b/checks/dell_om.include index ea3bd08..fa57c66 100644 --- a/checks/dell_om.include +++ b/checks/dell_om.include @@ -28,7 +28,44 @@ # operating system. We trigger on all Windows and Linux systems. # This is not optimal but still enough for excluding network # devices and similar stuff + + def scan_dell_om(oid): return "Open Manage" in oid(".1.3.6.1.2.1.1.1.0") or \ "Linux" in oid(".1.3.6.1.2.1.1.1.0") or \ "Software: Windows" in oid(".1.3.6.1.2.1.1.1.0") + + +def parse_omreport(info): + result = {} + current_obj = {} + + def insert(obj): + result[obj["ID"]] = obj.copy() + obj.clear() + + for line in info: + try: + idx = line.index(":") + except ValueError: + # no colon in the line + continue + key = " ".join(line[:idx]) + value = " ".join(line[idx + 1:]) + if key == "ID" and current_obj: + insert(current_obj) + + current_obj[key] = value + + insert(current_obj) + return result + + +def status_translate_omreport(code): + return { + "ok" : 0, + "non-critical" : 1, + "critical" : 2, + "not found" : 3 + }.get(code.lower(), 2) + diff --git a/checks/omreport_vdisk b/checks/dell_om_vdisks similarity index 98% rename from checks/omreport_vdisk rename to checks/dell_om_vdisks index 9b608ac..5158137 100644 --- a/checks/omreport_vdisk +++ b/checks/dell_om_vdisks @@ -68,6 +68,6 @@ check_info["omreport_vdisk"] = { "inventory_function" : inventory_omreport_vdisk, "parse_function" : parse_omreport, "service_description" : "Virtual Disk %s", - "includes" : ["omreport.include"] + "includes" : ["dell_om.include"] } diff --git a/checks/omreport.include b/checks/omreport.include deleted file mode 100644 index 8d8ea5a..0000000 --- a/checks/omreport.include +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2015 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 parse_omreport(info): - result = {} - current_obj = {} - - def insert(obj): - result[obj["ID"]] = obj.copy() - obj.clear() - - for line in info: - try: - idx = line.index(":") - except ValueError: - # no colon in the line - continue - key = " ".join(line[:idx]) - value = " ".join(line[idx + 1:]) - if key == "ID" and current_obj: - insert(current_obj) - - current_obj[key] = value - - insert(current_obj) - return result - - -def status_translate_omreport(code): - return { - "ok" : 0, - "non-critical" : 1, - "critical" : 2, - "not found" : 3 - }.get(code.lower(), 2) -

9 years

Check_MK Git: check_mk: #2572 omreport_vdisk: New check for virtual disks on Dell OpenManage supported devices

by Sebastian Herbord

Module: check_mk Branch: master Commit: 381025139e9f50061e70a33e393240b2450f1cae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=381025139e9f50… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Sep 7 11:29:48 2015 +0200 #2572 omreport_vdisk: New check for virtual disks on Dell OpenManage supported devices --- .werks/2572 | 9 ++++++ ChangeLog | 1 + agents/plugins/mk_omreport | 30 ++++++++++++++++++ checkman/omreport_vdisk | 20 ++++++++++++ checks/omreport.include | 60 ++++++++++++++++++++++++++++++++++++ checks/omreport_vdisk | 73 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 193 insertions(+) diff --git a/.werks/2572 b/.werks/2572 new file mode 100644 index 0000000..d2b9f5a --- /dev/null +++ b/.werks/2572 @@ -0,0 +1,9 @@ +Title: omreport_vdisk: New check for virtual disks on Dell OpenManage supported devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441618103 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9b03f53..f0da4e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 2563 ipr400_temp, ipr400_in_voltage: New checks for the Omnitronics IPR400 * 2583 new check datapower_tcp: monitors the number of TCP connections in the various possible states * 2565 dell_om_disks now warns if SMART predicts disk failure + * 2572 omreport_vdisk: New check for virtual disks on Dell OpenManage supported devices * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/agents/plugins/mk_omreport b/agents/plugins/mk_omreport new file mode 100755 index 0000000..fb84fc5 --- /dev/null +++ b/agents/plugins/mk_omreport @@ -0,0 +1,30 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +if which omreport >/dev/null +then + echo "<<<omreport_vdisk>>>" + omreport storage vdisk +fi diff --git a/checkman/omreport_vdisk b/checkman/omreport_vdisk new file mode 100644 index 0000000..5c34428 --- /dev/null +++ b/checkman/omreport_vdisk @@ -0,0 +1,20 @@ +title: Dell OpenManage: Virtual Disks +agents: linux +catalog: hw/server/dell +license: GPL +distribution: check_mk +description: + This check monitors the current status of Virtual Disks (i.e. raid) on + a Dell server. + The check returns error states based on what the device reports itself. + It also returns a {CRIT} if the "state" of the device isn't reported as "ready". + + This check requires the omreport tool to be installed and the mk_omreport plugin + to be installed. + +item: + Vogical disk number as reported by omreport + +inventory: + One check is created for each virtual disk + diff --git a/checks/omreport.include b/checks/omreport.include new file mode 100644 index 0000000..8d8ea5a --- /dev/null +++ b/checks/omreport.include @@ -0,0 +1,60 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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 parse_omreport(info): + result = {} + current_obj = {} + + def insert(obj): + result[obj["ID"]] = obj.copy() + obj.clear() + + for line in info: + try: + idx = line.index(":") + except ValueError: + # no colon in the line + continue + key = " ".join(line[:idx]) + value = " ".join(line[idx + 1:]) + if key == "ID" and current_obj: + insert(current_obj) + + current_obj[key] = value + + insert(current_obj) + return result + + +def status_translate_omreport(code): + return { + "ok" : 0, + "non-critical" : 1, + "critical" : 2, + "not found" : 3 + }.get(code.lower(), 2) + diff --git a/checks/omreport_vdisk b/checks/omreport_vdisk new file mode 100644 index 0000000..9b608ac --- /dev/null +++ b/checks/omreport_vdisk @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + + +# sample agent output: +# +# <<<omreport_vdisk>>> +# ID : 0 +# Status : Ok +# Name : Virtual Disk 0 +# State : Ready +# Hot Spare Policy violated : Not Assigned +# Encrypted : Not Applicable +# Layout : RAID-1 +# Size : 278.88 GB (299439751168 bytes) +# T10 Protection Information Status : No +# Associated Fluid Cache State : Not Applicable +# Device Name : /dev/sda +# Bus Protocol : SAS +# Media : HDD +# Read Policy : Read Ahead +# Write Policy : Write Back +# Cache Policy : Not Applicable +# Stripe Element Size : 64 KB +# Disk Cache Policy : Unchanged + + +def inventory_omreport_vdisk(parsed): + return [(key, None) for key in parsed.keys()] + + +def check_omreport_vdisk(item, params, parsed): + if item in parsed: + status = status_translate_omreport(parsed[item]["Status"]) + if parsed[item]["State"] != "Ready": + status = 2 + + return status, "Device: %s, Status: %s, State: %s, Layout: %s" %\ + (parsed[item]["Device Name"], parsed[item]["Status"], + parsed[item]["State"], parsed[item]["Layout"]) + + +check_info["omreport_vdisk"] = { + "check_function" : check_omreport_vdisk, + "inventory_function" : inventory_omreport_vdisk, + "parse_function" : parse_omreport, + "service_description" : "Virtual Disk %s", + "includes" : ["omreport.include"] +} +

9 years

Check_MK Git: check_mk: moved check manpage

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c8e24250f49237b3a91c6ef2567791974ea49a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c8e24250f4923… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 7 09:33:41 2015 +0200 moved check manpage --- {checks => checkman}/bi_aggr | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checks/bi_aggr b/checkman/bi_aggr similarity index 100% rename from checks/bi_aggr rename to checkman/bi_aggr

9 years

Check_MK Git: check_mk: Added missing man pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a2b8511839daccee065b29c5a8ca1a82908727f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a2b8511839dac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 7 09:32:11 2015 +0200 Added missing man pages --- checkman/mail | 11 +++++++++++ checkman/mail_loop | 13 +++++++++++++ checkman/siemens_plc.counter | 20 ++++++++++++++++++++ checks/bi_aggr | 8 ++++++++ 4 files changed, 52 insertions(+) diff --git a/checkman/mail b/checkman/mail new file mode 100644 index 0000000..71d4612 --- /dev/null +++ b/checkman/mail @@ -0,0 +1,11 @@ +title: POP3/IMAP connection and optional mail forwarding +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + Logs in into an IMAP or POP3 mailbox to monitor whether or not the login is possible. + An extended, optional, feature is, that the check can fetch all (or just some) mails + from the mailbox and forward them as events to the Event Console. + + This check can be configured using WATO. diff --git a/checkman/mail_loop b/checkman/mail_loop new file mode 100644 index 0000000..2ed2b6a --- /dev/null +++ b/checkman/mail_loop @@ -0,0 +1,13 @@ +title: POP3/IMAP connection and optional mail forwarding +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + Sends out special eMails to a defined mail address using the SMTP protocol + and then tries to receive these mails back by querying the inbox of a IMAP + or POP3 mailbox. + + With this check you can verify that your whole mail delivery progress is working. + + This check can be configured using WATO. diff --git a/checkman/siemens_plc.counter b/checkman/siemens_plc.counter new file mode 100644 index 0000000..d127565 --- /dev/null +++ b/checkman/siemens_plc.counter @@ -0,0 +1,20 @@ +title: Siemens PLC: Counter values +agents: siemens_plc +catalog: hw/other +license: GPL +distribution: check_mk +description: + The check monitors the counter values reported by Siemens PLC (SPS) devices. + + You need to use and configure the special agent {agent_siemens_plc} which is using the SNAP7 + library to communicate with the Siemens PLC. When you are using OMD, everything is already + installed and configured. In manual setups, you will need to ensure that the snap7 library + and python module {snap7} are installed. + To make temperature values available for the check, you need to configure the memory addresses + and data types to read from the device as temperature values. + + The checks does not {WARN}/{CRIT} unless you configure the thresholds for the check, as the + device does not report any thresholds. + +inventory: + One check for each configured counter is created automatically. diff --git a/checks/bi_aggr b/checks/bi_aggr new file mode 100644 index 0000000..efa69ba --- /dev/null +++ b/checks/bi_aggr @@ -0,0 +1,8 @@ +title: BI Aggregations +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + Connects to the local or a remote Check_MK monitoring server to gather the state of a Check_MK + BI to aggregation and reports the state of this aggregation as result.

9 years

Check_MK Git: check_mk: Removed not working link

by Bastian Kuhn

Module: check_mk Branch: master Commit: 168f033c8b08ef8097429944091277723272783f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=168f033c8b08ef… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 7 09:32:09 2015 +0200 Removed not working link --- checkman/hp_proliant | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checkman/hp_proliant b/checkman/hp_proliant index 0140f57..ad98554 100644 --- a/checkman/hp_proliant +++ b/checkman/hp_proliant @@ -9,8 +9,7 @@ description: In addition it also returns the serial number and firmware version. The status is {OK} only if the agent signals {Ok}, {WARN} on - {Degraded} and {CRIT} on {Failed}. If you get an {UKNOWN} state you may need a Fireware Update: - http://h20566.www2.hp.com/hpsc/doc/public/display?docId=c03939085&jum + {Degraded} and {CRIT} on {Failed}. If you get an {UKNOWN} state you may need a Firmware Update inventory: One check is automatically created for each supported server.

9 years

Check_MK Git: check_mk: Fixed exception when ldap connection of existing ldap users is deleted

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b80629c9cb252d59b1e85d240ea6b6f94c8c0d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b80629c9cb252… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 7 09:13:10 2015 +0200 Fixed exception when ldap connection of existing ldap users is deleted --- web/htdocs/userdb.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 10c171d..299cb59 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -116,19 +116,27 @@ def get_connection(connection_id): return dict(get_connections()).get(connection_id) -# Returns a list of locked attributes +# Returns a list of connection specific locked attributes def locked_attributes(connection_id): - return get_connection(cleanup_connection_id(connection_id)).locked_attributes() + return get_attributes(connection_id, "locked_attributes") -# Returns a list of multisite attributes +# Returns a list of connection specific multisite attributes def multisite_attributes(connection_id): - return get_connection(cleanup_connection_id(connection_id)).multisite_attributes() + return get_attributes(connection_id, "multisite_attributes") -# Returns a list of non contact attributes +# Returns a list of connection specific non contact attributes def non_contact_attributes(connection_id): - return get_connection(cleanup_connection_id(connection_id)).non_contact_attributes() + return get_attributes(connection_id, "non_contact_attributes") + + +def get_attributes(connection_id, what): + connection = get_connection(connection_id) + if connection: + return getattr(connection, what)() + else: + return [] def new_user_template(connection_id):

9 years

Check_MK Git: check_mk: local: slight update of error handling

by Mathias Kettner

Module: check_mk Branch: master Commit: 78ac8f172c9585377c61e484d96145f86e37ed2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78ac8f172c9585… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 3 17:03:31 2015 +0200 local: slight update of error handling --- checks/local | 17 ++++++++++++----- modules/discovery.py | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/checks/local b/checks/local index ee63afc..28a7cf5 100644 --- a/checks/local +++ b/checks/local @@ -84,6 +84,7 @@ def local_compute_state(perfdata): return worst, texts + def inventory_local(info): inventory = [] # Lines with P do not need to supply a text @@ -91,16 +92,17 @@ def inventory_local(info): if len(line) >= 4 or len(line) == 3 and line[0] == 'P': inventory.append( (line[1], None) ) else: - raise MKGeneralException("Invalid local check output: %s" % line) + raise MKGeneralException("Invalid local check output: %s" % " ".join(line)) return inventory + def check_local(item, params, info): for line in info: # Ignore invalid lines, tolerate bugs in local checks # of unexperienced users if len(line) >= 2 and line[1] == item: if not (len(line) >= 4 or (len(line) == 3 and line[0] == 'P')): - return 3, "Invalid local check output: %s" % line + return 3, "Incomplete line in local check output: %s" % " ".join(line) statechar = line[0] perftxt = line[2] @@ -114,19 +116,24 @@ def check_local(item, params, info): values = valuetxt.split(';') perfdata.append(tuple( [varname] + values )) except ValueError: - return 3, "Invalid local check output: %s" % line + return 3, "Invalid performance data %s in local check output %s" % \ + (perftxt, " ".join(line)) if statechar == 'P': state, texts = local_compute_state(perfdata) if output: texts = [output] + texts output = ", ".join(texts) else: - state = int(statechar) + try: + state = int(statechar) + except: + return 3, "Invalid state %s in local check output %s: must be P, 0, 1, 2 or 3" % \ + (statechar, " ".join(line)) + if state not in range(0, 4): output += ", local check has sent invalid state %d" % state state = 3 return (state, output, perfdata) - return (3, "Check output not found in local checks") check_info["local"] = { diff --git a/modules/discovery.py b/modules/discovery.py index 35217cf..844e300 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -513,7 +513,7 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches, on_error): except Exception, e: if on_error != "ignore": - warning(" Exception in discovery function of check type %s" % check_type) + warning(" Exception in discovery function of check type '%s'." % check_type) if on_error == "raise": raise return []

9 years

Check_MK Git: check_mk: #2571 FIX local: improved reporting of bad local check output

by Sebastian Herbord

Module: check_mk Branch: master Commit: 66bd23dd12e5bfba57aff5ee8ccca9e639a20037 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66bd23dd12e5bf… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Sep 3 16:47:57 2015 +0200 #2571 FIX local: improved reporting of bad local check output --- .werks/2571 | 9 +++++++++ ChangeLog | 1 + checks/local | 18 ++++++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.werks/2571 b/.werks/2571 new file mode 100644 index 0000000..0aed2f8 --- /dev/null +++ b/.werks/2571 @@ -0,0 +1,9 @@ +Title: local: improved reporting of bad local check output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441291579 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8f4d1a8..9b03f53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -168,6 +168,7 @@ * 2559 FIX: job: Trying to read job result files as non root when agent is not executed as root * 2570 FIX: winperf_msx_queues: fixed crash when winperf data is missing... * 2593 FIX: cisco_wlc, cisco_wlc_clients: Fix discovery so that Cisco Virtual Wireless Controller are detected... + * 2571 FIX: local: improved reporting of bad local check output Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/local b/checks/local index 1ad3f4a..ee63afc 100644 --- a/checks/local +++ b/checks/local @@ -86,12 +86,12 @@ def local_compute_state(perfdata): def inventory_local(info): inventory = [] - # Ignore invalid lines, tolerate bugs in local checks - # of unexperianced users. Lines with P do not need to - # supply a text + # Lines with P do not need to supply a text for line in info: if len(line) >= 4 or len(line) == 3 and line[0] == 'P': inventory.append( (line[1], None) ) + else: + raise MKGeneralException("Invalid local check output: %s" % line) return inventory def check_local(item, params, info): @@ -99,6 +99,9 @@ def check_local(item, params, info): # Ignore invalid lines, tolerate bugs in local checks # of unexperienced users if len(line) >= 2 and line[1] == item: + if not (len(line) >= 4 or (len(line) == 3 and line[0] == 'P')): + return 3, "Invalid local check output: %s" % line + statechar = line[0] perftxt = line[2] output = " ".join(line[3:]) @@ -106,9 +109,12 @@ def check_local(item, params, info): if perftxt != "-": # new: allow multiple perfdata by using | as separator for entry in perftxt.split('|'): - varname, valuetxt = entry.split('=') - values = valuetxt.split(';') - perfdata.append(tuple( [varname] + values )) + try: + varname, valuetxt = entry.split('=') + values = valuetxt.split(';') + perfdata.append(tuple( [varname] + values )) + except ValueError: + return 3, "Invalid local check output: %s" % line if statechar == 'P': state, texts = local_compute_state(perfdata) if output:

9 years

Check_MK Git: check_mk: Added some more details to check crash reports

by Lars Michelsen

Module: check_mk Branch: master Commit: a9632b9d2d216d9775020a48e1603c2b0953a1d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9632b9d2d216d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 16:32:16 2015 +0200 Added some more details to check crash reports --- modules/check_mk_base.py | 10 ++++++++++ web/htdocs/crash_reporting.py | 32 +++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2a89ca7..8ffcfb6 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1507,6 +1507,13 @@ def prepare_crash_dump_directory(crash_dir): pass +def is_manual_check(hostname, check_type, item): + manual_checks = get_check_table(hostname, remove_duplicates=True, + world=opt_keepalive and "active" or "config", + skip_autochecks=True) + return (check_type, item) in manual_checks + + def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, description, info, text): exc_type, exc_value, exc_traceback = sys.exc_info() @@ -1521,11 +1528,14 @@ def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, d "details" : { "check_output" : text, "host" : hostname, + "is_cluster" : is_cluster(hostname), "description" : description, "check_type" : check_type, "item" : item, "params" : params, "uses_snmp" : check_uses_snmp(check_type), + "inline_snmp" : has_inline_snmp and use_inline_snmp, + "manual_check" : is_manual_check(hostname, check_type, item), }, } diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 01048fa..a373a02 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -279,20 +279,42 @@ def show_crash_report(info): def show_crashed_check_details(info): + def format_bool(val): + return { + True : _("Yes"), + False : _("No"), + None : _("Unknown"), + }[val] + details = info["details"] html.write("<h2>%s</h2>" % _("Details")) html.write("<table class=\"data\">") + html.write("<tr class=\"data even0\"><td class=\"left legend\">%s</td>" % _("Host")) html.write("<td>%s</td></tr>" % html.attrencode(details["host"])) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check Type")) + + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Is Cluster Host")) + html.write("<td>%s</td></tr>" % format_bool(details.get("is_cluster"))) + + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Check Type")) html.write("<td>%s</td></tr>" % html.attrencode(details["check_type"])) + + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Manual Check")) + html.write("<td><pre>%s</pre></td></tr>" % format_bool(details.get("manual_check"))) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Uses SNMP")) - html.write("<td><pre>%s</pre></td></tr>" % (details.get("uses_snmp", False) and _("Yes") or _("No"))) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check Item")) + html.write("<td><pre>%s</pre></td></tr>" % format_bool(details.get("uses_snmp"))) + + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Inline-SNMP")) + html.write("<td><pre>%s</pre></td></tr>" % format_bool(details.get("inline_snmp"))) + + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Check Item")) html.write("<td>%s</td></tr>" % html.attrencode(details["item"])) - html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Description")) + + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Description")) html.write("<td>%s</td></tr>" % html.attrencode(details["description"])) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Parameters")) + + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Parameters")) html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_params(details["params"]))) html.write("</table>")

9 years

Check_MK Git: check_mk: #2593 FIX cisco_wlc, cisco_wlc_clients: Fix discovery so that Cisco Virtual Wireless Controller are detected

by Mathias Kettner

Module: check_mk Branch: master Commit: 56e885114de2a1e895fb621a04874e4682f90e62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56e885114de2a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 3 16:00:11 2015 +0200 #2593 FIX cisco_wlc, cisco_wlc_clients: Fix discovery so that Cisco Virtual Wireless Controller are detected Thanks to Jonas Alexandersson. --- .werks/2593 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_wlc | 1 + checks/cisco_wlc_clients | 1 + 4 files changed, 13 insertions(+) diff --git a/.werks/2593 b/.werks/2593 new file mode 100644 index 0000000..69fa40f --- /dev/null +++ b/.werks/2593 @@ -0,0 +1,10 @@ +Title: cisco_wlc, cisco_wlc_clients: Fix discovery so that Cisco Virtual Wireless Controller are detected +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441288768 + +Thanks to Jonas Alexandersson. diff --git a/ChangeLog b/ChangeLog index 730017f..8f4d1a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -167,6 +167,7 @@ * 2569 FIX: fixed crash in aix lvm check after volume disappears... * 2559 FIX: job: Trying to read job result files as non root when agent is not executed as root * 2570 FIX: winperf_msx_queues: fixed crash when winperf data is missing... + * 2593 FIX: cisco_wlc, cisco_wlc_clients: Fix discovery so that Cisco Virtual Wireless Controller are detected... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/cisco_wlc b/checks/cisco_wlc index 0cf6ea8..841e99e 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -77,6 +77,7 @@ check_info["cisco_wlc"] = { "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [".1.3.6.1.4.1.9.1.1069", ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1645", + ".1.3.6.1.4.1.9.1.1631", ".1.3.6.1.4.1.9.1.1279"], "snmp_info" : [( ".1.3.6.1.4.1.14179.2.2.1.1.3", [ OID_END, '' ]), ( ".1.3.6.1.4.1.14179.2.2.1.1.1", [ OID_END, '' ]), diff --git a/checks/cisco_wlc_clients b/checks/cisco_wlc_clients index bbd8917..65cf782 100644 --- a/checks/cisco_wlc_clients +++ b/checks/cisco_wlc_clients @@ -74,6 +74,7 @@ check_info["cisco_wlc_clients"] = { "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [".1.3.6.1.4.1.9.1.1069", ".1.3.6.1.4.1.9.1.1645", + ".1.3.6.1.4.1.9.1.1631", ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1279"], "snmp_info" : ( ".1.3.6.1.4.1.14179.2.1.1.1", [ 2, 42, 38 ]),

9 years

← Newer
1
...
19
20
21
22
23
24
25
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015