Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: Remove werk 76 from changelog

by Götz Golla

Module: check_mk Branch: master Commit: 5f5cb23cd22d40a7a16211438c533d1dec6a6487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f5cb23cd22d40… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Dec 19 14:08:55 2013 +0100 Remove werk 76 from changelog --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 85c23d3..ab48683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,7 +26,6 @@ * 0396 cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well... * 0111 kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: New Checks for Kemp Loadbalancer * 0318 hitachi_hnas_fan: New check for fans in Hitachi HNAS systems - * 0076 kemp_loadmaster_services: Check now collects performance data of number of active connections * 0319 hitachi_hnas_psu, hitachi_hnas_psu: New checks for Hitachi HNAS storage systems * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now

10 years, 9 months

Check_MK Git: check_mk: Removed werk 76 since it is include in werk 111

by Götz Golla

Module: check_mk Branch: master Commit: 2bd4b0d7ec9946a80f89b4be3e53807353352890 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bd4b0d7ec9946… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Dec 19 14:07:09 2013 +0100 Removed werk 76 since it is include in werk 111 --- .werks/76 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.werks/76 b/.werks/76 deleted file mode 100644 index 0c6dde2..0000000 --- a/.werks/76 +++ /dev/null @@ -1,8 +0,0 @@ -Title: kemp_loadmaster_services: Check now collects performance data of number of active connections -Level: 1 -Component: checks -Version: 1.2.5i1 -Date: 1387456179 -Class: feature - -

10 years, 9 months

Check_MK Git: check_mk: kemp_loadmaster_services: Check now collects performance data of number of active connections

by Götz Golla

Module: check_mk Branch: master Commit: 8a49c1765bd4d02e72a138d9fd07dfa74e42e360 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a49c1765bd4d0… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Dec 19 13:30:28 2013 +0100 kemp_loadmaster_services: Check now collects performance data of number of active connections --- .werks/76 | 8 + ChangeLog | 1 + agents/windows/plugins/windows_updates.vbs | 245 +++++++++++++++------------- checkman/kemp_loadmaster_services | 20 ++- checks/kemp_loadmaster_services | 31 ++-- checks/windows_updates | 72 ++++++-- 6 files changed, 237 insertions(+), 140 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8a49c1765b…

10 years, 9 months

Check_MK Git: check_mk: FIX Fix CMC not executing any Check_MK checks after config reload

by Mathias Kettner

