Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Added new 3ware agent code to support multiple controllers

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 978a47435d8b64192bf533798cb78c9a3afad432 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=978a47435d8b64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 7 10:39:44 2011 +0100 Added new 3ware agent code to support multiple controllers --- agents/check_mk_agent.linux | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2a07606..c81cbe4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -218,7 +218,7 @@ then do $WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' # In case of a timeout immediately leave loop. - if [ $? = 255 ] ; then break ; fi + if [ $? = 255 ] ; then break ; fi WAITMAX="waitmax 3" done fi @@ -227,7 +227,7 @@ fi # http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/megar… if which MegaCli >/dev/null ; then echo '<<<megaraid_pdisks>>>' - for part in $(MegaCli -EncInfo -aALL -NoLog < /dev/null | egrep 'Enclosure|Device ID'); do + for part in $(MegaCli -EncInfo -aALL -NoLog < /dev/null | egrep 'Enclosure|Device ID'); do [ $part == 'Enclosure' ] && echo -ne "\ndev2enc" echo -n " ${part//:/}" done @@ -239,15 +239,16 @@ fi # 3WARE disk controller (by Radoslaw Bak) if which tw_cli > /dev/null ; then - CONTROLLER=`tw_cli show | sed -n '4,$p' | cut -c1-2` - echo '<<<3ware_info>>>' - tw_cli /$CONTROLLER show all | egrep 'Model =|Firmware|Serial' - echo '<<<3ware_disks>>>' - tw_cli /$CONTROLLER show drivestatus | egrep 'p[0-9]' - echo '<<<3ware_units>>>' - tw_cli /$CONTROLLER show unitstatus | egrep 'u[0-9]' + for C in $(tw_cli show | awk 'NR < 4 { next } { print $1 }'); do + echo '<<<3ware_info>>>' + tw_cli /$C show all | egrep 'Model =|Firmware|Serial' + echo '<<<3ware_disks>>>' + tw_cli /$C show drivestatus | egrep 'p[0-9]' | sed "s/^/$C\//" + echo '<<<3ware_units>>>' + tw_cli /$C show unitstatus | egrep 'u[0-9]' | sed "s/^/$C\//" + done fi - + if which vcbVmName > /dev/null 2>&1 ; then echo '<<<vmware_state>>>' vcbVmName -s any

13 years, 8 months

Check_MK Git: check_mk: Catching more cross domain javascript errors

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2661bd540a23b245955868451276fa920d487daa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2661bd540a23b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 5 11:19:01 2011 +0100 Catching more cross domain javascript errors --- web/htdocs/js/sidebar.js | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index d132fd6..66a8b6f 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -26,7 +26,9 @@ var browser = navigator.userAgent.toLowerCase(); var weAreIEF__k = ((browser.indexOf("msie") != -1) && (browser.indexOf("opera") == -1)); var weAreOpera = browser.indexOf("opera") != -1; var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; -var contentLocation = parent.frames[1].document.location; +var contentLocation = null; +if(contentFrameAccessible()) + var contentLocation = parent.frames[1].document.location; // // Sidebar styling and scrolling stuff @@ -357,6 +359,18 @@ function getSnapinTargetPos() { * misc sidebar stuff *************************************************/ +// Checks if the sidebar can access the content frame. It might be denied +// by the browser since it blocks cross domain access. +function contentFrameAccessible() { + try { + var d = parent.frames[1].document; + d = null; + return true; + } catch (e) { + return false; + } +} + function debug(s) { window.parent.frames[1].document.write(s+'<br />'); } @@ -654,18 +668,6 @@ function sidebar_scheduler() { setTimeout(function(){sidebar_scheduler();}, 1000); } -// Checks if the sidebar can access the content frame. It might be denied -// by the browser since it blocks cross domain access. -function contentFrameAccessible() { - try { - var d = parent.frames[1].document; - d = null; - return true; - } catch (e) { - return false; - } -} - function addBookmark() { href = parent.frames[1].location; title = parent.frames[1].document.title;

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a597512fa502b9c42395ced53d45b2aa75f4913 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a597512fa502b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 5 16:21:39 2011 +0100 Updated bug entries --- .bugs/35 | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.bugs/35 b/.bugs/35 index f6f4478..f29b671 100644 --- a/.bugs/35 +++ b/.bugs/35 @@ -1,10 +1,11 @@ Title: View-Editor: Spalten-Editieren komfortabler machen Component: multisite +State: done +Class: feature +Date: 2010-12-21 20:51:19 Benefit: 3 -State: open Cost: 4 -Date: 2010-12-21 20:51:19 -Class: feature +Fun: 0 Das aktuelle Prinzip ist eh doof, weil man keine Spalten in der Mitte einfügen kann. Das müsste man irgendwie über Javascript hinbekommen. @@ -25,3 +26,13 @@ Apache trotzdem an. Und dass man dann nicht html.var() verwendet, sondern eine Hilfsfunktion, die mehrfach genannte Variablen konserviert und z.B. als Array zur Verfügung stellt. + +2011-01-05 16:21:34: changed state open -> done +Ich habs nun so gebaut, dass die IDs/Namen im DOM Baum umgebogen werden. Das mit den gleichen +HTML Variablen hätte - soweit ich das gesehen habe - zuviele Auswirkungen auf allgemeinen Code +im Multisite. Da war es mir lieber die Arbeit in den speziellen Code für den View Editor zu stecken. + +Zudem musste ich um das dynamische Hinzufügen von Columns zu ermöglichen eine neue Ajax Anfrage +einbauen um den Code zum zeichnen der Felder nicht zu duplizieren. + +Scheint nun ganz gut zu funktionieren.

13 years, 8 months

Check_MK Git: check_mk: Columns in view editor can now be added/removed/ moved easily; Modified display_options defaults

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b1c938f8c797316582e7cf0d26eabb8db077b28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b1c938f8c7973… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 7 10:10:57 2011 +0100 Columns in view editor can now be added/removed/moved easily; Modified display_options defaults --- ChangeLog | 1 + web/htdocs/check_mk.css | 2 +- web/htdocs/htmllib.py | 4 +- web/htdocs/images/button_movedown_hi.png | Bin 0 -> 275 bytes web/htdocs/images/button_movedown_lo.png | Bin 0 -> 267 bytes web/htdocs/images/button_moveup_hi.png | Bin 0 -> 274 bytes web/htdocs/images/button_moveup_lo.png | Bin 0 -> 270 bytes web/htdocs/js/check_mk.js | 145 ++++++++++++++++++++++++++++- web/htdocs/views.py | 100 +++++++++++++++------ web/plugins/pages/shipped.py | 1 + 10 files changed, 217 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4b1c938f8c…

13 years, 8 months

Check_MK Git: check_mk: Catching javascript errors when pages from other domain are opened in content frame

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 47554f3a6108b5a78e377aa92784f0a59dc93f60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47554f3a6108b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 5 11:16:32 2011 +0100 Catching javascript errors when pages from other domain are opened in content frame --- ChangeLog | 1 + web/htdocs/js/sidebar.js | 51 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7f7bd8..93804b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * Fixed header displaying on views when the edit button is not shown to the user * View pages are not refreshed when at least one form (Filter, Commands, Display Options) is open + * Catching javascript errors when pages from other domain are opened in content frame Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 4fce77b..d132fd6 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -69,17 +69,32 @@ if (window.addEventListener) { // This is no 100% solution. When moving the mouse out of browser window // without moving the mouse over the edge elements the dragging is not ended. function registerEdgeListeners(obj) { - var edges; - if(!obj) - edges = [ parent.frames[1], document.getElementById('side_header'), document.getElementById('side_footer') ]; - else - edges = [ obj ]; - for(var i in edges) - if (window.addEventListener) - edges[i].addEventListener("mousemove", function(e) { stopDragScroll(e); snapinTerminateDrag(e); return false; }, false); - else - edges[i].onmousemove = function(e) { stopDragScroll(e); snapinTerminateDrag(e); return false; }; - edges = null; + var edges; + if (!obj) + edges = [ parent.frames[1], document.getElementById('side_header'), document.getElementById('side_footer') ]; + else + edges = [ obj ]; + + for(var i in edges) { + // It is possible to open other domains in the content frame - don't register + // the event in that case. It is not permitted by most browsers! + if(!contentFrameAccessible()) + continue; + + if (window.addEventListener) + edges[i].addEventListener("mousemove", function(e) { + stopDragScroll(e); + snapinTerminateDrag(e); + return false; + }, false); + else + edges[i].onmousemove = function(e) { + stopDragScroll(e); + snapinTerminateDrag(e); + return false; + }; + } + edges = null; } /************************************************ @@ -632,13 +647,25 @@ function sidebar_scheduler() { } // Detect page changes and re-register the mousemove event handler // in the content frame. another bad hack ... narf - if (contentLocation != parent.frames[1].document.location) { + if (contentFrameAccessible() && contentLocation != parent.frames[1].document.location) { registerEdgeListeners(parent.frames[1]); contentLocation = parent.frames[1].document.location; } setTimeout(function(){sidebar_scheduler();}, 1000); } +// Checks if the sidebar can access the content frame. It might be denied +// by the browser since it blocks cross domain access. +function contentFrameAccessible() { + try { + var d = parent.frames[1].document; + d = null; + return true; + } catch (e) { + return false; + } +} + function addBookmark() { href = parent.frames[1].location; title = parent.frames[1].document.title;

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 666fc5198ae603897fe2cf39a34caa27bccc0907 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=666fc5198ae603… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 5 10:34:40 2011 +0100 Updated bug entries --- .bugs/89 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/89 b/.bugs/89 new file mode 100644 index 0000000..05f0093 --- /dev/null +++ b/.bugs/89 @@ -0,0 +1,11 @@ +Title: Re-Enable StatsGroupBy deprecated warning (1.2i1) +Component: livestatus +Benefit: 5 +State: open +Cost: 1 +Date: 2011-01-05 10:33:21 +Class: cleanup + +StatsGroupBy ist deprecated. Die Warnung dazu erst ab 1.2i1 aktivieren: + +src/Query.cc:442

13 years, 8 months

Check_MK Git: check_mk: Removed deprecated warning for StatsGroupBy queries until 1.2i1

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59511d5c8f1f610dd9437ee5479931ff0e203505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59511d5c8f1f61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 5 10:41:24 2011 +0100 Removed deprecated warning for StatsGroupBy queries until 1.2i1 --- livestatus/src/Query.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 877b765..fac868e 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -419,7 +419,8 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { - logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. Please use Columns instead."); + // Can be re-enabled from 1.2i1 + //logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. Please use Columns instead."); parseColumnsLine(line); }

13 years, 8 months

Check_MK Git: check_mk: megaraid_ldisks: Fixed item detection to be compatible with different versions of megaraid

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a8afaa76495e5e26b92931e8658adde6d51f442b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8afaa76495e5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 4 17:24:03 2011 +0100 megaraid_ldisks: Fixed item detection to be compatible with different versions of megaraid --- ChangeLog | 1 + checks/megaraid_ldisks | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a66338..4ffece7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * cups_queues: fixed plugin error due to invalid import of datetime, converted other checks from 'from datetime import...' to 'import datetime'. * printer_supply: handle the case where the current value is missing + * megaraid_ldisks: Fixed item detection to be compatible with different versions of megaraid Livestatus: * new column pnpgraph_present in table host and service. In order for this diff --git a/checks/megaraid_ldisks b/checks/megaraid_ldisks index 8e9c360..8a023fd 100644 --- a/checks/megaraid_ldisks +++ b/checks/megaraid_ldisks @@ -34,23 +34,26 @@ def inventory_megaraid_ldisks(checkname, info): inventory = [] + adapter = None for line in info: if line[0] == "Adapter": adapter = int(line[1]) - elif line[0] == "Virtual" and line[1] == "Disk:": + elif line[0] == "Virtual" and (line[1] == "Disk:" or line[1] == "Drive:"): disk = int(line[2]) inventory.append( ("%d/%d" % (adapter, disk), "", None) ) return inventory def check_megaraid_ldisks(item, _no_params, info): + adapter = None for line in info: + print line if line[0] == "Adapter": adapter = int(line[1]) - elif line[0] == "Virtual" and line[1] == "Disk:": + elif line[0] == "Virtual" and (line[1] == "Disk:" or line[1] == "Drive:"): disk = int(line[2]) found = "%d/%d" % (adapter, disk) == item - elif found and line[0] == "State:": - state = " ".join(line[1:]) + elif found and line[0].startswith("State"): + state = " ".join(line[1:]).replace(': ', '') infotext = "state is %s" % state if state == "Optimal": return (0, "OK - " + infotext)

13 years, 8 months

Check_MK Git: check_mk: Added code to handle multiple vars of same name as lists

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8a6b784069a720bbc1a6aa93e18823fd5e030be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a6b784069a720… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 4 16:45:20 2011 +0100 Added code to handle multiple vars of same name as lists --- web/htdocs/htmllib.py | 3 +++ web/htdocs/index.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index aeba1c8..1b4b8a5 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -471,6 +471,9 @@ class html: def var(self, varname, deflt = None): return self.req.vars.get(varname, deflt) + def multivar(self, varname, deflt = None): + return self.req.multivars.get(varname, deflt) + def var_utf8(self, varname, deflt = None): return unicode(self.req.vars.get(varname, deflt), "utf-8") diff --git a/web/htdocs/index.py b/web/htdocs/index.py index c6b0cc8..765e05b 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -48,13 +48,14 @@ if defaults.omd_root: execfile(local_pagehandlers_dir + "/" + fn) def read_get_vars(req): + req.multivars = {} req.vars = {} if req.args: req.rawvars = util.parse_qs(req.args, True) for (key,values) in req.rawvars.items(): if len(values) >= 1: req.vars[key] = values[-1] - + req.multivars[key] = values def connect_to_livestatus(html): html.site_status = {}

13 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2094e67437d25a2098e206f9ca036c7a43a377bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2094e67437d25a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 4 17:24:10 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

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