Checkmk git commits May 2013

checkmk-commits@lists.checkmk.com

3 participants
111 discussions

Check_MK Git: check_mk: winperf_tcp_conn: now with performance data and checkman

by Andreas Boesl

Module: check_mk Branch: master Commit: 5305cc3c59a311230fd1fb9c8fad16f6fb2c4965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5305cc3c59a311… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 15 15:41:23 2013 +0200 winperf_tcp_conn: now with performance data and checkman --- checkman/winperf_tcp_conn | 19 +++++++++++++++++++ checks/winperf_tcp_conn | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/checkman/winperf_tcp_conn b/checkman/winperf_tcp_conn new file mode 100644 index 0000000..abed0d9 --- /dev/null +++ b/checkman/winperf_tcp_conn @@ -0,0 +1,19 @@ +title: Monitor number of TCP connections per state +agents: windows +author: Andreas Boesl (ab(a)mathias-kettner.de) +license: GPL +distribution: check_mk +description: + This check monitors the number of established TCP connections on windows systems + +perfdata: + The number of established connections + +inventory: + If the windows agents has the section <<<winperf_tcp_conn>>>, then one check + will be created + + +[parameters] +levels(dict from string to (int, int)): A python dictionary with the key ESTABLISHED and a pair of integers for warning and critical levels. If this state is not listed then the check will be always OK + diff --git a/checks/winperf_tcp_conn b/checks/winperf_tcp_conn index 7427666..14a9ce4 100644 --- a/checks/winperf_tcp_conn +++ b/checks/winperf_tcp_conn @@ -45,9 +45,11 @@ def check_winperf_tcp_conn(item, params, info): ] infotext = "" worst_state = 0 + perfdata = [] for offset, name, param_key in fields: value = saveint(info[offset][1]) infotext += "%s: %s" % (name, value) + warn, crit = "", "" if params.get(param_key): warn, crit = params.get(param_key) if value >= crit: @@ -57,9 +59,10 @@ def check_winperf_tcp_conn(item, params, info): worst_state = max(1, worst_state) infotext += "(!) (warning at %d)" % warn infotext += ", " + perfdata.append( (name, value, warn, crit) ) infotext = infotext[:-2] - return (worst_state, infotext) + return worst_state, infotext, perfdata check_info["winperf_tcp_conn"] = { 'check_function': check_winperf_tcp_conn,

11 years, 1 month

Check_MK Git: check_mk: windows_agent: fixed timeouts for powershell scripts in local/plugins

by Andreas Boesl

Module: check_mk Branch: master Commit: d0858c19f9c33ce46dc5240c3da5a4a3c760bb5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0858c19f9c33c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 15 15:24:46 2013 +0200 windows_agent: fixed timeouts for powershell scripts in local/plugins --- ChangeLog | 1 + agents/windows/check_mk.example.ini | 1 + agents/windows/check_mk_agent.cc | 15 +-------------- agents/windows/check_mk_agent.exe | Bin 113664 -> 113664 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 131986 -> 131980 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 7 files changed, 3 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cb5c01..41d9723 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * lnx_if: show MAC address for interfaces (needs also agent update) * winperf_tcp_conn: New check. Displays number of established tcpv4 connections in windows Uses WATO Rule "TCP connection stats (Windows)" + * windows_agent: fixed timeouts for powershell scripts in local/plugins Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 40fb50d..a2f0e75 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -26,6 +26,7 @@ # Select counters to extract. The following counters # are needed by checks shipped with check_mk. # counters = 10332:msx_queues + # counters = 638:tcp_conn [logfiles] diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 07bfdb8..930a5d0 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2089,7 +2089,7 @@ void launch_program(SOCKET &out, char *dirname, char *name, bool is_plugin){ SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; // security information for pipes PROCESS_INFORMATION pi; - HANDLE newstdin,newstdout,read_stdout,write_stdin; // pipe handles + HANDLE newstdout,read_stdout; // pipe handles // initialize security descriptor (Windows NT) if (IsWinNT()) @@ -2103,17 +2103,9 @@ void launch_program(SOCKET &out, char *dirname, char *name, bool is_plugin){ sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.bInheritHandle = true; // allow inheritable handles - // stdin is unused - if (!CreatePipe(&newstdin,&write_stdin,&sa,0)) // create stdin pipe - { - crash_log("Error creating stdin pipe"); - return; - } if (!CreatePipe(&read_stdout,&newstdout,&sa,0)) // create stdout pipe { crash_log("Error creating stdout pipe"); - CloseHandle(newstdin); - CloseHandle(write_stdin); return; } @@ -2127,17 +2119,14 @@ void launch_program(SOCKET &out, char *dirname, char *name, bool is_plugin){ si.wShowWindow = SW_HIDE; si.hStdOutput = newstdout; si.hStdError = newstdout; // set the new handles for the child process - si.hStdInput = newstdin; // spawn the child process if (!CreateProcess(NULL,command,NULL,NULL,TRUE,CREATE_NEW_CONSOLE, NULL,NULL,&si,&pi)) { crash_log("Error creating process"); - CloseHandle(newstdin); CloseHandle(newstdout); CloseHandle(read_stdout); - CloseHandle(write_stdin); return; } @@ -2196,10 +2185,8 @@ void launch_program(SOCKET &out, char *dirname, char *name, bool is_plugin){ // cleanup the mess CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - CloseHandle(newstdin); CloseHandle(newstdout); CloseHandle(read_stdout); - CloseHandle(write_stdin); return; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7061cbf..aeeaadc 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index c41ea79..c51b120 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 99a9772..126ba50 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 6cecab0..9c2e4c1 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

11 years, 1 month

Check_MK Git: check_mk: new check winperf_tcp_conn

by Andreas Boesl

Module: check_mk Branch: master Commit: c83df933d97830b67262513eb9516616240c9697 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c83df933d97830… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 15 15:20:58 2013 +0200 new check winperf_tcp_conn --- ChangeLog | 2 + checks/winperf_tcp_conn | 71 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 24 +++++++++++- 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ef50023..0cb5c01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,8 @@ * winperf_processor: Now displays (and scales) to number of cpus in pnpgraph * mk_postgres plugin: replace select * with list of explicit columns (fix for PG 9.1) * lnx_if: show MAC address for interfaces (needs also agent update) + * winperf_tcp_conn: New check. Displays number of established tcpv4 connections in windows + Uses WATO Rule "TCP connection stats (Windows)" Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/checks/winperf_tcp_conn b/checks/winperf_tcp_conn new file mode 100644 index 0000000..7427666 --- /dev/null +++ b/checks/winperf_tcp_conn @@ -0,0 +1,71 @@ +#!/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: +# <<<winperf_tcp_conn>>> +# 1368619819.06 638 +# 2 53267 counter +# 4 3 rawcount +# 6 23 rawcount +# 8 1 rawcount +# 10 1 rawcount +# 12 12 rawcount +# 14 34830 counter +# 16 18437 counter + +def inventory_winperf_tcp_conn(info): + return [ (None, {}) ] + +def check_winperf_tcp_conn(item, params, info): + fields = [ + ( 2, "Established", "ESTABLISHED" ), + ] + infotext = "" + worst_state = 0 + for offset, name, param_key in fields: + value = saveint(info[offset][1]) + infotext += "%s: %s" % (name, value) + if params.get(param_key): + warn, crit = params.get(param_key) + if value >= crit: + worst_state = 2 + infotext += "(!!) (critical at %d)" % crit + elif value >= warn: + worst_state = max(1, worst_state) + infotext += "(!) (warning at %d)" % warn + infotext += ", " + + infotext = infotext[:-2] + return (worst_state, infotext) + +check_info["winperf_tcp_conn"] = { + 'check_function': check_winperf_tcp_conn, + 'inventory_function': inventory_winperf_tcp_conn, + 'service_description': 'TCP connections', + 'has_perfdata': True, + 'group': 'tcp_conn_stats_win', +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d85cdc1..10477d2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -983,8 +983,30 @@ register_check_parameters( register_check_parameters( subgroup_networking, + "tcp_conn_stats_win", + ("TCP connection stats (Windows)"), + Dictionary( + elements = [ + ( "ESTABLISHED", + Tuple( + title = _("ESTABLISHED"), + help = _("connection up and passing data"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ) + ] + ), + None, + "first" +) + +register_check_parameters( + subgroup_networking, "tcp_conn_stats", - ("TCP connection stats"), + ("TCP connection stats (LINUX / UNIX)"), Dictionary( elements = [ ( "ESTABLISHED",

11 years, 1 month

Check_MK Git: check_mk: FIX: ipmi_sensors: ignore sensors in state [NA] ( not available)

by Mathias Kettner

Module: check_mk Branch: master Commit: 437ceaedbd653d11a83013e4a82111cdc16e75b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=437ceaedbd653d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 16:22:25 2013 +0200 FIX: ipmi_sensors: ignore sensors in state [NA] (not available) --- ChangeLog | 1 + checks/ipmi_sensors | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 678a8e7..ef50023 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf * FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1), thanks to Miro Ramza * FIX: f5_bigip_psu: handle more than first power supply, thanks to Miro Ramza + * FIX: ipmi_sensors: ignore sensors in state [NA] (not available) 1.2.2p1: diff --git a/checks/ipmi_sensors b/checks/ipmi_sensors index 6c4f511..9d89ea9 100644 --- a/checks/ipmi_sensors +++ b/checks/ipmi_sensors @@ -60,7 +60,7 @@ # 3680 Fan_FAN_PSU2 0.00_RPM_(2760.00/NA) [OK] def inventory_freeipmi(info): - return [ (line[1], "", None) for line in info if line[-1] != '[Unknown]' ] + return [ (line[1], "", None) for line in info if line[-1] not in ( '[Unknown]', '[NA]' ) ] def check_freeipmi(item, _no_params, info): for line in info:

11 years, 1 month

Check_MK Git: check_mk: Fixed typo in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: e0d283911f1978308a2d7ff59b39ecbf16eb6b79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0d283911f1978… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 16:20:58 2013 +0200 Fixed typo in help text --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index a5c2360..2a90b6a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1419,7 +1419,7 @@ register_rule(group, CheckTypeSelection( title = _("Ignored checks"), help = _("This ruleset is similar to 'Ignored services', but selects checks to be ignored " - "by their <b>type</b>. This allows to disable certain techinal implementations " + "by their <b>type</b>. This allows you to disable certain technical implementations " "such as filesystem checks via SNMP on hosts that also have the Check_MK agent " "installed."), ))

11 years, 1 month

Check_MK Git: check_mk: lnx_if: show MAC address for interfaces ( needs also agent update)

by Mathias Kettner

Module: check_mk Branch: master Commit: b1a8837827db75486eac0ba58d679986f3d89f96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1a8837827db75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 13:04:07 2013 +0200 lnx_if: show MAC address for interfaces (needs also agent update) --- ChangeLog | 1 + agents/check_mk_agent.linux | 5 +++-- checks/lnx_if | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4bc640..678a8e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * uptime, snmp_uptime, esx_vsphere_counters.uptime: allow to set lower and upper levels * winperf_processor: Now displays (and scales) to number of cpus in pnpgraph * mk_postgres plugin: replace select * with list of explicit columns (fix for PG 9.1) + * lnx_if: show MAC address for interfaces (needs also agent update) Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 78902ca..9c80562 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -166,8 +166,9 @@ if type ethtool > /dev/null then for eth in $(sed -e 1,2d < /proc/net/dev | cut -d':' -f1 | sort) do - echo "[$eth]" - ethtool $eth | egrep '(Speed|Duplex|Link detected|Auto-negotiation):' + echo "[$eth]" + ethtool $eth | egrep '(Speed|Duplex|Link detected|Auto-negotiation):' + echo -en "\tAddress: " ; cat /sys/class/net/$eth/address done fi diff --git a/checks/lnx_if b/checks/lnx_if index 0099d8c..516407a 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -37,6 +37,7 @@ # Duplex: Unknown! (255) # Auto-negotiation: on # Link detected: no +# Address: de:ad:be:af:00:01 # [eth1] # Speed: 1000Mb/s # Duplex: Full @@ -60,7 +61,7 @@ def if_lnx_convert_to_if64(info): nic = line[0] nic_info[nic] = { "counters": map(int, line[1].split()) } else: - nic_info[current_nic][line[0].strip()] = line[1].strip() + nic_info[current_nic][line[0].strip()] = ":".join(line[1:]).strip() # if index is 0 we either have found no nics or no information # from ethtool is present. In the latter case we continue and @@ -130,7 +131,9 @@ def if_lnx_convert_to_if64(info): ifOperStatus = 4 # unknown (NIC has never been used) # There is no mac adress data available for the moment - ifPhysAddress = '' + def hextobin(x): + return chr(int(x, 16)) + ifPhysAddress = "".join([chr(int(x, 16)) for x in attr.get("Address", "").split(":")]) if_table.append(map(str, [ ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus,

11 years, 1 month

Check_MK Git: check_mk: mk_postgres plugin: replace select * with list of explicit columns (fix for PG 9.1)

by Mathias Kettner

Module: check_mk Branch: master Commit: 28cb7d271468e1eb15f713a3096feabe79349609 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28cb7d271468e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 12:44:33 2013 +0200 mk_postgres plugin: replace select * with list of explicit columns (fix for PG 9.1) --- ChangeLog | 1 + agents/plugins/mk_postgres | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 15a2ce5..f4bc640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ router mode, serialnumber and temperature sensors * uptime, snmp_uptime, esx_vsphere_counters.uptime: allow to set lower and upper levels * winperf_processor: Now displays (and scales) to number of cpus in pnpgraph + * mk_postgres plugin: replace select * with list of explicit columns (fix for PG 9.1) Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres index d98e431..a041a9c 100755 --- a/agents/plugins/mk_postgres +++ b/agents/plugins/mk_postgres @@ -13,5 +13,5 @@ echo '<<<postgres_sessions>>>' echo "select current_query = '<IDLE>', count(*) from pg_stat_activity group by (current_query = '<IDLE>');" | su - $USER -c "psql -d postgres -A -t -F' '" echo '<<<postgres_stat_database:sep(59)>>>' -echo 'select *, pg_database_size(datname) as "datsize" from pg_stat_database;' \ +echo 'select datid, datname, numbackends, xact_commit, xact_rollback, blks_read, blks_hit, tup_returned, tup_fetched, tup_inserted, tup_updated, tup_deleted, conflicts, pg_database_size(datname) "datsize" from pg_stat_database;' \ | su - $USER -c "psql -d postgres -A -F';'" | sed '$d'

11 years, 1 month

Check_MK Git: check_mk: viprinet_* checks: fix SNMP scan function

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c76f556c6972d9f6681c7e9d4592b14bead4dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c76f556c6972d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 12:14:23 2013 +0200 viprinet_* checks: fix SNMP scan function --- checks/viprinet_firmware | 2 +- checks/viprinet_mem | 2 +- checks/viprinet_power | 2 +- checks/viprinet_router | 2 +- checks/viprinet_serial | 2 +- checks/viprinet_temp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/viprinet_firmware b/checks/viprinet_firmware index 0b4262d..11c3626 100644 --- a/checks/viprinet_firmware +++ b/checks/viprinet_firmware @@ -45,5 +45,5 @@ check_info["viprinet_firmware"] = { 'service_description' : "Firmware Version", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [4, 7]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_mem b/checks/viprinet_mem index f7b4f30..63f8d2a 100644 --- a/checks/viprinet_mem +++ b/checks/viprinet_mem @@ -30,5 +30,5 @@ check_info["viprinet_mem"] = { 'service_description' : "Memory", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [2]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_power b/checks/viprinet_power index b04b1a1..c3808eb 100644 --- a/checks/viprinet_power +++ b/checks/viprinet_power @@ -41,5 +41,5 @@ check_info["viprinet_power"] = { 'service_description' : "Power-Supply", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [5]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_router b/checks/viprinet_router index 6eec67d..ca287b6 100644 --- a/checks/viprinet_router +++ b/checks/viprinet_router @@ -43,6 +43,6 @@ check_info["viprinet_router"] = { 'service_description' : "Router Mode", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [5]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_serial b/checks/viprinet_serial index c89cfb6..0106fb4 100644 --- a/checks/viprinet_serial +++ b/checks/viprinet_serial @@ -30,6 +30,6 @@ check_info["viprinet_serial"] = { 'service_description' : "Serial Number", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [2]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_temp b/checks/viprinet_temp index e55f252..80a77ea 100644 --- a/checks/viprinet_temp +++ b/checks/viprinet_temp @@ -51,6 +51,6 @@ check_info["viprinet_temp"] = { 'group' : "room_temperature", 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [3, 4]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], }

11 years, 1 month

Check_MK Git: check_mk: FIX: f5_bigip_psu: handle more than first power supply

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d5e836023e3131a8ed9fdda08db7fc849885991 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5e836023e313… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 12:07:19 2013 +0200 FIX: f5_bigip_psu: handle more than first power supply Conflicts: checks/f5_bigip_psu --- ChangeLog | 1 + checks/f5_bigip_psu | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c47cf60..15a2ce5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * FIX: jolokia_info: ignore ERROR instances * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf * FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1), thanks to Miro Ramza + * FIX: f5_bigip_psu: handle more than first power supply, thanks to Miro Ramza 1.2.2p1: diff --git a/checks/f5_bigip_psu b/checks/f5_bigip_psu index caa4fca..99a0066 100644 --- a/checks/f5_bigip_psu +++ b/checks/f5_bigip_psu @@ -40,7 +40,8 @@ def inventory_f5_bigip_psu(info): inventory = [] for line in info: - psu, state = line[0] + psu = line[0] + state = line[1] # inventorize the PSU unless it's in state 2 (notpresent) if state != "2": inventory.append((psu, None)) @@ -48,8 +49,8 @@ def inventory_f5_bigip_psu(info): def check_f5_bigip_psu(item, _no_params, info): for line in info: - psu = line[0][0] - state = int(line[0][1]) + psu = line[0] + state = int(line[1]) if psu == item: if state == 1: return (0, "PSU state: good") @@ -68,7 +69,7 @@ check_info["f5_bigip_psu"] = { 'inventory_function': inventory_f5_bigip_psu, 'service_description': 'PSU %s', # Get ID and status from the SysChassisPowerSupplyTable - 'snmp_info': [('.1.3.6.1.4.1.3375.2.1.3.2.2.2.1', [1, 2])], + 'snmp_info': ('.1.3.6.1.4.1.3375.2.1.3.2.2.2.1', [1, 2]), 'snmp_scan_function': \ # Check using the vendor mib Id and verify it's a loadbalancer lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \

11 years, 1 month

Check_MK Git: check_mk: FIX: f5_bigip_vserver: fix wrong OID (

by Mathias Kettner

13 instead of 1) Message-ID: <51920c17.9EzWG2OWZNKAPyGo%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7fb7f1828a40407973fea01f1cafe88450955745 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fb7f1828a4040… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 12:02:25 2013 +0200 FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1) Conflicts: ChangeLog checks/f5_bigip_vserver --- ChangeLog | 3 ++- checks/f5_bigip_vserver | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28f415f..c47cf60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,7 +127,8 @@ Checks & Agents: * FIX: jolokia_info: ignore ERROR instances * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf - + * FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1), thanks to Miro Ramza + 1.2.2p1: Core: diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index 93120ea..10beec6 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -69,7 +69,7 @@ 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.1.2.1', [ + 'snmp_info': ('.1.3.6.1.4.1.3375.2.2.10.13.2.1', [ 1, # Name 2, # Status ]),

11 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2013