Module: check_mk Branch: master Commit: dcef25d470b347a793b98997cdf634f1e16b2cee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcef25d470b347… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 19 12:53:46 2013 +0100 FIX Fix CMC not executing any Check_MK checks after config reload CMC uses Check_MK in the <tt>--keepalive</tt> mode. That mode mixed up it's filedescriptors after a configuration reload. That resultet in the output of the checks not arriving at the CMC. The CMC waited and considered the helper as busy. All Check_MK based checks got stale. A restart fixed that. That problem is now solved. --- .werks/314 | 16 ++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 43 +++++++++++++++++++++++++++++++++---------- modules/check_mk_base.py | 1 + 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/.werks/314 b/.werks/314 new file mode 100644 index 0000000..c385528 --- /dev/null +++ b/.werks/314 @@ -0,0 +1,16 @@ +Title: Fix CMC not executing any Check_MK checks after config reload +Level: 2 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387453914 +Targetversion: future + +CMC uses Check_MK in the <tt>--keepalive</tt> mode. That mode mixed up +it's filedescriptors after a configuration reload. That resultet in the +output of the checks not arriving at the CMC. The CMC waited and considered +the helper as busy. All Check_MK based checks got stale. A restart fixed +that. + +That problem is now solved. diff --git a/ChangeLog b/ChangeLog index 2217bbe..ab48683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory * 0354 FIX: Catch exception when check plugins do not return a state... * 0398 FIX: Tolerate debug output in check plugins when using CMC... + * 0314 FIX: Fix CMC not executing any Check_MK checks after config reload... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk.py b/modules/check_mk.py index 1b723b5..97e4228 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5117,10 +5117,14 @@ def do_check_keepalive(): # 1. move the filedescriptor 1 to a parking position # 2. re-open 0 on /dev/null # 3. Send our answers to the Micro Core with the parked FD. - cmc_result_fd = os.dup(1) - devnull = os.open("/tmp/dev_null", os.O_WRONLY | os.O_CREAT) - os.dup2(devnull, 1) - os.close(devnull) + # BEWARE: this must not happen after we have execve'd ourselves! + if opt_keepalive_fd: + keepalive_fd = opt_keepalive_fd + else: + keepalive_fd = os.dup(1) + devnull = os.open("/tmp/dev_null", os.O_WRONLY | os.O_CREAT) + os.dup2(devnull, 1) + os.close(devnull) global total_check_output total_check_output = "" @@ -5131,17 +5135,17 @@ def do_check_keepalive(): while True: cleanup_globals() - hostname = sys.stdin.readline() + hostname = keepalive_read_line() g_initial_times = os.times() if not hostname: break hostname = hostname.strip() if hostname == "*": - os.execvp("cmk", sys.argv) + os.execvp("cmk", sys.argv + [ "--keepalive-fd=%d" % keepalive_fd ]) elif not hostname: break - timeout = int(sys.stdin.readline()) + timeout = int(keepalive_read_line()) try: # catch non-timeout exceptions try: # catch timeouts signal.signal(signal.SIGALRM, check_timeout) @@ -5168,7 +5172,7 @@ def do_check_keepalive(): status = 3 total_check_output = "UNKNOWN - Check_MK timed out after %d seconds\n" % timeout - os.write(cmc_result_fd, "%03d\n%08d\n%s" % + os.write(keepalive_fd, "%03d\n%08d\n%s" % (status, len(total_check_output), total_check_output)) total_check_output = "" cleanup_globals() @@ -5188,10 +5192,27 @@ def do_check_keepalive(): if opt_debug: raise total_check_output = "UNKNOWN - %s\n" % e - os.write(cmc_result_fd, "%03d\n%08d\n%s" % + os.write(keepalive_fd, "%03d\n%08d\n%s" % (3, len(total_check_output), total_check_output)) +# Just one lines from stdin. But: make sure that +# nothing more is read - not even into some internal +# buffer of sys.stdin! We do this by reading every +# single byte. I know that this is not performant, +# but we just read hostnames - not much data. + +def keepalive_read_line(): + line = "" + while True: + byte = os.read(0, 1) + if byte == '\n': + return line + elif not byte: # EOF + return '' + else: + line += byte + # +----------------------------------------------------------------------+ # | ____ _ __ _ | @@ -5538,7 +5559,7 @@ if __name__ == "__main__": "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "localize", "donate", "snmpwalk", "snmptranslate", "usewalk", "scan-parents", "procs=", "automation=", "notify", - "snmpget=", "profile", "keepalive", "create-rrd", + "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "cleanup-autochecks", "checks=", @@ -5587,6 +5608,8 @@ if __name__ == "__main__": fake_dns = a elif o == '--keepalive': opt_keepalive = True + elif o == '--keepalive-fd': + opt_keepalive_fd = int(a) elif o == '--usewalk': opt_use_snmp_walk = True elif o == '--procs': diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bab5a00..7d82b7d 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -105,6 +105,7 @@ opt_cleanup_autochecks = False fake_dns = False opt_keepalive = False opt_cmc_relfilename = "config" +opt_keepalive_fd = None # register SIGINT handler for consistenct CTRL+C handling def interrupt_handler(signum, frame):

10 years, 9 months

Check_MK Git: check_mk: extended backup: icinga.log / archive now in snapshot.

by Andreas Boesl

Module: check_mk Branch: master Commit: 74b18063d02f21113a160b94c44029bc4b2d5d08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74b18063d02f21… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 19 12:06:11 2013 +0100 extended backup: icinga.log / archive now in snapshot. Moved event console current state to historic data --- web/plugins/wato/backup_domains.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index 83ecaf4..771e60e 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -95,6 +95,8 @@ else: "paths" : [ ("dir", "var/nagios/archive"), ("file", "var/nagios/nagios.log"), + ("dir", "var/icinga/archive"), + ("file", "var/icinga/icinga.log"), ("dir", "var/check_mk/core/archive"), ("file", "var/check_mk/core/history"), ], @@ -121,20 +123,20 @@ else: }, "mkeventstatus": { "group" : _("Configuration"), - "title" : _("Event Console Configuration and Current State"), + "title" : _("Event Console Configuration"), "prefix" : defaults.omd_root, "paths" : [ ("dir", "etc/check_mk/mkeventd.d"), - ("file", "var/mkeventd/status"), ], "default" : True }, "mkeventhistory": { "group" : _("Historic Data"), - "title" : _("Event Console Archive"), + "title" : _("Event Console Archive and Current State"), "prefix" : defaults.omd_root, "paths" : [ ("dir", "var/mkeventd/history"), + ("file", "var/mkeventd/status"), ], }, "dokuwiki": {

10 years, 9 months

Check_MK Git: check_mk: hitachi_hnas_psu, hitachi_hnas_psu: New checks for Hitachi HNAS storage systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b5ab496725ee11e524c5775349b711d44fbe6c1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5ab496725ee11… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Dec 19 11:19:11 2013 +0100 hitachi_hnas_psu, hitachi_hnas_psu: New checks for Hitachi HNAS storage systems --- .werks/319 | 8 ++++ ChangeLog | 1 + checkman/hitachi_hnas_psu | 18 ++++++++ checkman/hitachi_hnas_temp | 21 +++++++++ checks/hitachi_hnas_psu | 59 ++++++++++++++++++++++++ checks/hitachi_hnas_temp | 63 ++++++++++++++++++++++++++ pnp-templates/check_mk-hitachi_hnas_temp.php | 38 ++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + 8 files changed, 209 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b5ab496725…

10 years, 9 months

Check_MK Git: check_mk: kemp_loadmaster_ha: check now also supports Kemp LM-3600

by Götz Golla

Module: check_mk Branch: master Commit: 09eb516611fd2c13d974596d8d8e1c5072c59c7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09eb516611fd2c… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Dec 19 10:56:46 2013 +0100 kemp_loadmaster_ha: check now also supports Kemp LM-3600 --- checkman/kemp_loadmaster_ha | 5 +++-- checks/kemp_loadmaster_ha | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checkman/kemp_loadmaster_ha b/checkman/kemp_loadmaster_ha index 7c8436c..657c6b3 100644 --- a/checkman/kemp_loadmaster_ha +++ b/checkman/kemp_loadmaster_ha @@ -4,5 +4,6 @@ catalog: app/kemp license: GPL distribution: check_mk description: - This Check only output the HA state and the current Firmware Version. - No Alarms are triggert. + This Check monitors the HA state and the current Firmware Version. + It is known to run on Kemp Loadmaster LM-2600 and LM-3600. + No Alarms are triggerd. diff --git a/checks/kemp_loadmaster_ha b/checks/kemp_loadmaster_ha index d75af54..526bd4e 100644 --- a/checks/kemp_loadmaster_ha +++ b/checks/kemp_loadmaster_ha @@ -40,7 +40,7 @@ check_info["kemp_loadmaster_ha"] = { "inventory_function" : inventory_kemp_loadmaster_ha, "service_description" : "HA State", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.12196.250.10", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.12196.250.10" or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.2021.250.10", "snmp_info" : ( ".1.3.6.1.4.1.12196.13.0", [ 9, 10 ] ), }

10 years, 9 months

Check_MK Git: check_mk: hitachi_hnas_fan: New check for fans in Hitachi HNAS systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: cafc9e9c864a4b0116ee5d621d38433e5632af12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cafc9e9c864a4b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Dec 18 16:39:59 2013 +0100 hitachi_hnas_fan: New check for fans in Hitachi HNAS systems --- .werks/318 | 8 +++ ChangeLog | 1 + checkman/hitachi_hnas_fan | 25 +++++++ checks/hitachi_hnas_fan | 101 +++++++++++++++++++++++++++ pnp-templates/check_mk-hitachi_hnas_fan.php | 34 +++++++++ web/plugins/perfometer/check_mk.py | 6 ++ 6 files changed, 175 insertions(+) diff --git a/.werks/318 b/.werks/318 new file mode 100644 index 0000000..e138891 --- /dev/null +++ b/.werks/318 @@ -0,0 +1,8 @@ +Title: hitachi_hnas_fan: New check for fans in Hitachi HNAS systems +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1387381163 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 567a1aa..9860334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 0395 cmctc.temp: also detect older CMC devices * 0396 cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well... * 0111 kemp_loadmaster_ha, kemp_loadmaster_realserver, kemp_loadmaster_services: New Checks for Kemp Loadbalancer + * 0318 hitachi_hnas_fan: New check for fans in Hitachi HNAS systems * 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/hitachi_hnas_fan b/checkman/hitachi_hnas_fan new file mode 100644 index 0000000..3434c5e --- /dev/null +++ b/checkman/hitachi_hnas_fan @@ -0,0 +1,25 @@ +title: Hitachi HNAS: Status and Speed of Fans +agents: snmp +catalog: hw/network/brocade +license: GPL +distribution: check_mk +description: + Checks the fitted status and speed status of a fan in an Hitachi HNAS storage + system. Displays speed of the fan. + + Returns {OK} if the fitted status is reported to be ok, {WARN} on status + okIdWrong, {CRIT} on status notFitted and {UNKN} on every other. + + Returns {OK} if the speed status is reported to be ok, {WARN} on status + warning, {CRIT} on status severe and {UNKN} on every other. + + The worst of both is the status returned by this Check. + +item: + The ID of the PNode plus the ID of the Fan, separated by a dot. E. g. 1.2 + +perfdata: + One value: The speed of the fan (rpm). + +inventory: + Finds one item per fan diff --git a/checks/hitachi_hnas_fan b/checks/hitachi_hnas_fan new file mode 100644 index 0000000..dfe785d --- /dev/null +++ b/checks/hitachi_hnas_fan @@ -0,0 +1,101 @@ +#!/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_hitachi_hnas_fan(info): + inventory = [] + for clusternode, id, fitted_status, speed_status, speed in info: + inventory.append( (clusternode + "." + id, None) ) + return inventory + +def check_hitachi_hnas_fan(item, _no_params, info): + rc = 0 + + fan_fitted_status_map = ( ("", 3), # 0 + ("ok", 0), # 1 + ("okIdWrong", 1), # 2 + ("notFitted", 2), # 3 + ("unknown", 3), # 4 + ) + + fan_speed_status_map = ( ("", 3), # 0 + ("ok", 0), # 1 + ("warning", 1), # 2 + ("severe", 2), # 3 + ("unknown", 3), # 4 + ) + errorstring = ( "", " (!)", " (!!)", "") + + for clusternode, id, fitted_status, speed_status, speed in info: + if clusternode + "." + id == item: + fitted_status=int(fitted_status) + speed_status=int(speed_status) + speed=int(speed) + message = "PNode %s Fan %s" % (clusternode, id) + + # check fitted status + if fitted_status == 0 or fitted_status >= len(fan_fitted_status_map): + message += " fitted status unidentified %s" % fitted_status + rc = 3 + else: + message += " fitted status is %s%s" % ( fan_fitted_status_map[fitted_status][0], errorstring[fan_fitted_status_map[fitted_status][1]] ) + rc = fan_fitted_status_map[fitted_status][1] + + # check speed status + if speed_status == 0 or speed_status >= len(fan_speed_status_map): + message += ", speed status unidentified %s" % speed_status + if rc == 0: + rc = 3 + # if rc is already warning or critical, keep it + else: + message += ", speed status is %s%s" % ( fan_speed_status_map[speed_status][0], errorstring[fan_speed_status_map[speed_status][1]] ) + if fan_speed_status_map[speed_status][1] == 1: + if rc == 2: + rc = 2 + else: + rc = 1 + elif fan_speed_status_map[speed_status][1] == 2: + rc = 2 + elif fan_speed_status_map[speed_status][1] == 3: + if rc == 0: + rc = 3 + + # report speed + message += ", speed is %s rpm" % speed + perfdata = [ ('fanspeed', str(speed) + 'rpm', '', '', 0, '') ] + + return rc, message, perfdata + + return 3, "No fan %s found" % item + +check_info["hitachi_hnas_fan"] = { + "check_function" : check_hitachi_hnas_fan, + "inventory_function" : inventory_hitachi_hnas_fan, + "service_description" : "Fan %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.2.1.11.1", [1, 2, 3, 4, 5]), + # fanClusterNode, fanIndex, fanFittedStatus, fanSpeedStatus, fanSpeed + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), +} diff --git a/pnp-templates/check_mk-hitachi_hnas_fan.php b/pnp-templates/check_mk-hitachi_hnas_fan.php new file mode 100644 index 0000000..6feda78 --- /dev/null +++ b/pnp-templates/check_mk-hitachi_hnas_fan.php @@ -0,0 +1,34 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +$opt[1] = "--vertical-label \"rpm\" --title \"$hostname / $servicedesc\" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#2080ff:\"Speed\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%2.0lf rpm\" "; +$def[1] .= "LINE1:var1#000080:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lf rpm,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lf rpm)\" "; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index dca0387..baa43c4 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -760,3 +760,9 @@ def perfometer_fanspeed(row, check_command, perf_data): return "%.2f%%" % value, perfometer_linear(value, "silver") perfometers["check_mk-apc_inrow_fanspeed"] = perfometer_fanspeed + +def perfometer_fanspeed_logarithmic(row, check_command, perf_data): + value = float(perf_data[0][1]) + return "%d rpm" % value, perfometer_logarithmic(value, 5000, 2, "silver") + +perfometers["check_mk-hitachi_hnas_fan"] = perfometer_fanspeed_logarithmic

10 years, 9 months

Check_MK Git: check_mk: check-spaces / healspaces now handles windows newlins correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ca0536afe587cc71b113d7beaa489aca7b1dad1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ca0536afe587c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 18 16:25:58 2013 +0100 check-spaces / healspaces now handles windows newlins correctly --- Makefile | 4 +- checks/moxa_iologik_register | 144 +++++++++++++++++++++--------------------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Makefile b/Makefile index 7a810ae..4ac633a 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ check-spaces: @if grep -q '[[:space:]]$$' $(SOURCE_FILES) ; then echo $$? ; figlet "Space error" \ ; echo "Aborting due to trailing spaces. Please use 'make healspaces' to repair." \ ; echo "Affected files: " \ - ; grep -l '[ ]$$' $(SOURCE_FILES) \ + ; grep -l '[[:space:]]$$' $(SOURCE_FILES) \ ; exit 1 ; fi @echo OK @@ -234,7 +234,7 @@ SOURCE_FILES = checkman/* modules/* checks/* notifications/* $$(find -name Makef healspaces: @echo "Removing trailing spaces from code lines..." - @sed -ri 's/[ ]+$$//g' $(SOURCE_FILES) + @sed -ri 's/[[:space:]]+$$//g' $(SOURCE_FILES) setup: diff --git a/checks/moxa_iologik_register b/checks/moxa_iologik_register index 067cd30..7fa4d35 100644 --- a/checks/moxa_iologik_register +++ b/checks/moxa_iologik_register @@ -1,72 +1,72 @@ -#!/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. - -# "0=Off, 1=On in DI/DO mode or N=Count in DO counter mode" - -def inventory_iologik_register(info): - inventory = [] - for line in info: - if line[2]: - inventory.append((line[0], None )) - return inventory - - -def check_iologik_register(item, params, info): - for line in info: - if line[0] == item: - if int(line[2]) in range(0, 2): - return (int(line[2]), line[1]) - else: - return (3, "Invalid value %s for register" % line[2]) - - return (3, "Register not found") - - -check_info['moxa_iologik_register'] = { - "check_function" : check_iologik_register, - "inventory_function" : inventory_iologik_register, - "service_description" : "Moxa Register", - "has_perfdata" : False, - "group" : "iologik_register", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), - "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1", - [ "1", # index - "2", # Name - "3", # Value - ]) -} - -# DIOEntry -# dioIndex Integer32 (0..11) "The channel dio index." -# dioType Integer32 (0..1) "The channel dio type. 0=DI, DO=1, AI=2" -# dioMode Integer32 (0..1) "The channel dio mode. 0=DI, 1=Event Counter" -# dioStatus Unsigned32 (0..4294967295) "The channel dio(di/do) status. 0=Off, 1=On in DI/DO mode or N=Count in DO counter mode -# dioFilter Integer32 (1..65535) "The channel dio(di) counter filter. unit=0.5ms" -# dioTrigger Integer32 (0..1) "The channel dio(di) counter trigger level. 0=L2H, 1=H2L" -# dioCntStart Integer32 (0..1) "The channel dio(do) counter start/stop. 0=stop, 1=start" -# dioPulseStart Integer32 (0..1) "The channel dio(do) pulse start/stop. 0=stop, 1=start" -# dioPulseONWidth Unsigned32 (1..4294967295) "The channel dio(do) signal ON width. unit=0.5ms" -# dioPulseOFFWidth Unsigned32 (1..4294967295) "The channel dio(do) signal OFF width. unit=0.5ms" +#!/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. + +# "0=Off, 1=On in DI/DO mode or N=Count in DO counter mode" + +def inventory_iologik_register(info): + inventory = [] + for line in info: + if line[2]: + inventory.append((line[0], None )) + return inventory + + +def check_iologik_register(item, params, info): + for line in info: + if line[0] == item: + if int(line[2]) in range(0, 2): + return (int(line[2]), line[1]) + else: + return (3, "Invalid value %s for register" % line[2]) + + return (3, "Register not found") + + +check_info['moxa_iologik_register'] = { + "check_function" : check_iologik_register, + "inventory_function" : inventory_iologik_register, + "service_description" : "Moxa Register", + "has_perfdata" : False, + "group" : "iologik_register", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), + "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1", + [ "1", # index + "2", # Name + "3", # Value + ]) +} + +# DIOEntry +# dioIndex Integer32 (0..11) "The channel dio index." +# dioType Integer32 (0..1) "The channel dio type. 0=DI, DO=1, AI=2" +# dioMode Integer32 (0..1) "The channel dio mode. 0=DI, 1=Event Counter" +# dioStatus Unsigned32 (0..4294967295) "The channel dio(di/do) status. 0=Off, 1=On in DI/DO mode or N=Count in DO counter mode +# dioFilter Integer32 (1..65535) "The channel dio(di) counter filter. unit=0.5ms" +# dioTrigger Integer32 (0..1) "The channel dio(di) counter trigger level. 0=L2H, 1=H2L" +# dioCntStart Integer32 (0..1) "The channel dio(do) counter start/stop. 0=stop, 1=start" +# dioPulseStart Integer32 (0..1) "The channel dio(do) pulse start/stop. 0=stop, 1=start" +# dioPulseONWidth Unsigned32 (1..4294967295) "The channel dio(do) signal ON width. unit=0.5ms" +# dioPulseOFFWidth Unsigned32 (1..4294967295) "The channel dio(do) signal OFF width. unit=0.5ms"

10 years, 9 months

Check_MK Git: check_mk: check_ftp: use IP address instead of host name

by Mathias Kettner

Module: check_mk Branch: master Commit: 89ef1c2b33f69cce6145a22f198370ea1d799d84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89ef1c2b33f69c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 15:22:40 2013 +0100 check_ftp: use IP address instead of host name --- checks/check_ftp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/check_ftp b/checks/check_ftp index 99cb288..9d6f72c 100644 --- a/checks/check_ftp +++ b/checks/check_ftp @@ -28,7 +28,7 @@ def check_ftp_arguments(params): if type(params) == tuple: host, settings = params else: - host = "$HOSTNAME$" + host = "$HOSTADDRESS$" settings = params args = ' -H %s' % quote_shell_string(host)

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits