Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65353 discussions

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

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: b2d44147228cb28f1f601fb1419a084fa12a7493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2d44147228cb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 20 18:32:10 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: The custom open/ close states of custom links are now stored for each user

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aeebf87cf85d0ce43137331218e6cbb38ccf2807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeebf87cf85d0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 19 13:57:29 2010 +0200 The custom open/close states of custom links are now stored for each user --- ChangeLog | 5 +++++ web/htdocs/sidebar.js | 13 +++++++------ web/plugins/sidebar/shipped.py | 21 ++++++++++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d2fccf..f2e9ed5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.1.9i1 + Multisite: + * The custom open/close states of custom links are now stored for each + user + 1.1.8b3: Core, Setup, etc.: * Added some Livestatus LQL examples to documentation diff --git a/web/htdocs/sidebar.js b/web/htdocs/sidebar.js index b90e7a1..5aaa037 100644 --- a/web/htdocs/sidebar.js +++ b/web/htdocs/sidebar.js @@ -639,14 +639,14 @@ function hilite_icon(oImg, onoff) { } -function toggle_folder(o) { +function toggle_folder(o, folderId) { var par = o.parentNode; var next = null; var one_more = false; var img = null; for (var i in par.childNodes) { - var child = par.childNodes[i]; + var child = par.childNodes[i]; if (one_more && child.nodeName == "DIV") { next = child; break; @@ -665,14 +665,15 @@ function toggle_folder(o) { if (next) { if (next.style.display == "none") { - next.style.display = ""; + next.style.display = ""; if (img) img.src = "images/link_folder_open.gif"; - } - else { - next.style.display = "none"; + get_url('customlink_openclose.py?name=' + escape(folderId) + '&state=on'); + } else { + next.style.display = "none"; if (img) img.src = "images/link_folder.gif"; + get_url('customlink_openclose.py?name=' + escape(folderId) + '&state=off'); } } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 0101c4e..a6ceaec 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -900,6 +900,20 @@ sidebar_snapins["bookmarks"] = { # # ------------------------------------------------------------ +def load_customlink_states(): + return config.load_user_file("customlinks", {}) + +def save_customlink_states(states): + config.save_user_file("customlinks", states) + +def ajax_customlink_openclose(h): + global html + html = h + + states = load_customlink_states() + states[html.var("name")] = html.var("state") + save_customlink_states(states) + def render_custom_links(): links = config.custom_links.get(config.role) if not links: @@ -907,19 +921,20 @@ def render_custom_links(): (defaults.default_config_dir + "/multisite.mk")) def render_list(ids, links): + states = load_customlink_states() n = 0 for entry in links: n += 1 try: if type(entry[1]) == type(True): - if entry[1]: # open + idss = ids + [str(n)] + if states.get(''.join(idss), entry[1] and 'on' or 'off') == 'on': # open display = "" img = "link_folder_open.gif" else: display = "none" img = "link_folder.gif" - idss = ids + [str(n)] - html.write('<h3 onclick="toggle_folder(this);" ') + html.write('<h3 onclick="toggle_folder(this, \'%s\');" ' % ''.join(idss)) html.write('onmouseover="this.style.cursor=\'pointer\';" ') html.write('onmouseout="this.style.cursor=\'auto\';">') html.write('<img src="images/%s">' % img)

14 years

Check_MK Git: check_mk: Made latest changes to megaraid_pdisks a bit stronger

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b444844f1c656e276db0e6fa594c0968b7a4f909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b444844f1c656e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 19 15:39:14 2010 +0200 Made latest changes to megaraid_pdisks a bit stronger --- checks/megaraid_pdisks | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index fed9ca1..6714f28 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -69,7 +69,10 @@ def check_megaraid_pdisks(item, target_state, info): if line[0] == "dev2enc": dev2enc[line[5]] = 'e'+line[2] elif line[0] == "Enclosure": - enclosure = item.startswith('e') and dev2enc[line[-1]] or line[-1] + if item.startswith('e') and line[-1] in dev2enc: + enclosure = dev2enc[line[-1]] + else: + enclosure = line[-1] elif line[0] == "Slot": slot = int(line[-1]) found = "%s/%d" % (enclosure, slot) == item

14 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits