Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64603 discussions

Check_MK Git: check_mk: dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC

by Götz Golla

Module: check_mk Branch: master Commit: 3bee61fb4711887e0f4d49d5b177b64c8bdce463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bee61fb471188… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 20 23:15:26 2014 +0100 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC --- .werks/596 | 8 ++++ ChangeLog | 1 + checkman/dell_chassis_fans | 15 ++++++++ checkman/dell_chassis_io | 15 ++++++++ checkman/dell_chassis_kvm | 18 +++++++++ checkman/dell_chassis_status | 19 ++++++++++ checkman/dell_chassis_temp | 20 ++++++++++ checks/dell_chassis_fans | 61 ++++++++++++++++++++++++++++++ checks/dell_chassis_io | 61 ++++++++++++++++++++++++++++++ checks/dell_chassis_kvm | 64 ++++++++++++++++++++++++++++++++ checks/dell_chassis_status | 71 +++++++++++++++++++++++++++++++++++ checks/dell_chassis_temp | 84 ++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 437 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3bee61fb47…

10 years, 6 months

Check_MK Git: check_mk: dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption

by Götz Golla

Module: check_mk Branch: master Commit: f06324e685686764bb4a585d1e84751f27b31c58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f06324e6856867… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 20 23:09:03 2014 +0100 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption These checks measure the overall power consumption of the chassis of the Dell Poweredge Blade Server as well as the power consumption of the individual blade nodes as given by the Dell Chassis Management Controller (CMC) --- .werks/595 | 10 ++++++ ChangeLog | 3 +- checkman/dell_chassis_power | 19 ++++++++++ checkman/dell_chassis_powersupplies | 25 +++++++++++++ checks/dell_chassis_power | 68 +++++++++++++++++++++++++++++++++++ checks/dell_chassis_powersupplies | 68 +++++++++++++++++++++++++++++++++++ checks/if.include | 56 +++++++++++++++++++---------- checks/if64 | 43 +++++++++++----------- checks/printer_pages | 2 +- web/plugins/perfometer/check_mk.py | 5 ++- 10 files changed, 256 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f06324e685…

10 years, 6 months

Check_MK Git: check_mk: Improved details of check output of all dell_poweredge_* checks

by Götz Golla

Module: check_mk Branch: master Commit: 279ee84de6a612596b31207fee6f60489858c78a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=279ee84de6a612… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 20 23:03:46 2014 +0100 Improved details of check output of all dell_poweredge_* checks --- checkman/dell_poweredge_pci | 2 +- checks/dell_poweredge_amperage | 24 +++++++++++++----------- checks/dell_poweredge_cpu | 2 +- checks/dell_poweredge_mem | 2 +- checks/dell_poweredge_netdev | 1 - checks/dell_poweredge_pci | 2 +- checks/dell_poweredge_status | 16 ++++++++-------- checks/dell_poweredge_temp | 2 +- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/checkman/dell_poweredge_pci b/checkman/dell_poweredge_pci index 995f01f..d0043fa 100644 --- a/checkman/dell_poweredge_pci +++ b/checkman/dell_poweredge_pci @@ -14,7 +14,7 @@ description: No limits are set in the check. - In addition to the state the following information of the memory modules + In addition to the state the following information is retrieved and displayed in the check output: width of the data bus, description of the device and manufacturer, diff --git a/checks/dell_poweredge_amperage b/checks/dell_poweredge_amperage index a6dfcb3..e31a561 100644 --- a/checks/dell_poweredge_amperage +++ b/checks/dell_poweredge_amperage @@ -78,18 +78,20 @@ def check_dell_poweredge_amperage(item, _no_params, info): } state_txt, state = state_table.get(Status, "2") - if UpperNonCritical or UpperCritical: + if UpperNonCritical and UpperCritical: limittext = " (upper limits %s/%s)" % (UpperNonCritical, UpperCritical) + maxi = savefloat(UpperCritical) * 1.1 else: limittext = "" + maxi = "" if ProbeType in ( "23", "25" ): # Amps current = str(int(Reading)/10.0) infotext = "%s Ampere %s" % ( current, state_txt ) - perfdata = [( "current", current+"A", UpperNonCritical, UpperCritical )] + perfdata = [( "current", current+"A", UpperNonCritical, UpperCritical, "", maxi )] elif ProbeType in ( "24", "26" ): # Watts infotext = "%s Watt %s" % ( Reading, state_txt ) - perfdata = [( "power", Reading+"W", UpperNonCritical, UpperCritical )] + perfdata = [( "power", Reading+"W", UpperNonCritical, UpperCritical, "", maxi )] else: infotext = "Unknown Probe Type %s" % ProbeType return 3, infotext @@ -107,11 +109,11 @@ check_info["dell_poweredge_amperage.power"] = { "snmp_scan" : dell_poweredge_amperage_scan, } -check_info["dell_poweredge_amperage.current"] = { - "check_function" : check_dell_poweredge_amperage, - "inventory_function" : inventory_dell_poweredge_amperage_current, - "service_description" : "%s", - "has_perfdata" : True, - "snmp_info" : dell_poweredge_amperage_info, - "snmp_scan" : dell_poweredge_amperage_scan, -} +#check_info["dell_poweredge_amperage.current"] = { +# "check_function" : check_dell_poweredge_amperage, +# "inventory_function" : inventory_dell_poweredge_amperage_current, +# "service_description" : "%s", +# "has_perfdata" : True, +# "snmp_info" : dell_poweredge_amperage_info, +# "snmp_scan" : dell_poweredge_amperage_scan, +#} diff --git a/checks/dell_poweredge_cpu b/checks/dell_poweredge_cpu index de91938..2168a67 100644 --- a/checks/dell_poweredge_cpu +++ b/checks/dell_poweredge_cpu @@ -65,7 +65,7 @@ def check_dell_poweredge_cpu(item, _no_params, info): "5" : ( "Critical", 2 ), "6" : ( "NonRecoverable", 2 ), } - state_txt, state = state_table.get(Status, "2") + state_txt, state = state_table.get(Status, ( "unknown state", 2 )) infotext = "%s %s" % ( BrandName, state_txt ) return state, infotext diff --git a/checks/dell_poweredge_mem b/checks/dell_poweredge_mem index 3acd7bc..083fefd 100644 --- a/checks/dell_poweredge_mem +++ b/checks/dell_poweredge_mem @@ -66,7 +66,7 @@ def check_dell_poweredge_mem(item, _no_params, info): "5" : ( "Critical", 2 ), "6" : ( "NonRecoverable", 2 ), } - infotext, state = state_table.get(status, "2") + infotext, state = state_table.get(status, ( "unknown state", 2 )) for parameter, value in di.items(): infotext += ", %s: %s" % ( parameter, value ) diff --git a/checks/dell_poweredge_netdev b/checks/dell_poweredge_netdev index a8f874a..687a901 100644 --- a/checks/dell_poweredge_netdev +++ b/checks/dell_poweredge_netdev @@ -55,7 +55,6 @@ def check_dell_poweredge_netdev(item, _no_params, info): di = dict() for status, connection_status, di['Product'], cur_mac, fqdd in info: if item == fqdd: - print connection_status di['MAC'] = '-'.join( [ "%02X" % ord( c ) for c in cur_mac ] ).strip() state_table = { "1" : ( "other,", 1 ), diff --git a/checks/dell_poweredge_pci b/checks/dell_poweredge_pci index 451ec19..f6a90c2 100644 --- a/checks/dell_poweredge_pci +++ b/checks/dell_poweredge_pci @@ -59,7 +59,7 @@ def check_dell_poweredge_pci(item, _no_params, info): "5" : ( "Critical", 2 ), "6" : ( "NonRecoverable", 2 ), } - infotext, state = state_table.get(status, "2") + infotext, state = state_table.get(status, ( "unknown state", 2 )) for parameter, value in di.items(): infotext += ", %s: %s" % ( parameter, value ) diff --git a/checks/dell_poweredge_status b/checks/dell_poweredge_status index 4724485..c3cd7ff 100644 --- a/checks/dell_poweredge_status +++ b/checks/dell_poweredge_status @@ -44,18 +44,18 @@ def check_dell_poweredge_status(item, _no_params, info): di['racURL'], di['Chassis'], di['Slot'], di['Model'], status, di['ServiceTag'] = info[0] state_table = { - "1" : ( "other", 1 ), - "2" : ( "unknown", 1 ), - "3" : ( "ok", 0 ), - "4" : ( "nonCritical", 1 ), - "5" : ( "Critical", 2 ), - "6" : ( "NonRecoverable", 2 ), + "1" : ( "other, ", 1 ), + "2" : ( "unknown, ", 1 ), + "3" : ( "", 0 ), + "4" : ( "nonCritical, ", 1 ), + "5" : ( "Critical, ", 2 ), + "6" : ( "NonRecoverable, ", 2 ), } state_txt, state = state_table.get(status, "2") infotext, state = state_table.get(status, "2") for parameter, value in di.items(): - infotext += ", %s: %s" % ( parameter, value ) - infotext = re.sub("^, ","", infotext) + infotext += "%s: %s, " % ( parameter, value ) + infotext = re.sub(", $","", infotext) return state, infotext diff --git a/checks/dell_poweredge_temp b/checks/dell_poweredge_temp index 6eb5d93..0790493 100644 --- a/checks/dell_poweredge_temp +++ b/checks/dell_poweredge_temp @@ -74,7 +74,7 @@ def check_dell_poweredge_temp(item, _no_params, info): "9" : ( "NonRecoverableLower", 2 ), "10" : ( "failed", 2 ), } - state_txt, state = state_table.get(Status, "2") + state_txt, state = state_table.get(Status, ( "unknown state", 2 )) infotext = "%.1f Degrees (upper limits %s/%s) %s" % ( temp, warn, crit, state_txt ) perfdata = [( "temp", temp, warn, crit )]

10 years, 6 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 533b6d5a84292f56cf8c6654fff51e71b62ba333 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=533b6d5a84292f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 20 17:30:06 2014 +0100 merge conflict ---

10 years, 6 months

Check_MK Git: check_mk: enterasys_cpu_util enterasys_powersupply: New Checks for CPU Utilization and Power Supplies on enterasys switches

by Bastian Kuhn

Module: check_mk Branch: master Commit: a49a04c2a55301b47e5c2f5c29b2feee5b67de5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a49a04c2a55301… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 20 17:29:10 2014 +0100 enterasys_cpu_util enterasys_powersupply: New Checks for CPU Utilization and Power Supplies on enterasys switches --- .werks/144 | 8 +++ ChangeLog | 1 + checkman/enterasys_cpu_util | 20 ++++++++ checkman/enterasys_powersupply | 16 ++++++ checks/enterasys_cpu_util | 51 +++++++++++++++++++ checks/enterasys_powersupply | 67 +++++++++++++++++++++++++ pnp-templates/check_mk-enterasys_cpu_util.php | 1 + 7 files changed, 164 insertions(+) diff --git a/.werks/144 b/.werks/144 new file mode 100644 index 0000000..29ff606 --- /dev/null +++ b/.werks/144 @@ -0,0 +1,8 @@ +Title: enterasys_cpu_util enterasys_powersupply: New Checks for CPU Utilization and Power Supplies on enterasys switches +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395332854 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cf117b4..940f932 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ * 0141 ups_socomec_capacity: Battery Capacity Check for Socomec UPS Devices. * 0705 arcserve_backup: improved documentation (check manpage and comments in the agent plugin) * 0143 ups_socomec_in_voltage, ups_socomec_out_voltage: Socomec UPS Devices, Input and Output Voltages... + * 0144 enterasys_cpu_util enterasys_powersupply: New Checks for CPU Utilization and Power Supplies on enterasys switches * 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/enterasys_cpu_util b/checkman/enterasys_cpu_util new file mode 100644 index 0000000..184d140 --- /dev/null +++ b/checkman/enterasys_cpu_util @@ -0,0 +1,20 @@ +title: Enterasys Switch: CPU utilization +agents: snmp +catalog: hw/network/enterasys +license: GPL +distribution: check_mk +description: + This check shows the current cpu utilization of a casa module + + +inventory: + One check will be created + +perfdata: + The actual utilization, together with it's warn and crit levels + +[parameters] +warning (int): The percentage of CPU usage that triggers + a WARNING state +critical (int): The percentage of CPU usage that triggers + a CRITICAL state diff --git a/checkman/enterasys_powersupply b/checkman/enterasys_powersupply new file mode 100644 index 0000000..9fece26 --- /dev/null +++ b/checkman/enterasys_powersupply @@ -0,0 +1,16 @@ +title: Enterasys: Power Supplies +agents: snmp +catalog: hw/network/enterasys +license: GPL +distribution: check_mk +description: + This check monitors the health of power supplies. If the operating + state change or the supplie is not longer redundant then the check + returns {CRIT}. + +item: + The id of the power supply as output from the SNMP agent. + +inventory: + One check is created for each power supply. + diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util new file mode 100644 index 0000000..2f99fce --- /dev/null +++ b/checks/enterasys_cpu_util @@ -0,0 +1,51 @@ +#!/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. +enerasys_cpu_default_levels = (90, 95) + +def inventory_enterasys_cpu_util(info): + return [ ( None, "enerasys_cpu_default_levels" )] + +def check_enterasys_cpu_util(_no_item, params, info): + util = 0 + for core_util in info: + util += saveint(core_util[0]) / 60 + num_cpus = len(info) + usage = util / num_cpus + return check_cpu_util(usage, params) + + +check_info["enterasys_cpu_util"] = { + "check_function" : check_enterasys_cpu_util, + "inventory_function" : inventory_enterasys_cpu_util, + "service_description" : "CPU utilization", + "snmp_info" : ( ".1.3.6.1.4.1.5624.1.2.49.1.1.1.1", [ 3 ]), #util in last 1min + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5624.2.1.169", + "has_perfdata" : True, + "group" : "cpu_utilization", + "includes" : [ "cpu_util.include" ], + +} + diff --git a/checks/enterasys_powersupply b/checks/enterasys_powersupply new file mode 100644 index 0000000..81267fe --- /dev/null +++ b/checks/enterasys_powersupply @@ -0,0 +1,67 @@ +#!/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. +# 1.3.6.1.4.1.52.4.3.1.2.1.1.1 ctChasPowerSupplyNum +# 1.3.6.1.4.1.52.4.3.1.2.1.1.2 ctChasPowerSupplyState +# 1.3.6.1.4.1.52.4.3.1.2.1.1.3 ctChasPowerSupplyType +# 1.3.6.1.4.1.52.4.3.1.2.1.1.4 ctChasPowerSupplyRedundancy + +def inventory_enterasys_powersupply(info): + inventory = [] + for num, state, typ, redun in info: + if state == '3': + inventory.append(( num, None )) + return inventory + +def check_enterasys_powersupply(item, _no_params, info): + supply_types = { + '1' : 'ac-dc', + '2' : 'dc-dc', + '3' : 'notSupported', + '4' : 'highOutput', + } + redundancy_types = { + '1' : 'redundant', + '2' : 'notRedundant', + '3' : 'notSupported', + } + + for num, state, typ, redun in info: + if num == item: + if state == '4': + return 2, 'PSU installed and not operating' + if redun != '1': + return 1, 'PSU %s' % redundancy_types[redyn] + return 0, 'PSU working and redundant (%s)' % supply_types[typ] + + +check_info["enterasys_powersupply"] = { + "check_function" : check_enterasys_powersupply, + "inventory_function" : inventory_enterasys_powersupply, + "service_description" : "PSU %s", + "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.2.1.1", [ OID_END, 2, 3, 4 ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5624.2.1.169", +} + diff --git a/pnp-templates/check_mk-enterasys_cpu_util.php b/pnp-templates/check_mk-enterasys_cpu_util.php new file mode 120000 index 0000000..a7d9073 --- /dev/null +++ b/pnp-templates/check_mk-enterasys_cpu_util.php @@ -0,0 +1 @@ +check_mk-esx_vsphere_hostsystem.cpu_usage.php \ No newline at end of file

10 years, 6 months

Check_MK Git: check_mk: INV: fix some minor exceptions

by Mathias Kettner

Module: check_mk Branch: master Commit: 473d11c4eb3fcd04dc522110ddd3e1ccbe475126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473d11c4eb3fcd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 20 17:15:12 2014 +0100 INV: fix some minor exceptions --- agents/plugins/mk_inventory.linux | 4 ++-- inventory/export_software_csv | 7 ++++--- web/plugins/views/inventory.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index da4b650..0ae6af6 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Run and *send* only once every 4 hours INTERVAL=14400 @@ -6,7 +6,7 @@ INTERVAL=14400 FLAGFILE=$MK_CONFDIR/mk_inventory.last.$REMOTE LAST_RUN=$(stat -c %Y $FLAGFILE) NOW=$(date +%s) -UNTIL=$((NOW + INTERVAL)) +UNTIL=$((NOW + INTERVAL + 600)) if [ $(( NOW - LAST_RUN )) -ge $INTERVAL ] then diff --git a/inventory/export_software_csv b/inventory/export_software_csv index 381551c..7ea9b56 100644 --- a/inventory/export_software_csv +++ b/inventory/export_software_csv @@ -36,10 +36,11 @@ def inv_export_software_csv(hostname, params, tree): else: quote = lambda s: s - if "software" not in tree or "packages" not in tree["software"]: - raise MKGeneralException("Missing Software/Packages in inventory tree") + try: + packages = tree["software"]["packages"] + except KeyError: + return # No software information available - packages = tree["software"]["packages"] filename = params["filename"].replace("<HOST>", hostname) if not filename.startswith("/"): filename = var_dir + "/" + filename diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index d94c989..290ef2c 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -29,7 +29,7 @@ import inventory def paint_host_inventory(row, invpath): invdata = inventory.get(row["host_inventory"], invpath) if not invdata: - return "", _("No inventory data available") + return "", "" # _("No inventory data available") hint = inv_display_hint(invpath) if "paint_function" in hint: @@ -772,7 +772,7 @@ class FilterSWPacsVersion(Filter): new_rows = [] for row in rows: - version = row[self.name] + version = row.get(self.name, "") if from_version and cmp_version(version, from_version) == -1: continue if to_version and cmp_version(version, to_version) == 1:

10 years, 6 months

Check_MK Git: check_mk: esx_vsphere_vm.running_on: shows the esx host of the VM

by Andreas Boesl

Module: check_mk Branch: master Commit: 0dd9b4aca5d6e5e4dcb61eb546fdee0f0f0b7ce9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dd9b4aca5d6e5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 20 15:19:33 2014 +0100 esx_vsphere_vm.running_on: shows the esx host of the VM --- .werks/734 | 8 ++++++++ ChangeLog | 1 + checkman/esx_vsphere_vm.running_on | 15 ++++++++++++++ checks/esx_vsphere_vm | 39 ++++++++++++++++++++++++++++++++++-- 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/.werks/734 b/.werks/734 new file mode 100644 index 0000000..3f5af87 --- /dev/null +++ b/.werks/734 @@ -0,0 +1,8 @@ +Title: esx_vsphere_vm.running_on: shows the esx host of the VM +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395325160 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 27b8ef6..99f6eb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 0716 Add Linux caching agent also to normal agent RPM... * 0594 dell_poweredge_netdev: new check to monitor the status of network devices on Dells Poweredge Servers * 0733 mem, solaris_mem: now able to configure amount of free memory... + * 0734 esx_vsphere_vm.running_on: shows the esx host of the VM * 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/esx_vsphere_vm.running_on b/checkman/esx_vsphere_vm.running_on new file mode 100644 index 0000000..99a5c6e --- /dev/null +++ b/checkman/esx_vsphere_vm.running_on @@ -0,0 +1,15 @@ +title: Virtual Machine under ESX: Hostsystem the VM is running on +agents: vsphere +catalog: os/misc +license: GPL +distribution: check_mk +description: + This check provices information about the hostsystem where the VM is running on. + + The check returns {OK}, unless the hostsystem is missing. + In this case it returns {UNKNOWN}. + + See "Monitoring VMWare ESX with Check_MK" in the online documentation as well. + +inventory: + On each VM one check is generated. diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 1dee19b..219b12e 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -117,6 +117,41 @@ check_info['esx_vsphere_vm.name'] = { "service_description" : "ESX Name", } + + +# .--Runtime Host--------------------------------------------------------. +# | ____ _ _ _ _ _ | +# | | _ \ _ _ _ __ | |_(_)_ __ ___ ___ | | | | ___ ___| |_ | +# | | |_) | | | | '_ \| __| | '_ ` _ \ / _ \ | |_| |/ _ \/ __| __| | +# | | _ <| |_| | | | | |_| | | | | | | __/ | _ | (_) \__ \ |_ | +# | |_| \_\\__,_|_| |_|\__|_|_| |_| |_|\___| |_| |_|\___/|___/\__| | +# | | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' + +def inventory_esx_vsphere_vm_running_on(info): + data = esx_vsphere_vm_convert(info) + if 'runtime.host' in data: + return [(None, None)] + return [] + +def check_esx_vsphere_vm_running_on(no_item, no_params, info): + data = esx_vsphere_vm_convert(info) + + running_on = data.get("runtime.host") + if not running_on: + return 3, "Runtime host information is missing" + + return 0, "Running on %s" % running_on[0] + +check_info['esx_vsphere_vm.running_on'] = { + "inventory_function" : inventory_esx_vsphere_vm_running_on, + "check_function" : check_esx_vsphere_vm_running_on, + "service_description" : "ESX Hostsystem", +} + + # .--VM Datastores--------------------------------------------------------. # | __ ____ __ ____ _ _ | # | \ \ / / \/ | | _ \ __ _| |_ __ _ ___| |_ ___ _ __ ___ | @@ -133,7 +168,7 @@ def inventory_esx_vsphere_vm_datastores(info): # Right now we only handle one datastore per vm if 'config.datastoreUrl' in data: return [(None, None)] - return + return [] def check_esx_vsphere_vm_datastores(no_item, no_params, info): data = esx_vsphere_vm_convert(info) @@ -165,7 +200,7 @@ def check_esx_vsphere_vm_datastores(no_item, no_params, info): else: free_perc = 0.0 - output_store = "Running on %s (%s/%0.1f%% free)" %\ + output_store = "Stored on %s (%s/%0.1f%% free)" %\ (datastore_dict.get("name"), get_bytes_human_readable(capacity), free_perc)

10 years, 6 months

Check_MK Git: check_mk: EMC VNX: special agent can alternatively authenticate via security files

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: cc73d1321b3c2cdf8df47a268ffef933db90b033 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc73d1321b3c2c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Mar 20 12:22:22 2014 +0100 EMC VNX: special agent can alternatively authenticate via security files If you leave user name and password empty, the special agent tries to authenticate against the EMC VNX device by Security Files. These need to be created manually before using. Therefor run as instance user (if using OMD) or Nagios user (if not using OMD) a command like <tt>naviseccli -AddUserSecurity -scope 0 -password PASSWORD -user USER</tt> This creates <tt>SecuredCLISecurityFile.xml</tt> and <tt>SecuredCLIXMLEncrypted.key</tt> in the home directory of the user and these files are used then. --- .werks/706 | 16 ++++++++++++++++ ChangeLog | 1 + agents/special/agent_emcvnx | 13 ++++++++++++- checks/agent_emcvnx | 6 ++++-- web/plugins/wato/datasource_programs.py | 14 ++++++++++++-- 5 files changed, 45 insertions(+), 5 deletions(-) diff --git a/.werks/706 b/.werks/706 new file mode 100644 index 0000000..17969b3 --- /dev/null +++ b/.werks/706 @@ -0,0 +1,16 @@ +Title: EMC VNX: special agent can alternatively authenticate via security files +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395314250 +Class: feature + +If you leave user name and password empty, the special agent tries to +authenticate against the EMC VNX device by Security Files. +These need to be created manually before using. Therefor run as +instance user (if using OMD) or Nagios user (if not using OMD) +a command like +<tt>naviseccli -AddUserSecurity -scope 0 -password PASSWORD -user USER</tt> +This creates <tt>SecuredCLISecurityFile.xml</tt> and +<tt>SecuredCLIXMLEncrypted.key</tt> in the home directory of the user +and these files are used then. diff --git a/ChangeLog b/ChangeLog index 27b8ef6..e7cd1a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 0716 Add Linux caching agent also to normal agent RPM... * 0594 dell_poweredge_netdev: new check to monitor the status of network devices on Dells Poweredge Servers * 0733 mem, solaris_mem: now able to configure amount of free memory... + * 0706 EMC VNX: special agent can alternatively authenticate via security files... * 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/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 35e5e89..7394f23 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -58,6 +58,13 @@ OPTIONS: -h, --help Show this help message and exit -u USER, --user USER Username for EMC VNX login -p PASSWORD, --password PASSWORD Password for EMC VNX login + + If you do not give USER and PASSWORD: + We try to use naviseccli with security files. + These need to be created in advance by running as + the instance user: + naviseccli -AddUserSecurity -scope 0 -password PASSWORD -user USER + --debug Debug mode: write some debug messages, let Python exceptions come through @@ -156,7 +163,11 @@ except ValueError: # fetch information by calling naviseccli ############################################################################# -basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 " % (host_address, user, password) +if (user == None or user == '') and (password == None or password == ''): + # try using security files + basecmd="naviseccli -h %s -Scope 0 " % host_address +else: + basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 " % (host_address, user, password) # # check_mk section of agent output diff --git a/checks/agent_emcvnx b/checks/agent_emcvnx index 683afa3..7570b0c 100644 --- a/checks/agent_emcvnx +++ b/checks/agent_emcvnx @@ -26,8 +26,10 @@ def agent_emcvnx_arguments(params, hostname, ipaddress): args = '' - args += " -u " + quote_shell_string(params["user"]) - args += " -p " + quote_shell_string(params["password"]) + if params["user"] != "": + args += " -u " + quote_shell_string(params["user"]) + if params["password"] != "": + args += " -p " + quote_shell_string(params["password"]) args += " -i " + ",".join(params["infos"]) args += " " + quote_shell_string(ipaddress) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 97c55de..c4d51d0 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -186,13 +186,23 @@ register_rule(group, ( "user", TextAscii( title = _("EMC VNX admin user name"), - allow_empty = False, + allow_empty = True, + help = _("If you leave user name and password empty, the special agent tries to " + "authenticate against the EMC VNX device by Security Files. " + "These need to be created manually before using. Therefor run as " + "instance user (if using OMD) or Nagios user (if not using OMD) " + "a command like " + "<tt>naviseccli -AddUserSecurity -scope 0 -password PASSWORD -user USER</tt> " + "This creates <tt>SecuredCLISecurityFile.xml</tt> and " + "<tt>SecuredCLIXMLEncrypted.key</tt> in the home directory of the user " + "and these files are used then." + ), ) ), ( "password", Password( title = _("EMC VNX admin user password"), - allow_empty = False, + allow_empty = True, ) ), ( "infos",

10 years, 6 months

Check_MK Git: check_mk: fixed syntax error in declare_custom_view_permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: 56643b35a79889dc37ea23139901316f626cf084 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56643b35a79889… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 20 11:58:10 2014 +0100 fixed syntax error in declare_custom_view_permissions --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 95d9f34..fd104d9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -311,7 +311,7 @@ def declare_custom_view_permissions(): config.declare_permission("view." + name, view["title"], view["description"], ['admin','user','guest']) except: - if opt_debug: + if config.debug: raise # Get the list of views which are available to the user

10 years, 6 months

Check_MK Git: check_mk: mem, solaris_mem: now able to configure amount of free memory

by Andreas Boesl

Module: check_mk Branch: master Commit: fceeba37b29e93d4f8ee799221c43974741458ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fceeba37b29e93… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 20 11:05:28 2014 +0100 mem, solaris_mem: now able to configure amount of free memory You can now configure the levels of free memory via WATO. --- .werks/733 | 8 ++++ ChangeLog | 1 + checks/fortigate_memory | 7 +++ checks/mem.include | 25 ++++++---- web/plugins/wato/check_parameters.py | 86 ++++++++++++++++++++++++++-------- 5 files changed, 99 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fceeba37b2…

10 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits