Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

Changed State of HW/SW Inventory check in case of no data found

by Bastian Kuhn

Module: check_mk Branch: master Commit: 08c05bd68777bce8a3d96453cca0544249d12aae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08c05bd68777bc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 25 15:35:43 2015 +0100 Changed State of HW/SW Inventory check in case of no data found --- modules/inventory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/inventory.py b/modules/inventory.py index 897eee0..ccada05 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -182,8 +182,8 @@ def do_inv_check(hostname): inv_tree, old_timestamp = do_inv_for(hostname) num_entries = count_nodes(g_inv_tree) if not num_entries: - sys.stdout.write("WARN - Found no data\n") - sys.exit(1) + sys.stdout.write("OK - Found no data\n") + sys.exit(0) infotext = "found %d entries" % num_entries state = 0

8 years, 10 months

added perfdata for barracuda_mail_latency check

by Simon Betz

Module: check_mk Branch: master Commit: 3e0cb438833cc212d96c5880b605081ebcb419b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e0cb438833cc2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 25 15:14:18 2015 +0100 added perfdata for barracuda_mail_latency check --- checkman/barracuda_mail_latency | 3 +++ checks/barracuda_mail_latency | 2 +- web/plugins/metrics/check_mk.py | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/checkman/barracuda_mail_latency b/checkman/barracuda_mail_latency index e6188f4..ef3cefe 100644 --- a/checkman/barracuda_mail_latency +++ b/checkman/barracuda_mail_latency @@ -12,5 +12,8 @@ description: item: No item. +perfdata: + Mail latency in seconds. + inventory: One service is created. diff --git a/checks/barracuda_mail_latency b/checks/barracuda_mail_latency index d91ba1a..ce09d64 100644 --- a/checks/barracuda_mail_latency +++ b/checks/barracuda_mail_latency @@ -49,7 +49,7 @@ def check_barracuda_mail_latency(_no_item, params, info): (get_age_human_readable(warn), get_age_human_readable(crit)) - return state, infotext + return state, infotext, [ ( "mail_latency", avg_mail_latency, warn, crit) ] check_info['barracuda_mail_latency'] = { diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 1bce8d5..953a362 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1486,6 +1486,12 @@ metric_info["sync_latency"] = { "color" : "#ffb080", } +metric_info["mail_latency"] = { + "title" : _("Mail latency"), + "unit" : "s", + "color" : "#ffb080", +} + metric_info["printer_queue"] = { "title" : _("Printer queue length"), "unit" : "count", @@ -3598,6 +3604,13 @@ perfometer_info.append({ perfometer_info.append({ "type" : "logarithmic", + "metric" : "mail_latency", + "half_value" : 5, + "exponent" : 2, +}) + +perfometer_info.append({ + "type" : "logarithmic", "metric" : "backup_size", "half_value" : 150*GB, "exponent" : 2.0,

8 years, 10 months

#2840 barracuda_mail_latency, barracuda_mailqueues,

by Simon Betz

barracuda_system_cpu_util: new checks for Barracuda SPAM Firewall Appliance Message-ID: <5655bfa4.Ifzrv9rlc2RdtMpg%si(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: ac6d1c6a243b116e0d6a3332e7562715bb8622fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac6d1c6a243b11… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 25 14:58:13 2015 +0100 #2840 barracuda_mail_latency, barracuda_mailqueues, barracuda_system_cpu_util: new checks for Barracuda SPAM Firewall Appliance These checks monitor the active and deferred mail queues, the mail latency and the system cpu utilization of a Barrcuda SPAM Firewall Appliance. Moreover the barracuda_mailqueues check reports the incoming and daily sent mails. --- .werks/2840 | 11 +++++ ChangeLog | 1 + checkman/barracuda_mail_latency | 16 +++++++ checkman/barracuda_mailqueues | 21 +++++++++ checkman/barracuda_system_cpu_util | 18 ++++++++ checks/barracuda_mail_latency | 72 +++++++++++++++++++++++++++++ checks/barracuda_mailqueues | 83 ++++++++++++++++++++++++++++++++++ checks/barracuda_system_cpu_util | 59 ++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 15 ++++++ 9 files changed, 296 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac6d1c6a24…

8 years, 10 months

new check and manpages

by Simon Betz

Module: check_mk Branch: master Commit: c3cb924736b61b23ebf0d6e6c05045c6e98ac42f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3cb924736b61b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 25 12:45:07 2015 +0100 new check and manpages --- checkman/raritan_px_sensors | 19 ++++ checkman/raritan_px_sensors.binary | 16 ++++ checkman/raritan_px_sensors.humidity | 18 ++++ checks/raritan_px_sensors | 161 ++++++++++++++++++++++++++++++++++ 4 files changed, 214 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c3cb924736…

8 years, 10 months

#2839 raritan_px_sensors, raritan_px_sensors.binary,

by Simon Betz

raritan_px_sensors.humidity: monitors the temperature, contact and humidity of Raritan PX Devices Message-ID: <56559f19.JoGzTJMf/243suoE%si(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: 3a14cec3a4bb88d69f099680ae4778ca2ad4a0a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a14cec3a4bb88… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 25 12:44:18 2015 +0100 #2839 raritan_px_sensors, raritan_px_sensors.binary, raritan_px_sensors.humidity: monitors the temperature, contact and humidity of Raritan PX Devices --- .werks/2839 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2839 b/.werks/2839 new file mode 100644 index 0000000..21f704b --- /dev/null +++ b/.werks/2839 @@ -0,0 +1,9 @@ +Title: raritan_px_sensors, raritan_px_sensors.binary, raritan_px_sensors.humidity: monitors the temperature, contact and humidity of Raritan PX Devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448451753 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index ed20cc4..af4fbd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 2802 esx_vsphere_hostsystem.multipath: now supports ESX 6.0 multipath names * 2864 fortigate_ipsecvpn, fortigate_sslvpn: Added monitoring for vpn tunnels in fortigate firewalls * 2838 raritan_px_outlets: monitors the voltage, current, power, apparent power and energy of Raritan PX Devices + * 2839 raritan_px_sensors, raritan_px_sensors.binary, raritan_px_sensors.humidity: monitors the temperature, contact and humidity of Raritan PX Devices * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list...

8 years, 10 months

#2838 raritan_px_outlets: monitors the voltage, current, power, apparent power and energy of Raritan PX Devices

by Simon Betz

Module: check_mk Branch: master Commit: a4398bca67fbc139cd529735099925c0c52821ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4398bca67fbc1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 25 12:41:38 2015 +0100 #2838 raritan_px_outlets: monitors the voltage, current, power, apparent power and energy of Raritan PX Devices --- .werks/2838 | 9 ++++ ChangeLog | 1 + checkman/raritan_px_outlets | 21 +++++++++ checks/raritan_px_outlets | 107 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+) diff --git a/.werks/2838 b/.werks/2838 new file mode 100644 index 0000000..374e953 --- /dev/null +++ b/.werks/2838 @@ -0,0 +1,9 @@ +Title: raritan_px_outlets: monitors the voltage, current, power, apparent power and energy of Raritan PX Devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448451643 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index eefe1ae..ed20cc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 2801 snmp text encoding: now able to decode cp437 encoded snmp strings... * 2802 esx_vsphere_hostsystem.multipath: now supports ESX 6.0 multipath names * 2864 fortigate_ipsecvpn, fortigate_sslvpn: Added monitoring for vpn tunnels in fortigate firewalls + * 2838 raritan_px_outlets: monitors the voltage, current, power, apparent power and energy of Raritan PX Devices * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checkman/raritan_px_outlets b/checkman/raritan_px_outlets new file mode 100644 index 0000000..49bcee8 --- /dev/null +++ b/checkman/raritan_px_outlets @@ -0,0 +1,21 @@ +title: Raritan PX Devices Outlets: Voltage, Current, Power, Apparent Power, Energy +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the voltage, current, power, apparent power and enrgy + of outlets of a Raritan PX device. + No configuration is needed, the devices send their states by themselves. + Upper levels of power, apparent power, current and energy and lower levels + of voltage are configurable via WATO. + +item: + Sensor number, sensor name + +perfdata: + Voltage, Current, Power, Apparent Power, Energy + +inventory: + One service per outlet is created. + diff --git a/checks/raritan_px_outlets b/checks/raritan_px_outlets new file mode 100644 index 0000000..ab736e9 --- /dev/null +++ b/checks/raritan_px_outlets @@ -0,0 +1,107 @@ +#!/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. + +# .1.3.6.1.4.1.13742.4.1.2.2.1.1.1 1 --> PDU-MIB::outletIndex.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.1.3 3 --> PDU-MIB::outletIndex.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.1.4 4 --> PDU-MIB::outletIndex.4 +# .1.3.6.1.4.1.13742.4.1.2.2.1.2.1 Outlet 1 --> PDU-MIB::outletLabel.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.2.3 Outlet 3 --> PDU-MIB::outletLabel.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.2.4 Outlet 4 --> PDU-MIB::outletLabel.4 +# .1.3.6.1.4.1.13742.4.1.2.2.1.3.1 1 --> PDU-MIB::outletOperationalState.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.3.3 1 --> PDU-MIB::outletOperationalState.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.3.4 0 --> PDU-MIB::outletOperationalState.4 +# .1.3.6.1.4.1.13742.4.1.2.2.1.4.1 0 --> PDU-MIB::outletCurrent.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.4.3 6854 --> PDU-MIB::outletCurrent.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.4.4 0 --> PDU-MIB::outletCurrent.4 +# .1.3.6.1.4.1.13742.4.1.2.2.1.6.1 222000 --> PDU-MIB::outletVoltage.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.6.3 222000 --> PDU-MIB::outletVoltage.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.6.4 222000 --> PDU-MIB::outletVoltage.4 +# .1.3.6.1.4.1.13742.4.1.2.2.1.7.1 0 --> PDU-MIB::outletActivePower.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.7.3 1475 --> PDU-MIB::outletActivePower.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.7.4 0 --> PDU-MIB::outletActivePower.4 +# .1.3.6.1.4.1.13742.4.1.2.2.1.8.1 0 --> PDU-MIB::outletApparentPower.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.8.3 1542 --> PDU-MIB::outletApparentPower.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.8.4 0 --> PDU-MIB::outletApparentPower.4 +# .1.3.6.1.4.1.13742.4.1.2.2.1.31.1 0 --> PDU-MIB::outletWattHours.1 +# .1.3.6.1.4.1.13742.4.1.2.2.1.31.3 0 --> PDU-MIB::outletWattHours.3 +# .1.3.6.1.4.1.13742.4.1.2.2.1.31.4 0 --> PDU-MIB::outletWattHours.4 + + +def parse_raritan_px_outlets(info): + map_state = { + "-1" : (2, "error"), + "0" : (2, "off"), + "1" : (0, "on"), + "2" : (0, "cycling"), + } + parsed = {} + for index, state, current_str, voltage_str, \ + power_str, appower_str, energy_str in info: + parsed[index] = { + "state" : map_state.get(state, (3, "unknown")), + "current" : float(current_str) / 1000, + "voltage" : float(voltage_str) / 1000, + "power" : float(power_str), + "appower" : float(appower_str), + "energy" : float(energy_str), + } + + return parsed + + +def inventory_raritan_px_outlets(parsed): + return [ (index, {}) for index, values in parsed.items() \ + if values["state"][1] == "on" ] + + +def check_raritan_px_outlets(item, params, parsed): + if item in parsed: + state, state_readable = parsed[item]["state"] + yield state, "Operational status: %s" % state_readable + for result in check_elphase(item, params, parsed): + yield result + + +check_info['raritan_px_outlets'] = { + 'parse_function' : parse_raritan_px_outlets, + 'inventory_function' : inventory_raritan_px_outlets, + 'check_function' : check_raritan_px_outlets, + 'service_description' : 'Outlet %s', + 'has_perfdata' : True, + 'snmp_info' : (".1.3.6.1.4.1.13742.4.1.2.2.1", [ + "1", # outletIndex + "3", # outletOperationalState + "4", # outletCurrent + "6", # outletVoltage + "7", # outletActivePower + "8", # outletApparentPower + "31", # outletWattHours + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13742.4", + 'includes' : [ "elphase.include" ], + 'group' : "el_inphase", +} +

8 years, 10 months

multipath: added warn and crit levels

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1b73a3aef7754336bccb3fe6f011a47d7997e8bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b73a3aef77543… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 25 12:12:45 2015 +0100 multipath: added warn and crit levels --- checks/multipath | 14 ++++++++++++-- checks/solaris_multipath | 14 ++++++++++++-- web/plugins/wato/check_parameters.py | 10 ++++++++-- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/checks/multipath b/checks/multipath index 4d509eb..6ddd4be 100644 --- a/checks/multipath +++ b/checks/multipath @@ -312,8 +312,18 @@ def check_multipath(item, target_numpaths, parsed): if target_numpaths == None: target_numpaths = 2 # default case: we need two paths - elif type(target_numpaths) == float: - target_numpaths = (target_numpaths / 100) * numpaths + elif type(target_numpaths) == tuple: + warn, crit = target_numpaths + warn_num = (warn / 100.0) * numpaths + crit_num = (crit / 100.0) * numpaths + levels = " (Warning/ Critical at %d/ %d)" % (warn_num, crit_num) + info = "%spaths active: %d" % (aliasinfo, numpaths) + if numpaths <= crit_num: + return 2, info + levels + elif numpaths <= warn_num: + return 1, info + levels + else: + return 0, info info = "%spaths expected: %d, paths active: %d" % (aliasinfo, target_numpaths, numpaths) diff --git a/checks/solaris_multipath b/checks/solaris_multipath index 424cf47..ddb546d 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -52,8 +52,18 @@ def check_solaris_multipath(item, params, info): state = 1 infotext += ", expected paths unknown, please redo service discovery" else: - if type(params) == float: - expected = (params / 100) * total + if type(params) == tuple: + warn, crit = params + warn_num = (warn / 100.0) * total + crit_num = (crit / 100.0) * total + levels = " (Warning/ Critical at %d/ %d)" % (warn_num, crit_num) + info = "paths active: %d" % (operational) + if operational <= crit_num: + return 2, info + levels + elif operational <= warn_num: + return 1, info + levels + else: + return 0, info else: expected = int(params) # should be int, just for legacy reasons if operational > expected: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4a124b8..eeb327f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6465,8 +6465,14 @@ register_check_parameters( elements = [ Integer( title = _("Expected number of active paths")), - Percentage( - title = _("Expected percentage of active paths")), + Tuple( + title = _("Expected percentage of active paths"), + elements = [ + Percentage( + title = _("Warning if less then")), + Percentage( + title = _("Critical if less then")), + ]), ] ), TextAscii(

8 years, 10 months

#2864 fortigate_ipsecvpn, fortigate_sslvpn: Added monitoring for vpn tunnels in fortigate firewalls

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9d8faec7e3c6e22fc76e85445f77d2987b747bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d8faec7e3c6e2… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Nov 25 11:05:24 2015 +0100 #2864 fortigate_ipsecvpn, fortigate_sslvpn: Added monitoring for vpn tunnels in fortigate firewalls --- .werks/2864 | 9 +++++ ChangeLog | 1 + checkman/fortigate_ipsecvpn | 19 ++++++++++ checkman/fortigate_sessions | 2 +- checkman/fortigate_sslvpn | 18 ++++++++++ checks/fortigate_ipsecvpn | 74 +++++++++++++++++++++++++++++++++++++++ checks/fortigate_sslvpn | 71 +++++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 23 ++++++++++++ 8 files changed, 216 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9d8faec7e3…

8 years, 10 months

#2802 esx_vsphere_hostsystem.multipath: now supports ESX 6.0 multipath names

by Andreas Boesl

Module: check_mk Branch: master Commit: 3b97dbf185a8779ea5a90a8318a9b89b8cb9e780 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b97dbf185a877… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 25 10:49:02 2015 +0100 #2802 esx_vsphere_hostsystem.multipath: now supports ESX 6.0 multipath names --- .werks/2802 | 9 +++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 18 ++++++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.werks/2802 b/.werks/2802 new file mode 100644 index 0000000..9c47b3e --- /dev/null +++ b/.werks/2802 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.multipath: now supports ESX 6.0 multipath names +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448444844 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fbba25e..3ac34fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 2797 netscaler_vserver: now also shows tftp servers and health state of loadbalacing entities * 2863 wagner_titanus_topsens: added support for more devices... * 2801 snmp text encoding: now able to decode cp437 encoded snmp strings... + * 2802 esx_vsphere_hostsystem.multipath: now supports ESX 6.0 multipath names * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 1b0e5dd..acc3aeb 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -374,6 +374,14 @@ def esx_vsphere_multipath_convert(info): data = zip(data[::2], data[1::2]) paths = {} for path, state in data: + # ESX 6.0 uses a different format, e.g "vmhba32:C0:T0:L0 active" + if len(path.split(":")) == 4: + real_path = ":".join(path.split(":")[:3]) + paths.setdefault(real_path, []) + # Note: There is no path type information available in these esx paths + paths[real_path].append((state, None)) + continue + path_tokens = path.split('-') if "." not in path_tokens[-1]: continue # invalid format / unknown type @@ -384,6 +392,7 @@ def esx_vsphere_multipath_convert(info): if hw_type != 'unknown': paths.setdefault(path_id, []) paths[path_id].append((state, "%s/%s" % (path_type, hw_type))) + return paths def inventory_esx_vsphere_hostsystem_multipath(info): @@ -445,9 +454,14 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): state_values[2] = "(!)(more than %d)" % warn_max # Output message - message = "Type %s" % path_type + message = "" + if path_type: + message += "Type %s, " % path_type + + element_text = [] for element in "active", "dead", "disabled", "standby", "unknown": - message += ", %d %s%s" % ( state_infos[element][1], element, state_infos[element][2] ) + element_text.append("%d %s%s" % ( state_infos[element][1], element, state_infos[element][2])) + message += ", ".join(element_text) break else: return 3, "Path not found in agent output"

8 years, 10 months

citrix_hostsystem, citrix_state: intermediate state

by Mathias Kettner

Module: check_mk Branch: master Commit: f723d0da1561fe83b1ebaf2f2ce0a8bb7fd82e1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f723d0da1561fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 25 09:57:20 2015 +0100 citrix_hostsystem, citrix_state: intermediate state --- checks/citrix_hostsystem | 47 +++++++++++----- checks/citrix_state | 139 ++++++++++++++++++++++++++++------------------ 2 files changed, 116 insertions(+), 70 deletions(-) diff --git a/checks/citrix_hostsystem b/checks/citrix_hostsystem index 8fd0824..9b27e0b 100644 --- a/checks/citrix_hostsystem +++ b/checks/citrix_hostsystem @@ -24,6 +24,27 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Example output from agent: +# <<<citrix_hostsystem>>> +# VMName rz1css01 +# CitrixPoolName RZ1XenPool01 - Cisco UCS + +# Note(1): The pool name is the same for all VMs on one host system +# Note(2): for the same host and vm this section can appear +# several times (with the same content). +def parse_citrix_hostsystem(info): + parsed = { "vms" : [], "pool" : "" } + for line in info: + if line[0] == "VMName": + vm = " ".join(line[1:]) + if vm not in parsed["vms"]: + parsed["vms"].append(vm) + elif line[0] == "CitrixPoolName": + pool = " ".join(line[1:]) + if not parsed["pool"]: + parsed["pool"] = pool + return parsed + # .--Host VMs------------------------------------------------------------. # | _ _ _ __ ____ __ | @@ -34,17 +55,14 @@ # | | # '----------------------------------------------------------------------' -def inventory_citrix_hostsystem_vms(info): - if info: +def inventory_citrix_hostsystem_vms(parsed): + if parsed["vms"]: return [ (None, None) ] -def check_citrix_hostsystem_vms(_no_item, _no_params, info): - vmlist = [] - for line in info: - if line[0] == "VMName": - vmlist.append(" ".join(line[1:])) - return 0, ("%d VMs running: " % len(vmlist)) + ", ".join(vmlist) +def check_citrix_hostsystem_vms(_no_item, _no_params, parsed): + vmlist = parsed["vms"] + return 0, "%d VMs running: %s" % (len(vmlist), ", ".join(vmlist)) check_info["citrix_hostsystem.vms"] = { @@ -63,18 +81,17 @@ check_info["citrix_hostsystem.vms"] = { # | | # '----------------------------------------------------------------------' -def inventory_citrix_hostsystem(info): - if info: - yield None, None +def inventory_citrix_hostsystem(parsed): + if parsed["pool"]: + return [ (None, None) ] -def check_citrix_hostsystem(_no_item, no_params, info): - for line in info: - if line[0] == "CitrixPoolName": - return 0, "Citrix Pool Name: " + " ".join(line[1:]) +def check_citrix_hostsystem(_no_item, no_params, parsed): + return 0, "Citrix Pool Name: %s" % parsed["pool"] check_info["citrix_hostsystem"] = { + "parse_function" : parse_citrix_hostsystem, "inventory_function" : inventory_citrix_hostsystem, "check_function" : check_citrix_hostsystem, "service_description" : "Citrix Host Info", diff --git a/checks/citrix_state b/checks/citrix_state index 0acfed6..ac18813 100644 --- a/checks/citrix_state +++ b/checks/citrix_state @@ -24,6 +24,34 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# <<<citrix_state>>> +# Catalog XenApp - Standard - RZ5 +# Controller rx2345.extern.foobar +# DesktopGroupName XenApp - Standard +# FaultState None +# HostingServer rz1tgn03.extern.foobar +# MaintenanceMode False +# PowerState On +# RegistrationState Registered +# VMToolsState Running +# AgentVersion 7.6.0.5026 + +def parse_citrix_state(info): + parsed = { + "instance" : {}, + } + for line in info: + if line[0] == "Controller": + parsed["controller"] = " ".join(line[1:]) + elif line[0] == "HostingServer": + parsed["hosting_server"] = " ".join(line[1:]) + elif line[0] in [ + "FaultState", "MaintenanceMode", "PowerState", + "RegistrationState", "VMToolsState" ]: + parsed["instance"][line[0]] = line[1] + + return parsed + # .--Controller----------------------------------------------------------. # | ____ _ _ _ | @@ -34,16 +62,14 @@ # | | # '----------------------------------------------------------------------' -def inventory_citrix_state_controller(info): - for line in info: - if line[0] == "Controller": - return [ (None, None) ] +def inventory_citrix_state_controller(parsed): + if "controller" in parsed: + return [ (None, None) ] -def check_citrix_state_controller(_no_item, _no_params, info): - for line in info: - if line[0] == "Controller": - return 0, line[1] + +def check_citrix_state_controller(_no_item, _no_params, parsed): + return 0, parsed["controller"] check_info["citrix_state.controller"] = { @@ -62,16 +88,14 @@ check_info["citrix_state.controller"] = { # | |___/ | # '----------------------------------------------------------------------' -def inventory_citrix_state_hosting_server(info): - for line in info: - if line[0] == "HostingServer": - return [ (None, None) ] +def inventory_citrix_state_hosting_server(parsed): + if "hosting_server" in parsed: + return [ (None, None) ] -def check_citrix_state_hosting_server(_no_item, _no_params, info): - for line in info: - if line[0] == "HostingServer": - yield 0, line[1] + +def check_citrix_state_hosting_server(_no_item, _no_params, parsed): + return 0, parsed["hosting_server"] check_info["citrix_state.hosting_server"] = { @@ -90,52 +114,57 @@ check_info["citrix_state.hosting_server"] = { # | | # '----------------------------------------------------------------------' -def inventory_citrix_state(info): - if info: + +def inventory_citrix_state(parsed): + if parsed["instance"]: return [ (None, {}) ] -def check_citrix_state(_no_item, params, info): - - statedict = { "maintenancemode" : { "False" : 0, - "True" : 1, - }, - "powerstate" : { "Unmanaged" : 1, - "Unknown" : 1, - "Unavailable" : 2, - "Off" : 2, - "On" : 0, - "Suspended" : 2, - "TurningOn" : 1, - "TurningOff" : 1, - }, - "vmtoolsstate" : { "NotPresent" : 2, - "Unknown" : 3, - "NotStarted" : 1, - "Running" : 0, - }, - "registrationstate" : { "Unregistered" : 2, - "Initializing" : 1, - "Registered" : 0, - "AgentError" : 2, - }, - "faultstate" : { "None" : 0, - "FailedToStart" : 2, - "StuckOnBoot" : 2, - "Unregistered" : 2, - "MaxCapacity" : 1, - }, +def check_citrix_state(_no_item, params, parsed): + map_states = { + "maintenancemode" : { + "False" : 0, + "True" : 1, + }, + "powerstate" : { + "Unmanaged" : 1, + "Unknown" : 1, + "Unavailable" : 2, + "Off" : 2, + "On" : 0, + "Suspended" : 2, + "TurningOn" : 1, + "TurningOff" : 1, + }, + "vmtoolsstate" : { + "NotPresent" : 2, + "Unknown" : 3, + "NotStarted" : 1, + "Running" : 0, + }, + "registrationstate" : { + "Unregistered" : 2, + "Initializing" : 1, + "Registered" : 0, + "AgentError" : 2, + }, + "faultstate" : { + "None" : 0, + "FailedToStart" : 2, + "StuckOnBoot" : 2, + "Unregistered" : 2, + "MaxCapacity" : 1, + }, } - - statedict.update(params) - - for line in info: - for what in statedict: - if line[0].lower() == what: - yield statedict[what][line[1]], line[0] + ": " + line[1] + map_states.update(params) + for state_type, state in parsed["instance"].items(): + state_key = state_type.lower() + if state_key in map_states: + yield map_states[state_key][state], "%s: %s" % (state_type, state) check_info["citrix_state"] = { + "parse_function" : parse_citrix_state, "inventory_function" : inventory_citrix_state, "check_function" : check_citrix_state, "service_description" : "Citrix Instance State",

8 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015