Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: Updated bug entries #0934

by Lars Michelsen

Module: check_mk Branch: master Commit: 728ee107e06e69f40b9a150ed81945f532ba3a79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=728ee107e06e69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 12 08:36:43 2013 +0200 Updated bug entries #0934 --- .bugs/934 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/934 b/.bugs/934 index a8f20f2..08a13a4 100644 --- a/.bugs/934 +++ b/.bugs/934 @@ -1,9 +1,9 @@ Title: fileinfo.groups and "patterns" check_parameter Component: wato -State: open +Class: bug +State: done Date: 2013-07-08 09:56:03 Targetversion: future -Class: bug The fileinfo.groups checks evaluates the parameter fileinfo_groups upon inventory and create an autocheck file with a pattern key. @@ -17,3 +17,8 @@ it is not possible to define patterns in the fileinfo_groups valuespec Solution: Add patterns to fileinfo_groups valuespec + +2013-07-12 08:36:21: changed state open -> done +Has been cleaned up by removing the pattern attribute and adding a precompile +function to the check which precompiles the patterns of a fileinfo group +just like the logwatch check

11 years, 2 months

Check_MK Git: check_mk: Fixed port number mixup

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c86ff31db9bd89d61b579c556d0925088d7863f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c86ff31db9bd8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 12 09:15:05 2013 +0200 Fixed port number mixup --- mkeventd/bin/mkeventd | 13 +++++++------ mkeventd/src/mkeventd_open514.c | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 059d30d..092ba0e 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -804,8 +804,8 @@ class EventServer: else: self._snmptrap = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self._snmptrap.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self._snmptrap.bind(("0.0.0.0", 612)) - log("Opened builtin snmptrap server on UDP port 612") + self._snmptrap.bind(("0.0.0.0", 162)) + log("Opened builtin snmptrap server on UDP port 162") except Exception, e: raise Exception("Cannot start builtin snmptrap server: %s" % e) @@ -1070,10 +1070,9 @@ class EventServer: if self._syslog != None and self._syslog.fileno() in readable: self.process_raw_lines(self._syslog.recv(4096)) - # Accept - # Read events from builtin snmptrap server if self._snmptrap != None and self._snmptrap.fileno() in readable: + print 'got trap data' try: self.process_raw_data(self.process_snmptrap, self._snmptrap.recvfrom(65535)) except Exception, e: @@ -2974,10 +2973,12 @@ def usage(): -E, --eventsocket P Path to unix socket for receiving events (optional) -L, --livestatus P Path to livestatus socket of monitoring core (optional) -P, --pipe P Path to pipe for receiving events - --syslog Enable builtin syslog server + --syslog Enable builtin UDP syslog server --syslog-fd FD Do not open UDP port 514, but inherit it via this FD + --syslog-tcp Enable builtin TCP syslog server + --syslog-tcp-fd FD Do not open TCP port 514, but inherit it via this FD --snmptrap Enable builtin snmptrap server - --snmptrap-fd FD Do not open UDP port 612, but inherit it via this FD + --snmptrap-fd FD Do not open UDP port 162, but inherit it via this FD --statedir D Path to directory for saving status --logdir D Path to directory where mkeventd.log is created -p, --pidfile Path to PID file diff --git a/mkeventd/src/mkeventd_open514.c b/mkeventd/src/mkeventd_open514.c index 0402a0a..fa53054 100644 --- a/mkeventd/src/mkeventd_open514.c +++ b/mkeventd/src/mkeventd_open514.c @@ -39,7 +39,7 @@ #include <stdio.h> #define SYSLOG_PORT 514 -#define SNMPTRAP_PORT 612 +#define SNMPTRAP_PORT 162 #define PROGRAM "mkeventd"

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ffec175ed9deb957acc8e938162262500075676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ffec175ed9deb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 12 08:59:06 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: added deprecated notice in all remaining j4p check manpages

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2c8e634cef115e239f4695d6a03c68e87f2338d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c8e634cef115e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jul 11 17:32:30 2013 +0200 added deprecated notice in all remaining j4p check manpages --- checkman/j4p_performance.mem | 4 +++- checkman/j4p_performance.threads | 4 +++- checkman/j4p_performance.uptime | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/checkman/j4p_performance.mem b/checkman/j4p_performance.mem index 865fecb..068578d 100644 --- a/checkman/j4p_performance.mem +++ b/checkman/j4p_performance.mem @@ -1,9 +1,11 @@ -title: Memory usage of Java application server via JMX and j4p.war +title: Memory usage of Java application server via JMX and j4p.war - DEPRECATED agents: linux catalog: app/java license: GPL distribution: check_mk description: + Do not use this plugin. It will be removed soon. Use jolokia_metrics instead. + This checks uses the JSON HTTP service of j4p (from jmx4perl) to monitor the current memory usage of a Java application server like Tomcat or JBoss. You can define levels against the total memory diff --git a/checkman/j4p_performance.threads b/checkman/j4p_performance.threads index 8e05e7d..bcbd2f5 100644 --- a/checkman/j4p_performance.threads +++ b/checkman/j4p_performance.threads @@ -1,9 +1,11 @@ -title: Threads of Java application server via JMX and j4p.war +title: Threads of Java application server via JMX and j4p.war - DEPRECATED agents: linux catalog: app/java license: GPL distribution: check_mk description: + Do not use this plugin. It will be removed soon. Use jolokia_metrics instead. + This checks uses the JSON HTTP service of j4p (from jmx4perl) to monitor the number of threads created by a Java application server like Tomcat or JBoss. You can define levels against the number of threads diff --git a/checkman/j4p_performance.uptime b/checkman/j4p_performance.uptime index bc07d88..08f8a10 100644 --- a/checkman/j4p_performance.uptime +++ b/checkman/j4p_performance.uptime @@ -1,9 +1,11 @@ -title: Uptime of Java application server via JMX and j4p.war +title: Uptime of Java application server via JMX and j4p.war - DEPRECATED agents: linux catalog: app/java license: GPL distribution: check_mk description: + Do not use this plugin. It will be removed soon. Use jolokia_metrics instead. + This checks uses the JSON HTTP service of j4p (from jmx4perl) to monitor the uptime of a Java application server like Tomcat or JBoss.

11 years, 2 months

Check_MK Git: check_mk: fixed titles for all manpage stubs to not waste the catalog; added tags to find stubs easiely

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 79ea1b68b697c4d4219664f24abd8cb71d5e8e3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79ea1b68b697c4… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jul 11 17:27:44 2013 +0200 fixed titles for all manpage stubs to not waste the catalog; added tags to find stubs easiely --- checkman/apc_powerswitch | 5 +++-- checkman/blade_bx_blades | 5 +++-- checkman/blade_bx_load | 2 +- checkman/blade_bx_powerfan | 5 +++-- checkman/blade_bx_powermod | 5 +++-- checkman/blade_bx_temp | 5 +++-- checkman/bluecoat_sensors | 3 ++- checkman/cisco_temp_perf | 6 +----- checkman/hp_proliant | 2 ++ checkman/hpux_hpux_tunables.shmseg | 1 - checkman/hpux_tunables.maxfiles_lim | 7 ++++--- checkman/hpux_tunables.nkthread | 7 ++++--- checkman/hpux_tunables.nproc | 7 ++++--- checkman/hpux_tunables.semmni | 7 ++++--- checkman/hpux_tunables.semmns | 7 ++++--- checkman/hpux_tunables.shmseg | 4 ++-- checkman/j4p_performance.app_sess | 2 +- checkman/j4p_performance.app_state | 2 +- checkman/j4p_performance.serv_req | 2 +- checkman/jolokia_metrics.serv_req | 3 ++- checkman/netapp_fcpio | 3 ++- checkman/netif.link | 2 +- checkman/netif.params | 2 +- checkman/statgrab_disk | 2 +- checkman/statgrab_load | 2 +- checkman/statgrab_mem | 2 +- checkman/statgrab_net.ctr | 3 ++- checkman/statgrab_net.link | 2 +- checkman/statgrab_net.params | 2 +- 29 files changed, 59 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=79ea1b68b6…

11 years, 2 months

Check_MK Git: check_mk: fc_brocade_port*: remove two obsolete checks

by Mathias Kettner

Module: check_mk Branch: master Commit: acd1a08b25f44f753acd8b56b4a0921dc5e77e35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acd1a08b25f44f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 11 14:47:33 2013 +0200 fc_brocade_port*: remove two obsolete checks --- ChangeLog | 2 ++ checks/fc_brocade_port | 37 ------------------------------------- checks/fc_brocade_port_detailed | 37 ------------------------------------- 3 files changed, 2 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22cbb07..63dc9d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,8 @@ * diskstat: Agent is now also processing data of mmcblk devices * qmail: Added check for mailqueue * cisco_locif: removed obsolete and already disabled check completely + * fc_brocade_port: removed obsolete check + * fc_brocade_port_detailed: removed obsolete check * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * FIX: cleaned up fileinfo.groups pattern handling, manual configuration is now possible using WATO diff --git a/checks/fc_brocade_port b/checks/fc_brocade_port deleted file mode 100644 index 90fe20a..0000000 --- a/checks/fc_brocade_port +++ /dev/null @@ -1,37 +0,0 @@ -#!/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. - -def check_brocade_port(portno, params, info): - return (3, "UKNOWN - This check has been removed. Please use brocade_fcport instead.") - - -check_info["fc_brocade_port"] = { - 'check_function': check_brocade_port, - 'service_description': 'PORT %s', - 'has_perfdata': True, - 'snmp_info': [], - 'snmp_scan_function': lambda oid: False, -} diff --git a/checks/fc_brocade_port_detailed b/checks/fc_brocade_port_detailed deleted file mode 100644 index b5c4e00..0000000 --- a/checks/fc_brocade_port_detailed +++ /dev/null @@ -1,37 +0,0 @@ -#!/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. - -def check_brocade_port(portno, params, info): - return (3, "UKNOWN - This check has been removed. Please use brocade_fcport instead.") - - -check_info["fc_brocade_port_detailed"] = { - 'check_function': check_brocade_port, - 'service_description': 'PORT %s', - 'has_perfdata': True, - 'snmp_info': [], - 'snmp_scan_function': lambda oid: False, -}

11 years, 2 months

Check_MK Git: check_mk: cisco_locif: removed obsolete check

by Mathias Kettner

Module: check_mk Branch: master Commit: 9dc920f1f94171440484a04f8090f629516bcd0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dc920f1f94171… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 11 14:44:08 2013 +0200 cisco_locif: removed obsolete check --- ChangeLog | 1 + checks/cisco_locif | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d7c1e5..22cbb07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * ps/ps.perf: allow to set levels on CPU util, optional averaging of CPU * diskstat: Agent is now also processing data of mmcblk devices * qmail: Added check for mailqueue + * cisco_locif: removed obsolete and already disabled check completely * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * FIX: cleaned up fileinfo.groups pattern handling, manual configuration is now possible using WATO diff --git a/checks/cisco_locif b/checks/cisco_locif deleted file mode 100644 index 9dd90dc..0000000 --- a/checks/cisco_locif +++ /dev/null @@ -1,43 +0,0 @@ -#!/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. - - -def inventory_cisco_locif(info): - pass - -def check_cisco_locif(item, params, info): - return (3, 'The cisco_locif check has been removed. Please switch to either if or if64 checks') - -check_info['cisco_locif'] = (check_cisco_locif, "Port %s", 1, inventory_cisco_locif) -snmp_info['cisco_locif'] = ( ".1.3.6.1.4.1.9", - [ "9.23.1.1.1.1.6", # CISCO-CDP-MIB::cdpInterfaceName - "2.2.1.1.2", # OLD-CISCO-INTERFACES-MIB::locIfLineProt - "2.2.1.1.6", # OLD-CISCO-INTERFACES-MIB::locIfInBitsSec - "2.2.1.1.8", # OLD-CISCO-INTERFACES-MIB::locIfOutBitsSec - "2.2.1.1.28", # OLD-CISCO-INTERFACES-MIB::locIfDescr - OID_END ] ) - -snmp_scan_functions['cisco_locif'] = lambda oid: False

11 years, 2 months

Check_MK Git: check_mk: tsm_stgpool: removed orphaned check

by Mathias Kettner

Module: check_mk Branch: master Commit: eb54780c5a008e1950bef87809fe42d316f6f160 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb54780c5a008e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 11 15:35:19 2013 +0200 tsm_stgpool: removed orphaned check --- ChangeLog | 1 + checks/tsm_stgpool | 56 ---------------------------------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63dc9d2..09ad775 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * cisco_locif: removed obsolete and already disabled check completely * fc_brocade_port: removed obsolete check * fc_brocade_port_detailed: removed obsolete check + * tsm_stgpool: removed orphaned check * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * FIX: cleaned up fileinfo.groups pattern handling, manual configuration is now possible using WATO diff --git a/checks/tsm_stgpool b/checks/tsm_stgpool deleted file mode 100644 index 1c04812..0000000 --- a/checks/tsm_stgpool +++ /dev/null @@ -1,56 +0,0 @@ -#!/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. - - -inventory_tsm_stgpool_check_params = 'tsm_stgpool_default_levels' -tsm_stgpool_default_levels = (90, 95) - -def inventory_tsm_stgpool(info): - return [ (line[0], '%s perc used' % line[1], inventory_tsm_stgpool_check_params ) for line in info ] - -def check_tsm_stgpool(item, params, info): - for line in info: - if line[0] == item: - current = float(line[1]) - warn, crit = params - infotext = "%.1f%% used" % current - perfdata = [ ("percused", "%.1f%%" % current, warn, crit, 0, 100.0) ] - if current >= crit: - return (2, "%s (critical at %.1f%%)" % (infotext, crit), perfdata) - elif current >= warn: - return (1, "%s (warning at %.1f%%)" % (infotext, warn), perfdata) - else: - return (0, "%s" % (infotext,), perfdata) - return (3, "No such storage pool found") - - - -check_info["tsm_stgpool"] = { - 'check_function': check_tsm_stgpool, - 'inventory_function': inventory_tsm_stgpool, - 'service_description': 'Storage Pool %s', - 'has_perfdata': True, -}

11 years, 2 months

Check_MK Git: check_mk: Added stubs for missing manpages

by Mathias Kettner

Module: check_mk Branch: master Commit: e309ed89542aa90306c46c2436da1bcdbe133e08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e309ed89542aa9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 11 15:43:58 2013 +0200 Added stubs for missing manpages --- agents/plugins/j4p_performance | 3 + checkman/apc_powerswitch | 6 ++ checkman/blade_bx_blades | 6 ++ checkman/blade_bx_load | 6 ++ checkman/blade_bx_powerfan | 6 ++ checkman/blade_bx_powermod | 6 ++ checkman/blade_bx_temp | 6 ++ checkman/bluecoat_diskcpu | 6 ++ checkman/bluecoat_sensors | 6 ++ checkman/cisco_temp_perf | 30 ++++++++ checkman/hp_proliant | 16 +++++ checkman/hpux_hpux_tunables.shmseg | 1 + checkman/hpux_tunables.maxfiles_lim | 12 ++++ checkman/hpux_tunables.nkthread | 12 ++++ checkman/hpux_tunables.nproc | 12 ++++ checkman/hpux_tunables.semmni | 12 ++++ checkman/hpux_tunables.semmns | 12 ++++ checkman/hpux_tunables.shmseg | 12 ++++ checkman/{imm_health => ibm_imm_health} | 2 +- checkman/ibm_rsa_health | 7 ++ checkman/if64_tplink | 10 +++ checkman/j4p_performance.app_sess | 6 ++ checkman/j4p_performance.app_state | 6 ++ checkman/j4p_performance.serv_req | 6 ++ checkman/jar_signature | 6 ++ checkman/jolokia_metrics.serv_req | 58 +++++++++++++++ checkman/lnx_thermal | 7 ++ checkman/netapp_cpu | 8 +++ checkman/netapp_fcpio | 8 +++ checkman/netif.link | 8 +++ checkman/netif.params | 8 +++ checkman/oracle_asm_diskgroup | 8 +++ checkman/plesk_backups | 18 +++++ checkman/statgrab_cpu | 4 +- checkman/statgrab_disk | 19 +++++ checkman/statgrab_load | 19 +++++ checkman/statgrab_mem | 19 +++++ checkman/statgrab_net.ctr | 19 +++++ checkman/statgrab_net.link | 19 +++++ checkman/statgrab_net.params | 19 +++++ checks/blade_bx_load | 12 ++-- checks/bluecoat_diskcpu | 4 +- checks/hp_proliant | 2 - checks/j4p_performance | 3 + checks/netif | 3 + modules/catalog.py | 2 + .../check_mk-fc_brocade_port_detailed.php | 76 -------------------- 47 files changed, 468 insertions(+), 88 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e309ed8954…

11 years, 2 months

Check_MK Git: check_mk: vmware_state: removed ancient, now orphaned check.

by Mathias Kettner

Module: check_mk Branch: master Commit: adc5648d83b60957ecf8d781928d516b18968e9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adc5648d83b609… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 11 15:37:43 2013 +0200 vmware_state: removed ancient, now orphaned check. --- ChangeLog | 1 + checks/vmware_state | 110 --------------------------------------------------- 2 files changed, 1 insertion(+), 110 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09ad775..526663b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * fc_brocade_port: removed obsolete check * fc_brocade_port_detailed: removed obsolete check * tsm_stgpool: removed orphaned check + * vmware_state: removed ancient, now orphaned check. Use vsphere_agent instead. * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * FIX: cleaned up fileinfo.groups pattern handling, manual configuration is now possible using WATO diff --git a/checks/vmware_state b/checks/vmware_state deleted file mode 100644 index 815e189..0000000 --- a/checks/vmware_state +++ /dev/null @@ -1,110 +0,0 @@ -#!/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. - -# THIS CHECK IS DEPRACATED! Use agent_vpshere instead. - -# Example output from agent: -# <<<vmware_state>>> -# [2009-11-12 10:40:30.086 'App' 3076453184 info] Current working directory: /usr/lib/check_mk_agent/plugins -# Found VM: -# moref:32 -# name:name_of_vm -# uuid:xxxxxxxxxxxx -# ipaddr:192.168.1.5 -# Found VM: -# moref:48 -# name:abcdef -# uuid:xxxxxxxxx -# ipaddr:12.34.56.78 -# [2009-11-12 10:40:30.215 'vcbVmName' 3076453184 warning] IP address not set. -# Found VM: -# moref:80 -# name:name_of_vm -# uuid:xxxxxxxxx -# ipaddr: - -def inventory_vmware_state(info): - inventory = [] - for line in info: - if line[0].startswith("name:"): - vm_name = line[0][5:] - if line[0].startswith("ipaddr:"): - vm_ipaddr = line[0][7:] - # add machine to inventory (if IP address is not empty) - if vm_ipaddr != '': - inventory.append((vm_name, None)) - return inventory - -# 1. Variant: loop over all machines and -# remember the ip addresses of all machines. -# Then pick out the ip address of the machine -# we are looking for. -# -#def check_vmware_state(item, params, info): -# vm_ipaddr = {} -# for line in info: -# if line[0].startswith("name:"): -# vm_name = line[0][5:] -# -# if line[0].startswith("ipaddr:"): -# vm_ipaddr[vm_name] = line[0][7:] -# -# ip_addr = vm_ipaddr.get(item) -# if ip_addr == "": -# return(2, "The Machine is DOWN") -# -# elif ip_addr == None: -# return (3, "no such machine") -# -# else: -# return(0, "The Machine is UP (%s)" % ip_addr) - -# 2. Variant: loop over all machines. If -# we reach the machine we are looking for -# we do the check and return immediately. -# If we go through the loop without finding -# the machine, we return an UNKNOWN state. -def check_vmware_state(item, _no_params, info): - # item is the name of the machine. - for line in info: - if line[0].startswith("name:"): - vm_name = line[0][5:] - elif line[0].startswith("ipaddr:"): - if vm_name == item: - ip_addr = line[0][7:] - if ip_addr == "": - return (2, "the machine is down") - else: - return (0, "machine is up (%s)" % ip_addr) - return (3, "no such machine") - - -check_info["vmware_state"] = { - 'check_function': check_vmware_state, - 'inventory_function': inventory_vmware_state, - 'service_description': 'VM %s', - 'group': 'vm_state', -}

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits