Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: emc_storage.sp_status not needed any longer, integrated in emcvnx_hwstatus now

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 6f6dddeac2219373527663b2986bfd47b0f48508 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f6dddeac22193… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 2 10:30:30 2013 +0200 emc_storage.sp_status not needed any longer, integrated in emcvnx_hwstatus now --- checkman/emc_storage.sp_status | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/checkman/emc_storage.sp_status b/checkman/emc_storage.sp_status deleted file mode 100644 index eeee52b..0000000 --- a/checkman/emc_storage.sp_status +++ /dev/null @@ -1,26 +0,0 @@ -title: EMC Storage: Status of StorageProcessors (sp) -agents: emc -catalog: hw/storage -license: GPL -distribution: check_mk -description: - Reports the status of StorageProcessors (sp) on EMC storage systems. - - Returns {OK} if the agent reports "Present" status and {CRIT} on every other - status. - - Hint for implementation: Look for "SP * State:" line in section - "Array Information", Present -> OK, everything else -> CRIT - -item: - The name of the storage processor as returned by the special agent. - E. g. "A" - - Hint for implementation: see at description - -perfdata: - None - -inventory: - Automatically configures one check for every storage processor listed - in the agent output.

10 years, 5 months

Check_MK Git: check_mk: beautifying and optimizing code

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: d101585b5ef00921ae1fd72b1c810a53650a8b38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d101585b5ef009… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Aug 8 10:29:39 2013 +0200 beautifying and optimizing code --- agents/special/agent_emcvnx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index a18c2ce..6354192 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -83,16 +83,16 @@ except getopt.GetoptError, err: sys.stderr.write("%s\n" % err) sys.exit(1) -opt_debug = False -opt_timeout = 60 +opt_debug = False +opt_timeout = 60 -g_profile = None -g_profile_path = "emcvnx_profile.out" +g_profile = None +g_profile_path = "emcvnx_profile.out" -host_address = None -user = None -password = None -mortypes = [ 'all' ] +host_address = None +user = None +password = None +mortypes = [ 'all' ] naviseccli_options = { "disks" : {"cmd_option" : "-disk", "active" : False}, @@ -143,8 +143,6 @@ for module in naviseccli_options.keys(): except ValueError: pass - #print naviseccli_options[module] - ############################################################################# # fetch information by calling naviseccli

10 years, 5 months

Check_MK Git: check_mk: agent_emcvnx: fixed error in naviseccli command line

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: bf6d91fdcda2e91f69ff84abaf9b582302a0b6c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6d91fdcda2e9… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jan 9 10:17:28 2014 +0100 agent_emcvnx: fixed error in naviseccli command line --- agents/special/agent_emcvnx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 6354192..b401499 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -148,7 +148,7 @@ for module in naviseccli_options.keys(): # fetch information by calling naviseccli ############################################################################# -basecmd="naviseccli -h %s -User %s -Password %s -Scope0 getall " % (host_address, user, password) +basecmd="naviseccli -h %s -User %s -Password %s -Scope 0 getall " % (host_address, user, password) # # check_mk section of agent output

10 years, 5 months

Check_MK Git: check_mk: new check emcvnx_hba added ( including manpage and pnp-template)

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 530eee4d9d55d56067de49bb021e6e0006462352 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=530eee4d9d55d5… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 2 12:10:30 2013 +0200 new check emcvnx_hba added (including manpage and pnp-template) --- checkman/{emc_storage.hba => emcvnx_hba} | 8 -- checks/emcvnx_hba | 133 ++++++++++++++++++++++++++++++ pnp-templates/check_mk-emcvnx_disks.php | 1 + pnp-templates/check_mk-emcvnx_hba.php | 60 ++++++++++++++ 4 files changed, 194 insertions(+), 8 deletions(-) diff --git a/checkman/emc_storage.hba b/checkman/emcvnx_hba similarity index 58% rename from checkman/emc_storage.hba rename to checkman/emcvnx_hba index 58bd975..c90339b 100644 --- a/checkman/emc_storage.hba +++ b/checkman/emcvnx_hba @@ -9,18 +9,10 @@ description: The values for Blocks Read/sec and Blocks Written/sec are just informational. The check always returns {OK} - Hint for implementation: Look for "Blocks Read:" and "Blocks Written:" - lines in section "SP Name: <my Name>" and "SP Port ID: <my ID>" lines found under - "Information about each SPPORT:". Remember values of last check and devide by the - time since last check. - item: Consists of the SP Name and the SP Port ID as returned by the agent. E. g. "SP A Port 0" - Hint for implementation: Look for "SP Name:" and "SP Port ID:" lines in section - "Information about each SPPORT:" - perfdata: Two values: Blocks Read/sec and Blocks Written/sec diff --git a/checks/emcvnx_hba b/checks/emcvnx_hba new file mode 100644 index 0000000..a0df51c --- /dev/null +++ b/checks/emcvnx_hba @@ -0,0 +1,133 @@ +#!/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. + +# Example output from agent: +#<<<emcvnx_hba>>> +#Information about each SPPORT: +# +#SP Name: SP A +#SP Port ID: 0 +#SP UID: 50:06:01:60:BE:A0:5D:E5:50:06:01:60:3E:A0:5D:E5 +#Link Status: Up +#Port Status: Online +#Switch Present: YES +#Switch UID: 10:00:00:27:F8:28:52:5B:20:02:00:27:F8:28:52:5B +#SP Source ID: 66048 +#ALPA Value: 0 +#Speed Value : 8Gbps +#Auto Negotiable : NO +#Available Speeds: +#2Gbps +#4Gbps +#8Gbps +#Auto +#Requested Value: Auto +#MAC Address: Not Applicable +#SFP State: Online +#Reads: 426729 +#Writes: 8683578 +#Blocks Read: 4917783 +#Blocks Written: 12008476 +#Queue Full/Busy: 0 +#I/O Module Slot: Onboard +#Physical Port ID: 2 +#Usage: Mirrorview +#SFP/Connector EMC Part Number: 019-078-042 +#SFP/Connector EMC Serial Number: 00000000000 +#SFP/Connector Vendor Part Number: AFBR-57D7APZ-E2 +#SFP/Connector Vendor Serial Number: AGL1213A3188822 +#SFP/Connector Supported Speeds: +#2Gbps +#4Gbps +#8Gbps +# +#SP Name: SP A +#SP Port ID: 1 +#SP UID: 50:06:01:60:BE:A0:5D:E5:50:06:01:61:3E:A0:5D:E5 +#Link Status: Up +#Port Status: Online +#Switch Present: YES +#[...] + +# Parse agent output into a dict of the form: +# parsed = { +# {'SP A Port 0': {'Blocks Read': 4917783, 'Blocks Written': 12008476}, +# 'SP A Port 1': {'Blocks Read': 363283639, 'Blocks Written': 218463965}, +# 'SP A Port 2': {'Blocks Read': 2, 'Blocks Written': 0}, +# 'SP B Port 0': {'Blocks Read': 0, 'Blocks Written': 4348086}, +# } + +def parse_emcvnx_hba(info): + parsed = {} + for line in info: + if len(line) > 2 and line[0] == "SP" and line[1] == "Name:": + hba_id = " ".join(line[2:]) + elif len(line) > 2 and line[0] == "SP" and line[1] == "Port" and line[2] == "ID:": + hba_id += " Port " + line[-1] + hba = {} + parsed[hba_id] = hba + elif len(line) > 2 and line[0] == "Blocks" and line[1] in ("Read:", "Written:"): + hba["Blocks " + line[1].replace(":", "")] = saveint(line[-1]) + return parsed + + +def inventory_emcvnx_hba(info): + parsed = parse_emcvnx_hba(info) + import pprint; pprint.pprint(parsed) + inventory = [] + for hba in parsed: + inventory.append( (hba, None) ) + return inventory + + +def check_emcvnx_hba(item, _no_params, info): + now = time.time() + perfdata = [] + try: + read_blocks = parse_emcvnx_hba(info)[item]["Blocks Read"] + write_blocks = parse_emcvnx_hba(info)[item]["Blocks Written"] + countername_r = "emcvnx_hba.read_blocks.%s" % item.replace(" ", "_") + countername_w = "emcvnx_hba.write_blocks.%s" % item.replace(" ", "_") + timedif, read_blocks_per_sec = get_counter(countername_r, now, read_blocks) + timedif, write_blocks_per_sec = get_counter(countername_w, now, write_blocks) + read_blocks_per_sec = saveint(read_blocks_per_sec) + write_blocks_per_sec = saveint(write_blocks_per_sec) + perfdata.append(("read_blocks", read_blocks_per_sec)) + perfdata.append(("write_blocks", write_blocks_per_sec)) + #print "read blocks: %s, %s/sec" % (read_blocks, read_blocks_per_sec) + #print "write blocks: %s, %s/sec" % (write_blocks, write_blocks_per_sec) + + return 0, "Read: %s Blocks/s, Write: %s Blocks/s" % (read_blocks_per_sec, write_blocks_per_sec), perfdata + + except KeyError: + return 3, "HBA %s not found in agent output" % item + + +check_info['emcvnx_hba'] = { + "inventory_function" : inventory_emcvnx_hba, + "check_function" : check_emcvnx_hba, + "service_description" : "HBA %s", + 'has_perfdata' : True, +} diff --git a/pnp-templates/check_mk-emcvnx_disks.php b/pnp-templates/check_mk-emcvnx_disks.php new file mode 120000 index 0000000..8b45325 --- /dev/null +++ b/pnp-templates/check_mk-emcvnx_disks.php @@ -0,0 +1 @@ +check_mk-diskstat.php \ No newline at end of file diff --git a/pnp-templates/check_mk-emcvnx_hba.php b/pnp-templates/check_mk-emcvnx_hba.php new file mode 100644 index 0000000..9823030 --- /dev/null +++ b/pnp-templates/check_mk-emcvnx_hba.php @@ -0,0 +1,60 @@ +<?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. + +// Make data sources available via names +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} + +$servicedesc = str_replace("_", " ", $servicedesc); + +$opt[1] = "--vertical-label 'I/O (Blocks/s)' -X0 --title \"iSCSI traffic $hostname / $servicedesc\" "; + +$def[1] = + "HRULE:0#a0a0a0 ". +# read + "DEF:read_blocks=$RRD[read_blocks] ". + "AREA:read_blocks#40c080:\"Read \" ". + "GPRINT:read_blocks:LAST:\"%8.1lf Blocks/s last\" ". + "GPRINT:read_blocks:AVERAGE:\"%6.1lf Blocks/s avg\" ". + "GPRINT:read_blocks:MAX:\"%6.1lf Blocks/s max\\n\" "; + +# write +$def[1] .= + "DEF:write_blocks=$RRD[write_blocks] ". + "CDEF:write_blocks_neg=write_blocks,-1,* ". + "AREA:write_blocks_neg#4080c0:\"Write \" ". + "GPRINT:write_blocks:LAST:\"%6.1lf Blocks/s last\" ". + "GPRINT:write_blocks:AVERAGE:\"%6.1lf Blocks/s avg\" ". + "GPRINT:write_blocks:MAX:\"%6.1lf Blocks/s max\\n\" ". + ""; + +?> +

10 years, 5 months

Check_MK Git: check_mk: beautifying and optimizing code as agreed with Lars

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 94a1d4f8466f4329fbbbffd5b61592ce127b8e1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94a1d4f8466f43… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Aug 8 10:05:57 2013 +0200 beautifying and optimizing code as agreed with Lars --- checks/emcvnx_disks | 92 +++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/checks/emcvnx_disks b/checks/emcvnx_disks index c6a52f5..456a737 100644 --- a/checks/emcvnx_disks +++ b/checks/emcvnx_disks @@ -123,69 +123,69 @@ def parse_emcvnx_disks(info): elif len(line) > 2 and line[0] == "Hard" and line[2] == "Errors:": error_count = saveint(line[-1]) enc[line[0] + " " + line[1] + " Errors"] = error_count - elif len(line) > 1 and line[0] == "Kbytes" and line[1] in ("Read:", "Written:"): + elif len(line) > 1 and line[0] == "Kbytes" and line[1] in ["Read:", "Written:"]: io_kbytes = saveint(line[-1]) enc[line[0] + " " + line[1].replace(':', '')] = io_kbytes return parsed def inventory_emcvnx_disks(info): - parsed = parse_emcvnx_disks(info) - inventory = [] - for disk in parsed: - inventory.append( (disk, None) ) - return inventory + return [ (disk, None) for disk in parse_emcvnx_disks(info).keys() ] def check_emcvnx_disks(item, _no_params, info): - diskstate_errorstring="" - write_errors_errorstring="" - read_errors_errorstring="" now = time.time() perfdata = [] - try: - diskstate = parse_emcvnx_disks(info)[item]["state"] - if diskstate in ("Unbound", "Hot Spare Ready", "Enabled", "Ready"): - nagstate = 0 - elif diskstate in ("Rebuilding"): - nagstate = 1 - diskstate_errorstring="(!)" - else: - nagstate = 2 - diskstate_errorstring="(!!)" + parsed = parse_emcvnx_disks(info) + if item not in parsed: + return 3, "Enclosure %s not found in agent output" % item + diskstate = parsed[item]["state"] + message = "Enclosure %s is %s" % (item, diskstate) + if diskstate in ["Unbound", "Hot Spare Ready", "Enabled", "Ready"]: + nagstate = 0 + elif diskstate == "Rebuilding": + nagstate = 1 + message += " (!)" + else: + nagstate = 2 + message += " (!!)" # on error state all other fields besides "State:" are missing, omitting... - if nagstate in (0, 1): - read_errors = parse_emcvnx_disks(info)[item]["Hard Read Errors"] - if read_errors > 0: - nagstate = 2 - read_errors_errorstring="(!!)" - - write_errors = parse_emcvnx_disks(info)[item]["Hard Write Errors"] - if write_errors > 0: - nagstate = 2 - write_errors_errorstring="(!!)" - - read_bytes = parse_emcvnx_disks(info)[item]["Kbytes Read"] * 1024 - write_bytes = parse_emcvnx_disks(info)[item]["Kbytes Written"] * 1024 - countername_r = "emcvnx_disks.read_bytes.%s" % item.replace(" ", "_") - countername_w = "emcvnx_disks.write_bytes.%s" % item.replace(" ", "_") - timedif, read_bytes_per_sec = get_counter(countername_r, now, read_bytes) - timedif, write_bytes_per_sec = get_counter(countername_w, now, write_bytes) - perfdata.append(("read", read_bytes_per_sec)) - perfdata.append(("write", write_bytes_per_sec)) - - return nagstate, "Enclosure %s is %s%s, Hard Read Errors: %s%s, Hard Write Errors: %s%s, Read: %s/s, Write: %s/s" % (item, diskstate, diskstate_errorstring, read_errors, read_errors_errorstring, write_errors, write_errors_errorstring, get_bytes_human_readable(read_bytes_per_sec), get_bytes_human_readable(write_bytes_per_sec)), perfdata - else: - return nagstate, "Enclosure %s is %s%s" % (item, diskstate, diskstate_errorstring) - - except KeyError: - return 3, "Enclosure %s not found in agent output" % item + return nagstate, message + + read_errors = parsed[item]["Hard Read Errors"] + message += ", Hard Read Errors: %s" % read_errors + if read_errors > 0: + nagstate = 2 + message += " (!!)" + + write_errors = parsed[item]["Hard Write Errors"] + message += ", Hard Write Errors: %s" % write_errors + if write_errors > 0: + nagstate = 2 + message += " (!!)" + + read_bytes = parsed[item]["Kbytes Read"] * 1024 + write_bytes = parsed[item]["Kbytes Written"] * 1024 + countername_r = "emcvnx_disks.read_bytes.%s" % item.replace(" ", "_") + countername_w = "emcvnx_disks.write_bytes.%s" % item.replace(" ", "_") + try: + timedif, read_bytes_per_sec = get_counter(countername_r, now, read_bytes) + message += ", Read: %s/s" % get_bytes_human_readable(read_bytes_per_sec) + perfdata.append(("read", read_bytes_per_sec)) + + timedif, write_bytes_per_sec = get_counter(countername_w, now, write_bytes) + message += ", Write: %s/s" % get_bytes_human_readable(write_bytes_per_sec) + perfdata.append(("write", write_bytes_per_sec)) + except MKCounterWrapped: + pass + + return nagstate, message, perfdata check_info['emcvnx_disks'] = { "inventory_function" : inventory_emcvnx_disks, "check_function" : check_emcvnx_disks, "service_description" : "Enclosure %s", - 'has_perfdata' : True, + "has_perfdata" : True, }

10 years, 5 months

Check_MK Git: check_mk: beautifying and optimizing code

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8f93d5d42494ed5dfacc30d20e124bc085c0b81e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f93d5d42494ed… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Aug 8 10:26:43 2013 +0200 beautifying and optimizing code --- checks/emcvnx_hba | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/checks/emcvnx_hba b/checks/emcvnx_hba index 8df30d2..e18327c 100644 --- a/checks/emcvnx_hba +++ b/checks/emcvnx_hba @@ -94,32 +94,31 @@ def parse_emcvnx_hba(info): def inventory_emcvnx_hba(info): - parsed = parse_emcvnx_hba(info) - inventory = [] - for hba in parsed: - inventory.append( (hba, None) ) - return inventory + return [ (hba, None) for hba in parse_emcvnx_hba(info).keys() ] def check_emcvnx_hba(item, _no_params, info): now = time.time() perfdata = [] + parsed = parse_emcvnx_hba(info) + if item not in parsed: + return 3, "HBA %s not found in agent output" % item + + read_blocks = parsed[item]["Blocks Read"] + write_blocks = parsed[item]["Blocks Written"] + countername_r = "emcvnx_hba.read_blocks.%s" % item.replace(" ", "_") + countername_w = "emcvnx_hba.write_blocks.%s" % item.replace(" ", "_") try: - read_blocks = parse_emcvnx_hba(info)[item]["Blocks Read"] - write_blocks = parse_emcvnx_hba(info)[item]["Blocks Written"] - countername_r = "emcvnx_hba.read_blocks.%s" % item.replace(" ", "_") - countername_w = "emcvnx_hba.write_blocks.%s" % item.replace(" ", "_") timedif, read_blocks_per_sec = get_counter(countername_r, now, read_blocks) timedif, write_blocks_per_sec = get_counter(countername_w, now, write_blocks) - read_blocks_per_sec = saveint(read_blocks_per_sec) - write_blocks_per_sec = saveint(write_blocks_per_sec) + read_blocks_per_sec = saveint(read_blocks_per_sec) + write_blocks_per_sec = saveint(write_blocks_per_sec) perfdata.append(("read_blocks", read_blocks_per_sec)) perfdata.append(("write_blocks", write_blocks_per_sec)) return 0, "Read: %s Blocks/s, Write: %s Blocks/s" % (read_blocks_per_sec, write_blocks_per_sec), perfdata - - except KeyError: - return 3, "HBA %s not found in agent output" % item + except MKCounterWrapped: + return 0, "Counter wrapped. Next check contains data again.", perfdata check_info['emcvnx_hba'] = {

10 years, 5 months

Check_MK Git: check_mk: FIX cups_queues: fix exception in case of alternative time format

by Mathias Kettner

Module: check_mk Branch: master Commit: d91c852cdcbf0b91e19ec6b1daeeb162142a3dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d91c852cdcbf0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 9 12:35:04 2014 +0100 FIX cups_queues: fix exception in case of alternative time format In some cases the time format output by CUPS was not correctly parsed by the check. An example is <tt>Thu 29 Aug 2013 06:25:55 AM CEST</tt>. This has now been fixed. --- .werks/404 | 12 ++++++++++++ ChangeLog | 1 + checks/cups_queues | 20 +++++++++++++------- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/404 b/.werks/404 new file mode 100644 index 0000000..6691b60 --- /dev/null +++ b/.werks/404 @@ -0,0 +1,12 @@ +Title: cups_queues: fix exception in case of alternative time format +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389267220 +Targetversion: future + +In some cases the time format output by CUPS was not correctly +parsed by the check. An example is <tt>Thu 29 Aug 2013 06:25:55 AM CEST</tt>. +This has now been fixed. diff --git a/ChangeLog b/ChangeLog index 210825a..8b8df37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * 0322 FIX: timemachine: Check now also works if there are spaces in the name of the backup volume or the hostname * 0253 FIX: windows agent: fixed crash on processing eventlog records... * 0403 FIX: mem.used: Prefer statgrab on FreeBSD for supporting more than 4GB... + * 0404 FIX: cups_queues: fix exception in case of alternative time format... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/cups_queues b/checks/cups_queues index fa1a092..80c493e 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -45,8 +45,6 @@ #lpr2-2 root 1024 Tue Jun 29 09:02:35 2010 #lpr2-3 root 1024 Tue Jun 29 09:05:54 2010 -import time, datetime - # Default thresholds # ("<Warning max entries>", "<Critical num entries>", "<Warning entry age in seconds>", "<Critical entry age>") cups_queues_default_levels = (5, 10, 360, 720) @@ -59,7 +57,7 @@ def check_cups_queues(item, params, info): state = 3 output = "Queue not found" numJobs = 0 - now = datetime.datetime.now() + now = time.time() oldest = now for num, line in enumerate(info): if line[0] == 'printer' and line[1] == item: @@ -82,17 +80,25 @@ def check_cups_queues(item, params, info): elif line[0].startswith(item+'-'): # This is a queue item count the number of items and check the max age numJobs += 1 - dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[:6]) + # Try to parse different time formats + timestring = ' '.join(line[3:]) + try: + # Tue Jun 29 09:05:54 2010 + parsed = time.strptime(timestring, '%a %b %d %H:%M:%S %Y') + except: + # Thu 29 Aug 2013 12:41:42 AM CEST + parsed = time.strptime(timestring, '%a %d %b %Y %H:%M:%S %p %Z') + dt = time.mktime(parsed) if dt < oldest: oldest = dt jobOutput = 'Jobs: %d' % numJobs if numJobs > 0: - if oldest < now - datetime.timedelta(seconds=critAge) or numJobs > critNum: + if oldest < now - critAge or numJobs > critNum: state = 2 - elif oldest < now - datetime.timedelta(seconds=warnAge) or numJobs > warnNum: + elif oldest < now - warnAge or numJobs > warnNum: state = 1 - jobOutput += ', Oldest job is from %s' % oldest + jobOutput += ', Oldest job is from %s' % time.strftime("%c", time.localtime(oldest)) return (state, output + " - " + jobOutput, [ ("jobs", numJobs, warnNum, critNum, 0) ])

10 years, 5 months

Check_MK Git: check_mk: fixed comment

by Andreas Boesl

Module: check_mk Branch: master Commit: 3c87464bd39810291a03c03decb6d6c615ffbb82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c87464bd39810… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 9 11:53:14 2014 +0100 fixed comment --- agents/windows/check_mk_agent.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index b555fdb..af42b99 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1207,7 +1207,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, else // Sometimes the eventlog record does not provide // enough strings for the message template. Causes crash... - // -> Fill the rest with 0 strings + // -> Fill the rest with empty strings strings[ns] = (WCHAR *)""; } strings[63] = 0; // end marker in array

10 years, 5 months

Check_MK Git: check_mk: FIX mem.used: Prefer statgrab on FreeBSD for supporting more than 4GB

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b37a9f143f3cc792934d5ea37eb989a4ecc3377 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b37a9f143f3cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 9 11:40:07 2014 +0100 FIX mem.used: Prefer statgrab on FreeBSD for supporting more than 4GB The <tt>check_mk_agent.freebsd<tt> now first tries to find <tt>statgrab</tt> and prefers that if found. --- .werks/403 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 18 ++++++++++-------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.werks/403 b/.werks/403 new file mode 100644 index 0000000..7d2d567 --- /dev/null +++ b/.werks/403 @@ -0,0 +1,11 @@ +Title: mem.used: Prefer statgrab on FreeBSD for supporting more than 4GB +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389263935 +Targetversion: future + +The <tt>check_mk_agent.freebsd<tt> now first tries to find <tt>statgrab</tt> and prefers +that if found. diff --git a/ChangeLog b/ChangeLog index bc1eb0e..210825a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 0443 FIX: brocade_fcport: cope with firmware that does not provide speed information... * 0322 FIX: timemachine: Check now also works if there are spaces in the name of the backup volume or the hostname * 0253 FIX: windows agent: fixed crash on processing eventlog records... + * 0403 FIX: mem.used: Prefer statgrab on FreeBSD for supporting more than 4GB... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index caa1823..b1627a0 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -129,14 +129,16 @@ echo '<<<ps>>>' COLUMNS=10000 ps ax -o user,vsz,rss,pcpu,command | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' -# Memory Usage -# currently we'll need sysutils/muse for this. -if [ -x /usr/local/bin/muse ] - then - echo '<<<mem>>>' -# yes, i don't know sed well. - muse -k 2>/dev/null | sed 's/Total/MemTotal/' | sed 's/Free/MemFree/' - swapinfo -k 1K | tail -n 1 | awk '{ print "SwapTotal: "$2" kB\nSwapFree: "$4" kB" }' +# Memory Usage. First we try statgrab, since +# muse does not seem to support >4GB +if [ -x /usr/local/bin/statgrab ] ; then + echo '<<<mem>>>' + statgrab -K mem.total mem.free swap.total swap.free | \ + awk '{gsub(/swap\./,"Swap");}{gsub(/mem\./,"Mem");}{gsub(/tot/,"Tot");}{gsub(/free/,"Free");} { print $1": "$3" kB"}' +elif [ -x /usr/local/bin/muse ] ; then + echo '<<<mem>>>' + muse -k 2>/dev/null | sed 's/Total/MemTotal/' | sed 's/Free/MemFree/' + swapinfo -k 1K | tail -n 1 | awk '{ print "SwapTotal: "$2" kB\nSwapFree: "$4" kB" }' fi

10 years, 5 months

Check_MK Git: check_mk: FIX windows agent: fixed crash on processing eventlog records

by Andreas Boesl

Module: check_mk Branch: master Commit: 4d72f1b76c89ace253cf683b23db635696f5337a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d72f1b76c89ac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 9 11:25:11 2014 +0100 FIX windows agent: fixed crash on processing eventlog records On some instances the check_mk_agent crashed when formatting eventlog messages. This was caused by message templates, which were specified in dll files, expecting more formatting arguments than the eventlog record provided. --- .werks/253 | 11 +++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 20 +++++++++++++------- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.werks/253 b/.werks/253 new file mode 100644 index 0000000..a647cc6 --- /dev/null +++ b/.werks/253 @@ -0,0 +1,11 @@ +Title: windows agent: fixed crash on processing eventlog records +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1389262775 +Class: fix + +On some instances the check_mk_agent crashed when formatting +eventlog messages. This was caused by message templates, which were +specified in dll files, expecting more formatting arguments than the +eventlog record provided. diff --git a/ChangeLog b/ChangeLog index b8c4f99..bc1eb0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 0442 FIX: dell_om_disks: Treat global host spare disks as OK, instead of WARN... * 0443 FIX: brocade_fcport: cope with firmware that does not provide speed information... * 0322 FIX: timemachine: Check now also works if there are spaces in the name of the backup volume or the hostname + * 0253 FIX: windows agent: fixed crash on processing eventlog records... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 34cafea..b555fdb 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1199,12 +1199,18 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, DWORD num_strings = event->NumStrings; WCHAR *s = (WCHAR *)(((char *)event) + event->StringOffset); unsigned ns; - for (ns = 0; ns < num_strings; ns++) { - if (ns >= 63) break; - strings[ns] = s; - s += wcslen(s) + 1; + for (ns = 0; ns < 63; ns++) { + if (ns < num_strings) { + strings[ns] = s; + s += wcslen(s) + 1; + } + else + // Sometimes the eventlog record does not provide + // enough strings for the message template. Causes crash... + // -> Fill the rest with 0 strings + strings[ns] = (WCHAR *)""; } - strings[ns] = 0; // end marker in array + strings[63] = 0; // end marker in array // Windows eventlog entries refer to texts stored in a DLL >:-P // We need to load this DLL. First we need to look up which @@ -2901,8 +2907,8 @@ void open_crash_log() // Threads are not allowed to access the crash_log g_connectionlog_file = CreateFile(TEXT(g_connection_log), - GENERIC_WRITE, // open for reading - 0, // do not share + GENERIC_WRITE, // open for writing + FILE_SHARE_READ, // do not share NULL, // no security CREATE_ALWAYS, // existing file only FILE_ATTRIBUTE_NORMAL, // normal file

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014