Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

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, 3 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, 3 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, 3 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, 3 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, 3 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, 3 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, 3 months

Check_MK Git: check_mk: INV: Fix exception on empty paths, add RH to OS discovery

by Mathias Kettner

Module: check_mk Branch: master Commit: de7fba5fadb09434a735594c804c164fe717cfed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de7fba5fadb094… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 20 10:39:56 2014 +0100 INV: Fix exception on empty paths, add RH to OS discovery --- inventory/lnx_distro | 24 ++++++++++++++++++++++-- modules/inventory.py | 26 ++++++++++++++++++++++++++ web/plugins/views/inventory.py | 26 +++++++++++++++----------- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/inventory/lnx_distro b/inventory/lnx_distro index a73d904..9d522ff 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -24,11 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example output (Ubuntu 12.10) +# Example outputs from various systems: # <<<lnx_distro:sep(124)>>> # /etc/debian_version|wheezy/sid + +# <<<lnx_distro:sep(124)>>> # /etc/lsb-release|DISTRIB_ID=Ubuntu|DISTRIB_RELEASE=12.10|DISTRIB_CODENAME=quantal|DISTRIB_DESCRIPTION="Ubuntu 12.10" +# <<<lnx_distro:sep(124)>>> +# /etc/redhat-release|Red Hat Enterprise Linux Server release 6.5 (Santiago) + + def inv_lnx_distro(info): node = inv_tree("software.os.") @@ -37,10 +43,24 @@ def inv_lnx_distro(info): inv_lnx_parse_lsb_release(node, line[1:]) elif line[0] == '/etc/debian_version': inv_lnx_parse_debian(node, line[1]) + elif line[0] == '/etc/redhat-release': + inv_lnx_parse_redhat_release(node, line[1]) + +def inv_lnx_parse_redhat_release(node, line): + node["type"] = "linux" + parts = line.split("(") + left = parts[0].strip() + node["code_name"] = parts[1].rstrip(")") + name, _release, version = left.rsplit(None, 2) + if name.startswith("Red Hat"): + node["vendor"] = "Red Hat" + node["version"] = version + node["name"] = left + def inv_lnx_parse_lsb_release(node, lines): + node["type"] = "linux" for line in lines: - node["type"] = "linux" varname, value = line.split("=", 1) value = value.strip("'").strip('"') if varname == "DISTRIB_ID": diff --git a/modules/inventory.py b/modules/inventory.py index 1fbb780..ee83580 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -116,6 +116,27 @@ def inv_tree(path): return node +# Removes empty nodes from a (sub)-tree. Returns +# True if the tree itself is empty +def inv_cleanup_tree(tree): + + if type(tree) == dict: + for key, value in tree.items(): + if inv_cleanup_tree(value): + del tree[key] + return not tree + + elif type(tree) == list: + to_delete = [] + for nr, entry in enumerate(tree): + if inv_cleanup_tree(entry): + to_delete.append(nr) + for nr in to_delete[::-1]: + del tree[nr] + return not tree + + else: + return False # cannot clean non-container nodes #. # .--Inventory-----------------------------------------------------------. @@ -217,6 +238,9 @@ def do_inv_for(hostname, ipaddress): plugin["inv_function"](info) + # Remove empty paths + inv_cleanup_tree(g_inv_tree) + if inventory_pprint_output: r = pprint.pformat(g_inv_tree) else: @@ -247,3 +271,5 @@ def run_inv_export_hooks(hostname, tree): raise raise MKGeneralException("Failed to execute export hook %s: %s" % ( hookname, e)) + + diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 50531e8..d94c989 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -28,6 +28,9 @@ import inventory def paint_host_inventory(row, invpath): invdata = inventory.get(row["host_inventory"], invpath) + if not invdata: + return "", _("No inventory data available") + hint = inv_display_hint(invpath) if "paint_function" in hint: return hint["paint_function"](invdata) @@ -300,17 +303,18 @@ def render_inv_subtree(hostname, invpath, node): render_inv_subtree_leaf(hostname, invpath, node) def render_inv_subtree_foldable(hostname, invpath, node): - icon, title = inv_titleinfo(invpath, node) - - if "%d" in title: # Replace with list index - list_index = int(invpath.split(":")[-1].rstrip(".")) + 1 - title = title % list_index - - fetch_url = html.makeuri_contextless([("host", hostname), ("path", invpath)], "ajax_inv_render_tree.py") - if html.begin_foldable_container("inv_" + hostname, invpath, False, title, icon=icon, fetch_url=fetch_url): - # Render only if it is open. We'll get the stuff via ajax later if it's closed - render_inv_subtree_container(hostname, invpath, node) - html.end_foldable_container() + if node: # omit empty nodes completely + icon, title = inv_titleinfo(invpath, node) + + if "%d" in title: # Replace with list index + list_index = int(invpath.split(":")[-1].rstrip(".")) + 1 + title = title % list_index + + fetch_url = html.makeuri_contextless([("host", hostname), ("path", invpath)], "ajax_inv_render_tree.py") + if html.begin_foldable_container("inv_" + hostname, invpath, False, title, icon=icon, fetch_url=fetch_url): + # Render only if it is open. We'll get the stuff via ajax later if it's closed + render_inv_subtree_container(hostname, invpath, node) + html.end_foldable_container() def render_inv_subtree_container(hostname, invpath, node): hint = inv_display_hint(invpath)

10 years, 3 months

Check_MK Git: check_mk: Allow to restrict visibility of events by their host contacts

by Mathias Kettner

Module: check_mk Branch: master Commit: 9cbdc9c3592b0b5cc414fc98d552e0a612facb1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cbdc9c3592b0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 19 15:24:07 2014 +0100 Allow to restrict visibility of events by their host contacts The Event Console has now two new permissions: <ol> <li>See all events</li> <li>See events not related to a known host</li> </ol> Both permissions default to yes in all roles. If you remove the See all events permission then a user can only see events for hosts that either he is a monitoring contact for or that are not known to the monitoring at all (i.e. no host with such a name or IP address is configured as monitored host in your monitoring core). The visibility of the later ones can be switched off with the second permission. The second permission is only relevant if See all events is set to no - of course. Furthermore you can now assign Fallback Contact Groups to an event. This is done with a new rule option in the section Outcome & Action. As soon as you assign contact groups these will be assumed for all hosts that are not in the monitoring. That groups will be attached as an additional information to each event created with that rule. These events will then be handled like as if the host is known to the monitoring when it comes to the visibility. --- .werks/749 | 27 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 95 ++++++++++++++++------------- mkeventd/web/plugins/views/mkeventd.py | 104 +++++++++++++++++++++++++++++++- mkeventd/web/plugins/wato/mkeventd.py | 23 ++++++- web/htdocs/wato.py | 2 +- 6 files changed, 204 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9cbdc9c359…

10 years, 3 months

Check_MK Git: check_mk: FIX check_sql: Fixed monitoring of stored procedures with oracle

by Lars Michelsen

Module: check_mk Branch: master Commit: 92548fdd0d4a10c2a81fc23e732ba29032a92675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92548fdd0d4a10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 19 12:23:31 2014 +0100 FIX check_sql: Fixed monitoring of stored procedures with oracle --- .werks/758 | 8 ++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_sql | 5 ++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/758 b/.werks/758 new file mode 100644 index 0000000..78bc360 --- /dev/null +++ b/.werks/758 @@ -0,0 +1,8 @@ +Title: check_sql: Fixed monitoring of stored procedures with oracle +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395228185 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f9e9ae0..7796627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -213,6 +213,7 @@ * 0729 FIX: esx_vsphere_hostsystem: fixed incorrect status label (not state)... * 0142 FIX: winperf_if: treat unknown packets no longer as error packets * 0593 FIX: zypper: agent plugin and check now lead to UNKNOWN result in case of repo problems + * 0758 FIX: check_sql: Fixed monitoring of stored procedures with oracle Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql old mode 100755 new mode 100644 index 761f1e1..846085e --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -206,7 +206,10 @@ try: #opt_input.append("outvar") cursor.callproc(opt_sql, (outvar,)) res = outvar.getvalue() - result = res[0].split(",") + if opt_dbms == "mssql": + result = res[0].split(",") + else: + result = res.split(",") else: cursor.execute(opt_sql) result = cursor.fetchone()

10 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014