Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65396 discussions

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

14 years

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 ---

14 years

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)

14 years

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 ---

14 years

Check_MK Git: check_mk: wut_webtherm: handle more variants

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9cf8ef5019dbac2872ddadcecdde48d3e36c33cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cf8ef5019dbac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 21 15:00:06 2010 +0200 wut_webtherm: handle more variants --- ChangeLog | 1 + checks/wut_webtherm | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e81b14..5ee535a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 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) Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 5a27213..a5b9536 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -27,7 +27,7 @@ wut_webtherm_defaultlevels = (30, 35) def inventory_webtherm(checkname, info): - # line[0] is 3.1 or 8.1 depending on MIB variant. We chop + # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1 or 16.1 depending on MIB variant. We chop # of the first part in order to get independent of that. return [ (line[0].split(".")[1], "", "wut_webtherm_defaultlevels") for line in info if len(line) == 2 ] @@ -49,12 +49,12 @@ def check_webtherm(item, params, info): def detect_webtherm(oid): return oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.5040.1.2.3", ".1.3.6.1.4.1.5040.1.2.8" ] + [ ".1.3.6.1.4.1.5040.1.2.1", ".1.3.6.1.4.1.5040.1.2.2", ".1.3.6.1.4.1.5040.1.2.3", ".1.3.6.1.4.1.5040.1.2.6", ".1.3.6.1.4.1.5040.1.2.8" ".1.3.6.1.4.1.5040.1.2.16" ] check_info['wut_webtherm'] = ( check_webtherm, "Thermograph Sensor %s", 1, inventory_webtherm) snmp_info['wut_webtherm'] = ( - "1.3.6.1.4.1.5040.1.2", ["3", "8"], [ "1.2.1.1.1", "1.3.1.1.1" ]) + "1.3.6.1.4.1.5040.1.2", ["1", "2", "3", "6", "8", "16"], [ "1.2.1.1", "1.3.1.1" ]) snmp_scan_functions['wut_webtherm'] = detect_webtherm

14 years

Check_MK Git: check_mk: if/if64: Added expected interface speed to warning output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 519cdaa36e23164c237e84dffe7ba73d44f6cdd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=519cdaa36e2316… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 19 15:56:45 2010 +0200 if/if64: Added expected interface speed to warning output --- ChangeLog | 4 +++- checks/if | 4 ++-- checks/if64 | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd78e6e..dd1be88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.1.9i1 Checks & Agents: - * megaraid_pdisks: Using the real enclosure number as check item now. + * megaraid_pdisks: Using the real enclosure number as check item now + * if/if64: Added expected interface speed to warning output + Multisite: * The custom open/close states of custom links are now stored for each user diff --git a/checks/if b/checks/if index 78d6ede..cf80459 100644 --- a/checks/if +++ b/checks/if @@ -102,7 +102,7 @@ def check_if(item, params, info): operstatus = if_statename(str(ifOperStatus)) if not operstatus in allowed_operstates: return (2, "CRIT - %soperstate: %s (CRIT)" % (infotext, operstatus)) - infotext += "(%s) " % operstatus + infotext += "(%s) " % operstatus state = 0 @@ -110,7 +110,7 @@ def check_if(item, params, info): speed = saveint(ifSpeed) bandwidth = speed / 8.0 # in Bytes / sec if speed != targetspeed: - infotext += "%s (wrong speed!)" % speed + infotext += "%s (wrong speed! expected: %s)" % (speed, get_nic_speed_human_readable(targetspeed)) state = 1 else: infotext += get_bytes_human_readable(speed, 1000)+'it/s' diff --git a/checks/if64 b/checks/if64 index c9df3a4..897787b 100644 --- a/checks/if64 +++ b/checks/if64 @@ -114,7 +114,7 @@ def check_if64(item, params, info): operstatus = if64_statename(str(ifOperStatus)) if not operstatus in allowed_operstates: return (2, "CRIT - %soperstate: %s (CRIT)" % (infotext, operstatus)) - infotext += "(%s) " % operstatus + infotext += "(%s) " % operstatus state = 0 @@ -123,7 +123,7 @@ def check_if64(item, params, info): infotext += get_nic_speed_human_readable(speed) bandwidth = speed / 8.0 # in Bytes / sec if speed != targetspeed: - infotext += " (wrong speed!)" + infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) state = 1 # Performance counters

14 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://lm@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: 40f1f2e9060aaabb913aa4e5cf24f10c0e4d3491 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f1f2e9060aaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 19 18:14:07 2010 +0200 Merge branch 'master' of ssh://lm@git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into 1.1.9 Conflicts: ChangeLog ---

14 years

Check_MK Git: check_mk: Fixed invalid css definition and set the correct doctype in the sidebar now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bcd916c648582ece43595093b3a45ad7383b1443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcd916c648582e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 20 16:39:57 2010 +0200 Fixed invalid css definition and set the correct doctype in the sidebar now --- ChangeLog | 2 ++ web/htdocs/sidebar.js | 4 ++-- web/htdocs/sidebar.py | 4 +++- web/plugins/sidebar/shipped.py | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 748b53e..e32a509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Multisite: * The custom open/close states of custom links are now stored for each user + * Setting doctype in sidebar frame now + * Fixed invalid sidebar css height/width definition 1.1.8: Checks & Agents: diff --git a/web/htdocs/sidebar.js b/web/htdocs/sidebar.js index 5aaa037..2b6ad97 100644 --- a/web/htdocs/sidebar.js +++ b/web/htdocs/sidebar.js @@ -368,9 +368,9 @@ function setSidebarHeight() { if (weAreIEF__k) - oContent.style.height = height - oFooter.clientHeight + 5; + oContent.style.height = (height - oFooter.clientHeight + 5) + 'px'; else - oContent.style.height = height - oHeader.clientHeight - oFooter.clientHeight - 5; + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px'; } var scrolling = true; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 90988eb..d715b68 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -124,7 +124,9 @@ def page_side(h): global html html = h - html.write("""<html> + html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN "http://www.w3.org/TR/html4/frameset.dtd"> + +<html> <head> <title>Check_MK Sidebar</title> <link href="check_mk.css" type="text/css" rel="stylesheet"> diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a6ceaec..7087557 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -394,7 +394,7 @@ sidebar_snapins["sitestatus"] = { "refresh" : 90, "styles" : """ .snapin table.sitestate { - width: %d; + width: %dpx; } .snapin table.sitestate td { @@ -517,7 +517,7 @@ sidebar_snapins["tactical_overview"] = { table.tacticaloverview { border-collapse: separate; border-spacing: 5px 0px; - width: %d; + width: %dpx; position: relative; left: -4px; }

14 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://lm@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: 314a55c18e1516b9fa4259aa30dbbc79c58dd7c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=314a55c18e1516… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 20 18:15:06 2010 +0200 Merge branch 'master' of ssh://lm@git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into 1.1.9 ---

14 years

Check_MK Git: check_mk: Fixed repositioning the sidebar scroll state after refreshing the page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d265081ac84d324964236159720b0b70898e8e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d265081ac84d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 20 18:14:11 2010 +0200 Fixed repositioning the sidebar scroll state after refreshing the page --- ChangeLog | 1 + web/htdocs/sidebar.js | 37 +++++++++++++++++++++++++++++++++++++ web/htdocs/sidebar.py | 2 +- 3 files changed, 39 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e32a509..8239c9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ user * Setting doctype in sidebar frame now * Fixed invalid sidebar css height/width definition + * Fixed repositioning the sidebar scroll state after refreshing the page 1.1.8: Checks & Agents: diff --git a/web/htdocs/sidebar.js b/web/htdocs/sidebar.js index 2b6ad97..e829401 100644 --- a/web/htdocs/sidebar.js +++ b/web/htdocs/sidebar.js @@ -682,3 +682,40 @@ function toggle_folder(o, folderId) { next = null; img = null; } + +/************************************************ + * Save/Restore scroll position + *************************************************/ + +function setCookie(cookieName, value,expiredays) { + var exdate = new Date(); + exdate.setDate(exdate.getDate() + expiredays); + document.cookie = cookieName + "=" + escape(value) + + ((expiredays == null) ? "" : ";expires=" + exdate.toUTCString()); +} + +function getCookie(cookieName) { + if(document.cookie.length == 0) + return null; + + var cookieStart = document.cookie.indexOf(cookieName + "="); + if(cookieStart == -1) + return null; + + cookieStart = cookieStart + cookieName.length + 1; + var cookieEnd = document.cookie.indexOf(";", cookieStart); + if(cookieEnd == -1) + cookieEnd = document.cookie.length; + return unescape(document.cookie.substring(cookieStart, cookieEnd)); +} + +function initScrollPos() { + var scrollPos = getCookie('sidebarScrollPos'); + if(!scrollPos) + scrollPos = 0; + document.getElementById('side_content').scrollTop = scrollPos; +} + +function storeScrollPos() { + setCookie('sidebarScrollPos', document.getElementById('side_content').scrollTop, null); +} diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index d715b68..8dec507 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -133,7 +133,7 @@ def page_side(h): <script type="text/javascript" src="check_mk.js"></script> <script type="text/javascript" src="sidebar.js"></script> </head> -<body class="side"> +<body class="side" onload="initScrollPos()" onunload="storeScrollPos()"> <div id="check_mk_sidebar">""") views.html = h

14 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits