Checkmk git commits November 2010

checkmk-commits@lists.checkmk.com

2 participants
180 discussions

Check_MK Git: check_mk: New check tcp_conn_states

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c669905976809cd23f1c5dd14618962bce246c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c669905976809… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 27 15:56:30 2010 +0200 New check tcp_conn_states --- ChangeLog | 1 + agents/check_mk_agent.linux | 4 ++ checkman/tcp_conn_stats | 27 ++++++++++ checks/tcp_conn_stats | 75 +++++++++++++++++++++++++++ pnp-rraconf/check_mk-tcp_conn_stats.rra.cfg | 1 + pnp-templates/check_mk-tcp_conn_stats.php | 49 +++++++++++++++++ 6 files changed, 157 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b746c1..fc36b90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * blade_blowers: Can handle responses without rpm values now. Improved output * cisco_fan: Does not inentorize 'notPresent' sensors anymore. Improved output * cisco_power: Not using power source as threshold anymore. Improved output + * tcp_conn_stats: new check for monitoring number of current TCP connections Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 655b661..c3c2f14 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -124,6 +124,10 @@ then done fi +# Number of TCP connections in the various states +echo '<<<tcp_conn_stats>>>' +netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' + # Platten- und RAID-Status von LSI-Controlleren, falls vorhanden if which cfggen > /dev/null ; then echo '<<<lsi>>>' diff --git a/checkman/tcp_conn_stats b/checkman/tcp_conn_stats new file mode 100644 index 0000000..0e14777 --- /dev/null +++ b/checkman/tcp_conn_stats @@ -0,0 +1,27 @@ +title: Monitor number of TCP connections per state +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the number of TCP connections in the various possible states, + which are: {ESTABLISHED}, {SYN_SENT}, {SYN_RECV}, {LAST_ACK}, {CLOSE_WAIT}, {TIME_WAIT}, {CLOSED}, {CLOSING}, {FIN_WAIT1}, {FIN_WAIT2}. + +perfdata: + One variable for each of the state types listed in the description (which are ten). + +inventory: + If there is at least one TCP connection, then one check will be created. + On agents supporting {tcp_conn_state} this should always be the case since at + least the connection to the agent should be shown. + +examples: + # set levels for TIME_WAIT and ESTABLISHED + tcp_conn_state_default_levels = { "TIME_WAIT" : (20, 50), "ESTABLISHED" : (100, 200) } + +[parameters] +levels(dict from string to (int, int)): A python dictionary from check state to a pair of integers for warning and critical levels. For state types not listed in the dictionary no state check is done. The default parameter is an empty dictionary, which makes this check always OK. + +[configuration] +tcp_conn_state_default_levels (dict from string to (int, int)): default levels used for all + inventorized checks. diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats new file mode 100644 index 0000000..e745879 --- /dev/null +++ b/checks/tcp_conn_stats @@ -0,0 +1,75 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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. + +tcp_conn_states = [ +"ESTABLISHED", # connection up and passing data +"SYN_SENT", # session has been requested by us; waiting for reply from remote endpoint +"SYN_RECV", # session has been requested by a remote endpoint for a socket on which we were listening +"LAST_ACK", # our socket is closed; remote endpoint has also shut down; we are waiting for a final acknowledgement +"CLOSE_WAIT", # remote endpoint has shut down; the kernel is waiting for the application to close the socket +"TIME_WAIT", # socket is waiting after closing for any packets left on the network +"CLOSED", # socket is not being used (FIXME. What does mean?) +"CLOSING", # our socket is shut down; remote endpoint is shut down; not all data has been sent +"FIN_WAIT1", # our socket has closed; we are in the process of tearing down the connection +"FIN_WAIT2", # the connection has been closed; our socket is waiting for the remote endpoint to shut down +] + + +tcp_conn_stats_default_levels = { } + +def inventory_tcp_conn_stats(checkname, info): + if len(info) > 0: + return [ (None, 'tcp_conn_stats_default_levels') ] + +def check_tcp_conn_stats(item, params, info): + stats = dict(info) + worst_state = 0 + info = [] + perfdata = [] + for state in tcp_conn_states: + num = int(stats.get(state, 0)) + if num > 0: + infotext = "%s: %d" % (state, num) + else: + infotext = None + levels = params.get(state) + perf = [state, num] + if levels: + warn, crit = levels + perf.append(warn) + perf.append(crit) + if num >= crit: + worst_state = 2 + infotext += "(critical at %d!!)" % crit + elif num >= warn: + worst_state = max(1, worst_state) + infotext += "(warning at %d!)" % warn + perfdata.append(perf) + if infotext: + info.append(infotext) + return (worst_state, "%s - %s" % (nagios_state_names[worst_state], ", ".join(info)), perfdata) + +check_info['tcp_conn_stats'] = (check_tcp_conn_stats, "TCP Connections", 1, inventory_tcp_conn_stats) diff --git a/pnp-rraconf/check_mk-tcp_conn_stats.rra.cfg b/pnp-rraconf/check_mk-tcp_conn_stats.rra.cfg new file mode 120000 index 0000000..19dbf77 --- /dev/null +++ b/pnp-rraconf/check_mk-tcp_conn_stats.rra.cfg @@ -0,0 +1 @@ +max.rra.cfg \ No newline at end of file diff --git a/pnp-templates/check_mk-tcp_conn_stats.php b/pnp-templates/check_mk-tcp_conn_stats.php new file mode 100644 index 0000000..71dd3c4 --- /dev/null +++ b/pnp-templates/check_mk-tcp_conn_stats.php @@ -0,0 +1,49 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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 'Number' -u 10 -X0 --title \"TCP Connection stats on $hostname\" "; + +$stats = array( + array(2, "SYN_SENT", " ", "#a00000", ""), + array(3, "SYN_RECV", " ", "#ff4000", ""), + array(1, "ESTABLISHED", "", "#00f040", ""), + array(6, "TIME_WAIT", " ", "#00b0b0", "\\n"), + array(4, "LAST_ACK", " ", "#c060ff", ""), + array(5, "CLOSE_WAIT", " ", "#f000f0", ""), + array(7, "CLOSED", " ", "#ffc000", ""), + array(8, "CLOSING", " ", "#ffc080", "\\n"), + array(9, "FIN_WAIT1", " ", "#cccccc", ""), + array(10, "FIN_WAIT2", " ", "#888888", "\\n") +); + +$def[1] = ""; + +foreach ($stats as $entry) { + list($i, $stat, $spaces, $color, $nl) = $entry; + $def[1] .= "DEF:$stat=$RRDFILE[$i]:$DS[$i]:MAX "; + $def[1] .= "AREA:$stat$color:\"$stat\":STACK "; + $def[1] .= "GPRINT:$stat:LAST:\"$spaces%3.0lf$nl\" "; +} +

13 years, 8 months

Check_MK Git: check_mk: Merge branch '1.1.9' of http://git.mathias-kettner. de/check_mk into 1.1.9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0fa9fb5b35546340dc4d678fb33864176efab1f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa9fb5b355463… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 27 14:01:41 2010 +0200 Merge branch '1.1.9' of http://git.mathias-kettner.de/check_mk into 1.1.9 ---

13 years, 8 months

Check_MK Git: check_mk: Set version to 1.1.9i1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be5dc2619884628830ddd570785c9a011c0e2fb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be5dc261988462… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 21 15:00:34 2010 +0200 Set version to 1.1.9i1 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4517d2a..d1436cf 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.8 +VERSION = 1.1.9i1 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 05804a9..df1e5b8 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.8 +echo Version: 1.1.9i1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 9602202..3c6ddfc 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.8 +echo Version: 1.1.9i1 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a88d72f..655b661 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.8 +echo Version: 1.1.9i1 echo AgentOS: linux # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 301949c..273c2c4 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.8 +echo Version: 1.1.9i1 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 989c1c0..778d009 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -58,7 +58,7 @@ #include <dirent.h> -#define CHECK_MK_VERSION "1.1.8" +#define CHECK_MK_VERSION "1.1.9i1" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/livestatus/configure.ac b/livestatus/configure.ac index c6cde60..ae8a44a 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.8], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index 7d2bb94..664e55f 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -37,7 +37,7 @@ set -e NAGIOS_VERSION=3.2.2 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.3 -CHECK_MK_VERSION=1.1.8 +CHECK_MK_VERSION=1.1.9i1 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.1 diff --git a/scripts/setup.sh b/scripts/setup.sh index 52be942..791d973 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.8 +VERSION=1.1.9i1 NAME=check_mk LANG= LC_ALL=

13 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk into 1.1.9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63a42ea905dcb636457a1c007bd09b68b43f6e85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a42ea905dcb6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 24 22:55:35 2010 +0200 Merge branch 'master' of git@mathias-kettner.de:check_mk into 1.1.9 ---

13 years, 8 months

Check_MK Git: check_mk: Fixed mousewheel scrolling in opera/chrome; Fixed resize bug on refresh in chrome

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ec63047ae6b4e0547ad68785fdd38b570e4280e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ec63047ae6b4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 25 11:02:00 2010 +0200 Fixed mousewheel scrolling in opera/chrome; Fixed resize bug on refresh in chrome --- ChangeLog | 2 ++ LIESMICH.zutun | 4 ++-- web/htdocs/main.py | 1 + web/htdocs/sidebar.js | 36 ++++++++++++++++++++++-------------- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd75176..c840190 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ * Setting doctype in sidebar frame now * Fixed invalid sidebar css height/width definition * Fixed repositioning the sidebar scroll state after refreshing the page + * Fixed mousewheel scrolling in opera/chrome + * Fixed resize bug on refresh in chrome 1.1.8: Core, Setup, etc.: diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 815e2f4..3383b0e 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -42,8 +42,8 @@ Logwatch: was macht man hier bei verteilten Umgebungen?? Muss man das wie PNP per Proxy anfahren? Was ist aber dann, wenn man dort rumklickt? Dann hat man rechts plötzlich ein anderes System. Lösung ist noch nicht in Sicht. -LARS: In Opera (Version 10.6) geht in der Sidebar das Scrollen per Mausrad -nicht. Angeblich in Chrome auch nicht. +LARS: Bei Opera kann man kein Snapin nach ganz unten ziehen. Der Indikator +springt dann immer nach ganz oben. SNMP-Checks: Es wurde berichtet, dass - wenn die Community falsch ist - der Check_MK gruen war, aber die Checks unknown. Sollte es dann nicht diff --git a/web/htdocs/main.py b/web/htdocs/main.py index faa7829..854d989 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -38,6 +38,7 @@ def page_index(html): <frameset cols="280,*" frameborder="0" framespacing="0" border="0"> <frame src="side.py" name="side" noresize> <frame src="%s" name="main" noresize> +</frameset> </html> """ % config.start_url) diff --git a/web/htdocs/sidebar.js b/web/htdocs/sidebar.js index e829401..a7431eb 100644 --- a/web/htdocs/sidebar.js +++ b/web/htdocs/sidebar.js @@ -22,8 +22,9 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -var browser = navigator.userAgent.toLowerCase(); -var weAreIEF__k = ((browser.indexOf("msie") != -1) && (browser.indexOf("opera") == -1)); +var browser = navigator.userAgent.toLowerCase(); +var weAreIEF__k = ((browser.indexOf("msie") != -1) && (browser.indexOf("opera") == -1)); +var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; var contentLocation = parent.frames[1].document.location; // @@ -41,9 +42,12 @@ if (window.addEventListener) { dragScroll(e); return false; }, false); - window.addEventListener("mousedown", startDragScroll, false); - window.addEventListener("mouseup", stopDragScroll, false); - window.addEventListener('DOMMouseScroll', scrollWheel, false); + window.addEventListener("mousedown", startDragScroll, false); + window.addEventListener("mouseup", stopDragScroll, false); + if(weAreFirefox) + window.addEventListener('DOMMouseScroll', scrollWheel, false); + else + window.addEventListener('mousewheel', scrollWheel, false); } else { document.documentElement.onmousemove = function(e) { // snapin drag 'n drop @@ -339,13 +343,13 @@ function getSnapinTargetPos() { } /************************************************ - * misc sidebar styling + * misc sidebar stuff *************************************************/ function pageHeight() { var h; - if (window.innerHeight !== null && typeof window.innerHeight !== 'undefined') + if (window.innerHeight !== null && typeof window.innerHeight !== 'undefined' && window.innerHeight !== 0) h = window.innerHeight; else if (document.documentElement && document.documentElement.clientHeight) h = document.documentElement.clientHeight; @@ -354,7 +358,7 @@ function pageHeight() { else h = null; -return h; + return h; } // Set the size of the sidebar_content div to fit the whole screen @@ -365,12 +369,19 @@ function setSidebarHeight() { var oContent = document.getElementById('side_content'); var oFooter = document.getElementById('side_footer'); var height = pageHeight(); - + + // Don't handle zero heights + if(height == 0) + return; if (weAreIEF__k) oContent.style.height = (height - oFooter.clientHeight + 5) + 'px'; else oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px'; + + oFooter = null; + oContent = null; + oHeader = null; } var scrolling = true; @@ -476,13 +487,10 @@ function scrollWheel(event){ if (!event) event = window.event; - if (event.wheelDelta) { + if (event.wheelDelta) delta = event.wheelDelta / 120; - if (window.opera) - delta = -delta; - } else if (event.detail) { + else if (event.detail) delta = -event.detail / 3; - } if (delta) handle(delta);

13 years, 8 months

Check_MK Git: check_mk: blade_blowers: Can handle responses without rpm values now. Improved output.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5fd4bb5ef93ee3464347bbe7cb9f8fce07b7cb30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fd4bb5ef93ee3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 25 16:46:18 2010 +0200 blade_blowers: Can handle responses without rpm values now. Improved output. --- ChangeLog | 3 +++ checks/blade_blowers | 29 +++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c840190..3e6e9fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * megaraid_pdisks: Using the real enclosure number as check item now * if/if64: Added expected interface speed to warning output * wut_webtherm: handle more variants of WuT Webtherms (thanks to Lefty) + * blade_bays: Also inventorizes standby blades and has a little more + verbose output. + * blade_blowers: Can handle responses without rpm values now. Improved output. Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/blade_blowers b/checks/blade_blowers index 81a89cd..b12fae2 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -69,19 +69,32 @@ def inventory_blade_blowers(checkname, info): def check_blade_blowers(item, _no_params, info): blower, num_blowers = map(int, item.split("/")) text = info[blower-1][0] + perfdata = [] + output = '' + + state = info[blower-1 + num_blowers][0] + + try: + rpm = int(info[blower-1 + 2*num_blowers][0]) + perfdata += [("rpm", rpm)] + output += 'Speed at %d RMP' % rpm + except: + pass + try: perc = int(text.split("%")[0]) + perfdata += [("perc", perc, None, None, 0, 100)] + if output == '': + output += 'Speed is at %d%% of max' % perc + else: + output += ' (%d%% of max)' % perc except: - perc = 0 - state = info[blower-1 + num_blowers][0] - rpm = int(info[blower-1 + 2*num_blowers][0]) - perfdata = [("perc", perc, None, None, 0, 100), ("rpm", rpm)] - info = "- Speed at %d RPM (%d%% of max)" % (rpm, perc) + pass + if state == "1": - return (0, "OK" + info, perfdata) + return (0, "OK - " + output, perfdata) else: - return (2, "CRIT" + info, perfdata) - + return (2, "CRIT - " + output, perfdata) check_info['blade_blowers'] = ( check_blade_blowers, "Blower %s", 1, inventory_blade_blowers)

13 years, 8 months

Check_MK Git: check_mk: ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 238926ae190e33e30b3d866326f3f5e7aaaf5208 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=238926ae190e33… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 25 16:10:12 2010 +0200 ChangeLog Enhanced blade_bays check --- checks/blade_bays | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/checks/blade_bays b/checks/blade_bays index 1bd0b2e..c4c5714 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -24,23 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +blade_bay_module_state = { + 0: 'standby', + 1: 'on', + 2: 'notPresent', + 255: 'notApplicable', +} def inventory_blade_bays(checkname, info): - # find only modules that are present and switched on - return [ (line[0], '', line[1]) for line in info if line[1] == "1" ] + # find only modules that are present and switched on or standby + return [ (line[0], '', line[1]) for line in info if line[1] in [ '0', '1' ] ] def check_blade_bays(item, params, info): for line in info: if line[0] == item: - state = int(line[1]) + state = saveint(line[1]) + type = line[2] if state == 1: - return (0, "OK - State OK") + return (0, "OK - State %s (Type: %s, ID: %s)" % + (blade_bay_module_state.get(state, 'Unhandled'), type, line[3])) elif state == 2: return (1, "WARNING - Not present") + elif state == 0: + return (1, "WARNING - Device is in standby") else: return (2, "CRIT - invalid state %d" % state) return (3, "UNKNOWN - no data for '%s' in SNMP info" % item) - check_info['blade_bays'] = (check_blade_bays, "BAY %s", 0, inventory_blade_bays) snmp_info['blade_bays'] = ( "1.3.6.1.4.1.2.3.51.2.2.10.2.1.1", [ 5, 6 ] ) # BLADE-MIB

13 years, 8 months

Check_MK Git: check_mk: Merge branch '1.1.9' of git@mathias-kettner.de: check_mk into 1.1.9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41654b221536fb0987eea4a665edefb5bd4f7390 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41654b221536fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 24 22:57:40 2010 +0200 Merge branch '1.1.9' of git@mathias-kettner.de:check_mk into 1.1.9 ---

13 years, 8 months

Check_MK Git: check_mk: cisco_fan: Does not inentorize notPresent sensors anymore. Imporved output.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7d8bd4ccf616102b2ac8a731e8ce44296db75d38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d8bd4ccf61610… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 25 17:12:17 2010 +0200 cisco_fan: Does not inentorize notPresent sensors anymore. Imporved output. --- ChangeLog | 1 + checks/cisco_fan | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e6e9fc..5a8ab9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * blade_bays: Also inventorizes standby blades and has a little more verbose output. * blade_blowers: Can handle responses without rpm values now. Improved output. + * cisco_fan: Does not inentorize 'notPresent' sensors anymore. Imporved output. Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/cisco_fan b/checks/cisco_fan index 48adbec..04f824c 100644 --- a/checks/cisco_fan +++ b/checks/cisco_fan @@ -24,17 +24,22 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +cisco_fan_states = ('', 'normal', 'warning', 'critical', + 'shutdown', 'notPresent', 'notFunctioning') def inventory_cisco_fan(checkname, info): - return [ (line[0], None) for line in info ] + return [ (line[0], None) for line in info if line[1] != '5' ] def check_cisco_fan(item, params, info): for line in info: if line[0] == item: - if line[1] == "1": - return (0, "OK") + state = saveint(line[1]) + if state == 1: + return (0, "OK (State is: %s (%d))" % (cisco_fan_states[state], state)) + elif state == 2: + return (1, "WARNING (state is %s (%d))" % (cisco_fan_states[state], state)) else: - return (2, "CRITICAL (state is %ds" % line[1]) + return (2, "CRITICAL (state is %s (%d))" % (cisco_fan_states[state], state)) return (3, "UNKNOWN - item not found in snmp data") check_info['cisco_fan'] = (check_cisco_fan, "FAN %s", 0, inventory_cisco_fan)

13 years, 8 months

Check_MK Git: check_mk: Merge branch '1.1.9' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk into 1.1.9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 792aa4016bf8eef9e6d24d24f7e330807480fbe1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=792aa4016bf8ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 21 14:59:13 2010 +0200 Merge branch '1.1.9' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into 1.1.9 ---

13 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2010