Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64689 discussions

Check_MK Git: check_mk: #1553 FIX Fix deleting (acknowleding)

by Mathias Kettner

of logfiles in logwatch Message-ID: <5476fde2.dUdf2fgwkjtZq+hn%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 48e7755bbc590757f49990632a604a9b18c3abda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48e7755bbc5907… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 11:33:01 2014 +0100 #1553 FIX Fix deleting (acknowleding) of logfiles in logwatch The button for deleting (i.e. acknowleding) logfile messages in the webpage for the logwatch check did not work. This was due to a missing transaction ID, which in turn was due to an internal code cleanup. This has been fixed now and logfiles can now again be deleted. --- .werks/1553 | 13 +++++++++++++ ChangeLog | 1 + 2 files changed, 14 insertions(+) diff --git a/.werks/1553 b/.werks/1553 new file mode 100644 index 0000000..0cb0165 --- /dev/null +++ b/.werks/1553 @@ -0,0 +1,13 @@ +Title: Fix deleting (acknowleding) of logfiles in logwatch +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1417084306 + +The button for deleting (i.e. acknowleding) logfile messages in the webpage +for the logwatch check did not work. This was due to a missing transaction ID, +which in turn was due to an internal code cleanup. This has been fixed now +and logfiles can now again be deleted. diff --git a/ChangeLog b/ChangeLog index 0938079..55c65c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... * 1533 FIX: Fixed sorting of hosts with same name in "services of host" view * 1534 FIX: Fixed filtering views in distributed setup lead to empty views... + * 1553 FIX: Fix deleting (acknowleding) of logfiles in logwatch... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog

9 years, 10 months

Check_MK Git: check_mk: Fix acknowledging of logfiles in logwatch

by Mathias Kettner

Module: check_mk Branch: master Commit: 3254ed18d37da57f2d480877185d6f1ac7e3594e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3254ed18d37da5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 11:29:05 2014 +0100 Fix acknowledging of logfiles in logwatch --- web/htdocs/logwatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index a9e2ee6..50e1f31 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -160,7 +160,7 @@ def ack_button(host = None, int_filename = None): else: label = _("Clear Logs") - html.context_button(label, html.makeuri([('_ack', '1')]), 'delete') + html.context_button(label, html.makeactionuri([('_ack', '1')]), 'delete') def show_file(host, filename):

9 years, 10 months

Check_MK Git: check_mk: akcp_sensor_temp: raised default levels a bit

by Mathias Kettner

Module: check_mk Branch: master Commit: 28760a060e96914f7fa1fcda4cbb41728179bdf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28760a060e9691… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 11:23:10 2014 +0100 akcp_sensor_temp: raised default levels a bit --- checks/akcp_sensor_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp index eddcc70..51c46b4 100644 --- a/checks/akcp_sensor_temp +++ b/checks/akcp_sensor_temp @@ -31,7 +31,7 @@ # +------------------------------------------------------------------+ -akcp_sensor_temp_defaultlevels = (28, 32) +akcp_sensor_temp_defaultlevels = (32, 35) def inventory_akcp_sensor_temp(info): return [ (x[0], "akcp_sensor_temp_defaultlevels" ) for x in info if x[3] == "1" ]

9 years, 10 months

Check_MK Git: check_mk: Fix yesterdays bug with You can only use one of OID_END, OID_STRING...

by Mathias Kettner

Module: check_mk Branch: master Commit: f0b1d9f943952eba47df0d6c5841f9dbe5db1176 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0b1d9f943952e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 11:21:13 2014 +0100 Fix yesterdays bug with You can only use one of OID_END, OID_STRING... --- modules/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/snmp.py b/modules/snmp.py index 6ba2e4b..4e72000 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -130,7 +130,7 @@ def get_snmp_table(hostname, ip, check_type, oid_info): # similar: we fill in the complete OID of the entry, either as # string or as binary UTF-8 encoded number string if column in [ OID_END, OID_STRING, OID_BIN, OID_END_BIN, OID_END_OCTET_STRING ]: - if index_column >= 0: + if index_column >= 0 and index_column != colno: raise MKGeneralException("Invalid SNMP OID specification in implementation of check. " "You can only use one of OID_END, OID_STRING, OID_BIN, OID_END_BIN and OID_END_OCTET_STRING.") index_column = colno

9 years, 10 months

Check_MK Git: check_mk: #1552 FIX mk_inventory.ps1: fix garbled or missing entries by removing bogus binary zeroes

by Mathias Kettner

Module: check_mk Branch: master Commit: 776d137dc51a6c5ccb74085387a8ac3c638bfab9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=776d137dc51a6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 27 11:12:08 2014 +0100 #1552 FIX mk_inventory.ps1: fix garbled or missing entries by removing bogus binary zeroes This fixes a problem in the HW/SW-Inventory plugin for Windows by removing some bogus binary zeroes in the output of WMI. Thanks to Christian Michaelski. --- .werks/1552 | 11 +++++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 9 ++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/1552 b/.werks/1552 new file mode 100644 index 0000000..78f127b --- /dev/null +++ b/.werks/1552 @@ -0,0 +1,11 @@ +Title: mk_inventory.ps1: fix garbled or missing entries by removing bogus binary zeroes +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.5i7 +Date: 1417083051 +Class: fix + +This fixes a problem in the HW/SW-Inventory plugin for Windows by removing some bogus +binary zeroes in the output of WMI. Thanks to Christian Michaelski. + diff --git a/ChangeLog b/ChangeLog index bc01d24..0938079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ * 1479 liveproxyd: new function for collecting remote inventory data... NOTE: Please refer to the migration notes! * 1547 FIX: win_cpuinfo: fix case where NumberOfCores is missing (Windows 2003)... + * 1552 FIX: mk_inventory.ps1: fix garbled or missing entries by removing bogus binary zeroes... inventory: * 1516 FIX: win_disks: fix exception in case of empty signature diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index c2f028d..ac650f9 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -78,8 +78,11 @@ Get-WmiObject Win32_Product -ComputerName $name | foreach-object { write-host -s write-host "<<<win_reg_uninstall:sep(124):persist($until)>>>" $paths = @("HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall") foreach ($path in $paths) { - Get-ChildItem $path -Recurse | foreach-object { $path2 = $path+"\"+$_.PSChildName; get-ItemProperty -path $path2 | - foreach-object { write-host -separator $separator $_.DisplayName, $_.Publisher, $_.InstallLocation, $_.PSChildName, $_.DisplayVersion, $_.EstimatedSize, $_.InstallDate }} + Get-ChildItem $path -Recurse | foreach-object { $path2 = $path+"\"+$_.PSChildName; get-ItemProperty -path $path2 | + + foreach-object { + $Publisher = $_.Publisher -replace "`0", "" + write-host -separator $separator $_.DisplayName, $Publisher , $_.InstallLocation, $_.PSChildName, $_.DisplayVersion, $_.EstimatedSize, $_.InstallDate }} } # Search exes @@ -89,7 +92,7 @@ foreach ($item in $paths) { if ((Test-Path $item -pathType container)) { - Get-ChildItem -Path $item -include *.exe -Recurse | foreach-object { write-host -separator $separator $_.Fullname, $_.LastWriteTime, $_.Length, $_.VersionInfo.FileDescription, $_.VersionInfo.ProductVersion, $_.VersionInfo.ProductName } + Get-ChildItem -Path $item -include *.exe -Recurse | foreach-object { write-host -separator $separator $_.Fullname, $_.LastWriteTime, $_.Length, $_.VersionInfo.FileDescription, $_.VersionInfo.ProduktVersion, $_.VersionInfo.ProduktName } } }

9 years, 10 months

Check_MK Git: check_mk: A little more helpful information on multitar extract

by Lars Michelsen

Module: check_mk Branch: master Commit: 42ede1aab95ae3c467e236193ef6b0abc9dc0e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42ede1aab95ae3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 16:09:35 2014 +0100 A little more helpful information on multitar extract --- web/htdocs/multitar.py | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index d42d143..7062420 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -262,28 +262,32 @@ def extract_domains(tar, domains): def extract(tar, components): for what, name, path in components: try: - subtarstream = tar.extractfile(name + ".tar") - except: - pass # may be missing, e.g. sites.tar is only present - # if some sites have been created. + try: + subtarstream = tar.extractfile(name + ".tar") + except: + pass # may be missing, e.g. sites.tar is only present + # if some sites have been created. - if what == "dir": - target_dir = path - else: - target_dir = os.path.dirname(path) - - # Remove old stuff - if os.path.exists(path): if what == "dir": - wipe_directory(path) + target_dir = path else: - os.remove(path) - elif what == "dir": - os.makedirs(path) + target_dir = os.path.dirname(path) - # Extract without use of temporary files - subtar = tarfile.open(fileobj = subtarstream) - subtar.extractall(target_dir) + # Remove old stuff + if os.path.exists(path): + if what == "dir": + wipe_directory(path) + else: + os.remove(path) + elif what == "dir": + os.makedirs(path) + + # Extract without use of temporary files + subtar = tarfile.open(fileobj = subtarstream) + subtar.extractall(target_dir) + except Exception, e: + import traceback + raise MKGeneralException('Failed to extract subtar %s: %s' % (name, traceback.format_exc())) # Try to cleanup everything starting from the root_path # except the specific exclude files

9 years, 10 months

Check_MK Git: check_mk: #1551 f5_bigip_vserver: add performance data for connections and connection rate

by Mathias Kettner

Module: check_mk Branch: master Commit: 1ce11c7702d2dd50260c350b846d396bf88df406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ce11c7702d2dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 15:32:48 2014 +0100 #1551 f5_bigip_vserver: add performance data for connections and connection rate --- .werks/1551 | 9 +++ ChangeLog | 1 + checkman/f5_bigip_vserver | 8 ++- checks/f5_bigip_vserver | 98 +++++++++++++++------------ pnp-templates/check_mk-f5_bigip_vserver.php | 41 +++++++++++ web/plugins/perfometer/check_mk.py | 6 ++ 6 files changed, 117 insertions(+), 46 deletions(-) diff --git a/.werks/1551 b/.werks/1551 new file mode 100644 index 0000000..9fd60f2 --- /dev/null +++ b/.werks/1551 @@ -0,0 +1,9 @@ +Title: f5_bigip_vserver: add performance data for connections and connection rate +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417012351 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 815d18e..bc01d24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 1509 if, if64: New option for make inventory based on port alias... * 1440 livedump: now able to add hosts icon_image on config generation... * 1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices + * 1551 f5_bigip_vserver: add performance data for connections and connection rate * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checkman/f5_bigip_vserver b/checkman/f5_bigip_vserver index 5e2b7e2..bd9f9d8 100644 --- a/checkman/f5_bigip_vserver +++ b/checkman/f5_bigip_vserver @@ -4,11 +4,17 @@ catalog: hw/network/f5 license: GPL distribution: check_mk description: - The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic + The check queries the MIB tables of F5 BIG-IP load balancers (local traffic managers) for the status of any virtual server defined on them. It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 devices. + Also the number of current client connections and the current connection + rate are being displayed: + +perfdata: + two values: the current number of connections and the current connection rate. + inventory: Any virtual server that is found online will be added during inventoryy and checked for it's status. Virtual servers in the various "Warning" diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index a2b1d24..a1ca258 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -25,55 +25,63 @@ # Boston, MA 02110-1301 USA. -# Example output -# Name of a Virt. Server: -# 1.3.6.1.4.1.3375.2.2.10.2.3.1.1.ascii_encoded_string. "VS_XX" -# Textual Status (only supported in F5 OS 9.3+ -# 1.3.6.1.4.1.3375.2.2.10.1.2.1.25.5.12.34.56.78.90 "The virtual server is available" -# Table with name and status -# 1.3.6.1.4.1.3375.2.2.10.13.2.1. 1 .5.12.34.56.78.90 "VS_XX" -# 1.3.6.1.4.1.3375.2.2.10.13.2.1. 2 .5.12.34.56.78.90 1 +def parse_f5_bigip_vserver(info): + vservers = {} + for name, status, tot_conns, cur_conns in info: + vservers[name] = { + "status" : int(status), + "tot_conns" : int(tot_conns), + "cur_conns" : int(cur_conns), + } + return vservers -def inventory_f5_bigip_vserver(checkname,info): - inventory = [] - for line in info: -# snmp info will return some empty lines here, filter them and -# only inventorize OK status. - if line[0] != "": - if int(line[1]) == 1: - inventory.append((line[0], None)) - return inventory +def inventory_f5_bigip_vserver(parsed): + for name, vserver in parsed.items(): + if vserver["status"] == 1: + yield name, None -def check_f5_bigip_vserver(item, _no_params, info): - for line in info: - if line[0] != "": - if line[0] == item: - status = int(line[1]) - if status == 0: - return (1, "Virtual Server is disabled") - elif status == 1: - return (0, "Virtual Server is up and available") - elif status == 2: - return (2, "Virtual Server is currently not available") - elif status == 3: - return (2, "Virtual Server is not available") - elif status == 4: - return (1, "Virtual Server status is unknown") - else: - return (3, "Unhandled status (%d)" % status) - return (3, "Virtual Server %s not found in SNMP output" % item) +def check_f5_bigip_vserver(item, _no_params, parsed): + if item in parsed: + vserver = parsed[item] + + # Current number of connections + yield 0, "Client connections: %d" % vserver["cur_conns"], [("connections", vserver["cur_conns"])] + + # New connections per time + counter_name = "f5_bigip_vserver.%s.connections" % item + timedif, rate = get_counter(counter_name, time.time(), vserver["tot_conns"]) + yield 0, "Rate: %.2f/sec" % rate, [("conn_rate", rate)] + + # Current server status + status = vserver["status"] + if status == 0: + yield 1, "Virtual Server is disabled" + elif status == 1: + yield 0, "Virtual Server is up and available" + elif status == 2: + yield 2, "Virtual Server is currently not available" + elif status == 3: + yield 2, "Virtual Server is not available" + elif status == 4: + yield 1, "Virtual Server status is unknown" + else: + yield 3, "Unhandled status (%d)" % status + check_info["f5_bigip_vserver"] = { - 'check_function': check_f5_bigip_vserver, - 'inventory_function': inventory_f5_bigip_vserver, - 'service_description': 'Virtual Server %s', - 'snmp_info': ('.1.3.6.1.4.1.3375.2.2.10.13.2.1', [ - 1, # Name - 2, # Status - ]), - 'snmp_scan_function': \ - lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ - and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), + 'parse_function' : parse_f5_bigip_vserver, + 'check_function' : check_f5_bigip_vserver, + 'inventory_function' : inventory_f5_bigip_vserver, + 'service_description' : 'Virtual Server %s', + "has_perfdata" : True, + 'snmp_info' : ('.1.3.6.1.4.1.3375.2.2.10', [ + "13.2.1.1", # Name + "13.2.1.2", # Status + "2.3.1.11", # ltmVirtualServStatClientTotConns + "2.3.1.12", # ltmVirtualServStatClientCurConns + ]), + 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ + and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), } diff --git a/pnp-templates/check_mk-f5_bigip_vserver.php b/pnp-templates/check_mk-f5_bigip_vserver.php new file mode 100644 index 0000000..ca37a63 --- /dev/null +++ b/pnp-templates/check_mk-f5_bigip_vserver.php @@ -0,0 +1,41 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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 'Client Connections' -l0 --title \"$servicedesc - Connections\" "; + +$def[1] = "DEF:conns=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:conns#4060a0:\"Current Client Connections\" "; +$def[1] .= "LINE:conns#203060 "; +$def[1] .= "GPRINT:conns:LAST:\"%7.0lf %s LAST\" "; +$def[1] .= "GPRINT:conns:MAX:\"%7.0lf %s MAX\\n\" "; + +$opt[2] = "--vertical-label 'Connects/sec' -l0 --title \"$servicedesc - Connects\" "; + +$def[2] = "DEF:conns=$RRDFILE[2]:$DS[2]:MAX "; +$def[2] .= "AREA:conns#80a0f0:\"Connects/sec\" "; +$def[2] .= "LINE:conns#4060a0 "; +$def[2] .= "GPRINT:conns:LAST:\"%7.0lf %s LAST\" "; +$def[2] .= "GPRINT:conns:MAX:\"%7.0lf %s MAX\\n\" "; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 87f6fa9..b4a6ae3 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1198,3 +1198,9 @@ def perfometer_ups_outphase(row, check_command, perf_data): return "%d%%" % load, perfometer_linear(load, "#8050ff") perfometers["check_mk-ups_socomec_outphase"] = perfometer_ups_outphase + +def perfometer_f5_bigip_vserver(row, check_command, perf_data): + connections = int(perf_data[0][1]) + return str(connections), perfometer_logarithmic(connections, 100, 2, "#46a") + +perfometers["check_mk-f5_bigip_vserver"] = perfometer_f5_bigip_vserver

9 years, 10 months

Check_MK Git: check_mk: New keywords OID_END_BIN and OID_END_OCTET_STRING for SNMP

by Mathias Kettner

Module: check_mk Branch: master Commit: 8438a85961d135c6bb815f71069c5511d8d7215b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8438a85961d135… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 15:32:21 2014 +0100 New keywords OID_END_BIN and OID_END_OCTET_STRING for SNMP --- modules/snmp.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index 22dd216..6ba2e4b 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -28,9 +28,11 @@ import subprocess -OID_END = 0 -OID_STRING = -1 -OID_BIN = -2 +OID_END = 0 # Suffix-part of OID that was not specified +OID_STRING = -1 # Complete OID as string ".1.3.6.1.4.1.343...." +OID_BIN = -2 # Complete OID as binary string "\x01\x03\x06\x01..." +OID_END_BIN = -3 # Same, but just the end part +OID_END_OCTET_STRING = -4 # yet same, but omit first byte (assuming that is the length byte) def strip_snmp_value(value, hex_plain = False): v = value.strip() @@ -127,7 +129,10 @@ def get_snmp_table(hostname, ip, check_type, oid_info): # in later. If the column in OID_STRING or OID_BIN we do something # similar: we fill in the complete OID of the entry, either as # string or as binary UTF-8 encoded number string - if column in [ OID_END, OID_STRING, OID_BIN ]: + if column in [ OID_END, OID_STRING, OID_BIN, OID_END_BIN, OID_END_OCTET_STRING ]: + if index_column >= 0: + raise MKGeneralException("Invalid SNMP OID specification in implementation of check. " + "You can only use one of OID_END, OID_STRING, OID_BIN, OID_END_BIN and OID_END_OCTET_STRING.") index_column = colno columns.append((fetchoid, [])) index_format = column @@ -161,12 +166,16 @@ def get_snmp_table(hostname, ip, check_type, oid_info): fetchoid, max_column = columns[max_len_col] for o, value in max_column: if index_format == OID_END: - eo = extract_end_oid(fetchoid, o) - index_rows.append((o, eo)) + index_rows.append((o, extract_end_oid(fetchoid, o))) elif index_format == OID_STRING: index_rows.append((o, o)) - else: + elif index_format == OID_BIN: index_rows.append((o, oid_to_bin(o))) + elif index_format == OID_END_BIN: + index_rows.append((o, oid_to_bin(extract_end_oid(fetchoid, o)))) + else: # OID_END_OCTET_STRING: + index_rows.append((o, oid_to_bin(extract_end_oid(fetchoid, o))[1:])) + columns[index_column] = fetchoid, index_rows

9 years, 10 months

Check_MK Git: check_mk: Always activate agent simulator for stored SNMP walks

by Mathias Kettner

Module: check_mk Branch: master Commit: b46e3345dd05f1ad117390e60dbcf826785648d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b46e3345dd05f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 15:31:58 2014 +0100 Always activate agent simulator for stored SNMP walks --- modules/check_mk.py | 3 +-- modules/snmp.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 66abbe4..426962a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5832,8 +5832,7 @@ def read_config_files(with_autochecks=True, with_conf_d=True): ] # Load agent simulator if enabled in configuration - if agent_simulator: - execfile(modules_dir + "/agent_simulator.py", globals(), globals()) + execfile(modules_dir + "/agent_simulator.py", globals(), globals()) # Compute parameters for a check honoring factory settings, diff --git a/modules/snmp.py b/modules/snmp.py index 159e2a4..22dd216 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -360,9 +360,7 @@ def get_stored_snmpwalk(hostname, oid): o = o[1:] if o == oid or o.startswith(oid_prefix + "."): if len(parts) > 1: - value = parts[1] - if agent_simulator: - value = agent_simulator_process(value) + value = agent_simulator_process(parts[1]) else: value = "" # Fix for missing starting oids

9 years, 10 months

Check_MK Git: check_mk: #1550 FIX zfs_arc_cache: do not inventorize of no cache information available

by Mathias Kettner

Module: check_mk Branch: master Commit: e48b0e3feacfa63a573e183b7b56379ba42cc9f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e48b0e3feacfa6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 26 12:22:14 2014 +0100 #1550 FIX zfs_arc_cache: do not inventorize of no cache information available This avoid an exception. --- .werks/1550 | 9 +++++++++ ChangeLog | 1 + checks/zfs_arc_cache | 17 +++++++---------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.werks/1550 b/.werks/1550 new file mode 100644 index 0000000..54f5d9d --- /dev/null +++ b/.werks/1550 @@ -0,0 +1,9 @@ +Title: zfs_arc_cache: do not inventorize of no cache information available +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417000713 +Class: fix + +This avoid an exception. diff --git a/ChangeLog b/ChangeLog index c47760f..815d18e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing * 1549 FIX: bluecat_threads: do not inventorize this check where information is missing... * 1536 FIX: fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly + * 1550 FIX: zfs_arc_cache: do not inventorize of no cache information available... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index b26f320..b707a23 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -93,7 +93,7 @@ # [...] # } -def zfs_arc_cache_parse(info): +def parse_zfs_arc_cache(info): parsed = {} for line in info: if len(line) > 2 and line[1] == "=": @@ -109,15 +109,13 @@ def zfs_arc_cache_parse(info): # | | # '----------------------------------------------------------------------' -def inventory_zfs_arc_cache(info): - parsed = zfs_arc_cache_parse(info) - if "hits" in parsed.keys() and "misses" in parsed.keys(): +def inventory_zfs_arc_cache(parsed): + if parsed.get("hits") and parsed.get("misses"): return [ (None, None) ] else: return [] -def check_zfs_arc_cache(_no_item, _no_params, info): - parsed = zfs_arc_cache_parse(info) +def check_zfs_arc_cache(_no_item, _no_params, parsed): status = 0 perfdata = [] message = "ZFS arc cache:" @@ -174,6 +172,7 @@ def check_zfs_arc_cache(_no_item, _no_params, info): return status, message, perfdata check_info["zfs_arc_cache"] = { + "parse_function" : parse_zfs_arc_cache, "check_function" : check_zfs_arc_cache, "inventory_function" : inventory_zfs_arc_cache, "service_description" : "ZFS arc cache", @@ -190,16 +189,14 @@ check_info["zfs_arc_cache"] = { # | | # '----------------------------------------------------------------------' -def inventory_zfs_arc_cache_l2(info): - parsed = zfs_arc_cache_parse(info) +def inventory_zfs_arc_cache_l2(parsed): # if l2_size == 0 there is no l2 cache available at all if "l2_size" in parsed.keys() and parsed["l2_size"] > 0: return [ (None, None) ] else: return [] -def check_zfs_arc_cache_l2(_no_item, _no_params, info): - parsed = zfs_arc_cache_parse(info) +def check_zfs_arc_cache_l2(_no_item, _no_params, parsed): status = 0 perfdata = [] message = "ZFS arc cache L2:"

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits