Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Some cleanups and proper user provided data encoding

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c16db1cb7254df7d2f8225dd5b1eb7bcbe431e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c16db1cb7254d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 22 15:10:47 2013 +0200 Some cleanups and proper user provided data encoding --- web/htdocs/sidebar.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index f76968e..d932919 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -63,28 +63,28 @@ def load_plugins(): snapin["allowed"]) # Helper functions to be used by snapins -def link(text, target, frame="main"): +def link(text, url, target="main"): # Convert relative links into absolute links. We have three kinds # of possible links and we change only [3] # [1] protocol://hostname/url/link.py # [2] /absolute/link.py # [3] relative.py - if not (":" in target[:10]) and target[0] != '/': - target = defaults.url_prefix + "check_mk/" + target + if not (":" in url[:10]) and url[0] != '/': + url = defaults.url_prefix + "check_mk/" + url return '<a onfocus="if (this.blur) this.blur();" target="%s" ' \ - 'class=link href="%s">%s</a>' % (frame, target, html.attrencode(text)) + 'class=link href="%s">%s</a>' % (html.attrencode(target), html.attrencode(url), html.attrencode(text)) -def simplelink(text, target, frame="main"): - html.write(link(text, target, frame) + "<br>\n") +def simplelink(text, url, target="main"): + html.write(link(text, url, target) + "<br>\n") -def bulletlink(text, target, frame="main"): - html.write("<li class=sidebar>" + link(text, target, frame) + "</li>\n") +def bulletlink(text, url, target="main"): + html.write("<li class=sidebar>" + link(text, url, target) + "</li>\n") -def iconlink(text, target, icon): +def iconlink(text, url, icon): linktext = '<img class=iconlink src="images/icon_%s.png">%s' % \ - ( icon, text ) + (html.attrencode(icon), html.attrencode(text)) html.write('<a target=main class="iconlink link" href="%s">%s</a><br>' % \ - (target, linktext)) + (html.attrencode(url), linktext)) def footnotelinks(links): html.write("<div class=footnotelink>")

11 years

Check_MK Git: check_mk: Fixed validation problem on del_bookmark page

by Lars Michelsen

Module: check_mk Branch: master Commit: 11b60e3b6ddf231923db68c9985d5248294a9f76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11b60e3b6ddf23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 22 15:16:07 2013 +0200 Fixed validation problem on del_bookmark page --- web/htdocs/sidebar.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 8435f4e..672c2af 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -557,9 +557,15 @@ def ajax_switch_masterstate(): html.write(_("Command %s/%d not found") % (column, state)) def ajax_del_bookmark(): - num = int(html.var("num")) + try: + num = int(html.var("num")) + except ValueError: + raise MKGeneralException(_("Invalid bookmark id.")) bookmarks = load_bookmarks() - del bookmarks[num] + try: + del bookmarks[num] + except IndexError: + raise MKGeneralException(_("Unknown bookmark id: %d. This is probably a problem with reload or browser history. Please try again.") % htmllib.attrencode(num)) save_bookmarks(bookmarks) render_bookmarks() @@ -591,7 +597,7 @@ def page_edit_bookmark(): raise MKGeneralException(_("Invalid bookmark id.")) bookmarks = load_bookmarks() if n >= len(bookmarks): - raise MKGeneralException(_("Unknown bookmark id: %d. This is probably a problem with reload or browser history. Please try again.") % n) + raise MKGeneralException(_("Unknown bookmark id: %d. This is probably a problem with reload or browser history. Please try again.") % htmllib.attrencode(n)) if html.var("save") and html.check_transaction(): title = html.var("title")

11 years

Check_MK Git: check_mk: improvements to genuscreen carp check,

by Götz Golla

check manpage added Message-ID: <526683fb.tgPlFxB8Xdj4/JeI%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: fa48fdbcbac79f31e258ac25ab53d5c4618597b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa48fdbcbac79f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 22 15:55:24 2013 +0200 improvements to genuscreen carp check, check manpage added --- checkman/genua_carp | 29 +++++++++++++++++ checks/genua_carp | 87 ++++++++++++++++++++++----------------------------- 2 files changed, 66 insertions(+), 50 deletions(-) diff --git a/checkman/genua_carp b/checkman/genua_carp new file mode 100644 index 0000000..38f418f --- /dev/null +++ b/checkman/genua_carp @@ -0,0 +1,29 @@ +title: State of carp interfaces on carp clusters and nodes of genuscreen devices +agents: snmp +catalog: hw/network/genua +license: GPL +distribution: check_mk +description: + This check monitors the state of the carp interfaces of genuscreen devices. + It can be used on single hosts as well as clusters. For the latter, the nodes of + the carp cluster must be included in a Check_MK cluster, and the check must be configured as + clustered service with an approriate rule. Clusters with more then two nodes are + supported. + The check detects if it is called on a cluster or a node. For a node the + interface and carp state of the carp interface items are checked. + For a cluster the check determines the number of carp interfaces on the cluster with + the state master. If it is either {0} or {>1} the check is critical. + + The check is known to run with genuscreen version 3.0, others may also work. + +perfdata: + None + +inventory: + The inventory process checks if the device has a system description OIDs (.1.3.6.1.2.1.1.2.0) + and if the name of this OID contains "genuscreen" (case insensitive). + If this is true the system is inventorized. + +item: + The name of the carp interfaces + diff --git a/checks/genua_carp b/checks/genua_carp index 9cc97ae..f84faa4 100644 --- a/checks/genua_carp +++ b/checks/genua_carp @@ -40,7 +40,6 @@ def inventory_genua_carp(info): - inventory = [] if info[0]: @@ -88,19 +87,24 @@ def check_genua_carp(item, _no_params, info): if not info[0]: return(3, "Invalid Output from Agent") state = 0 - nodes = 0 + nodes = len(info) masters = 0 + if nodes > 1: + prefix = "Cluster test: " + else: + prefix = "Node test: " # Loop over all nodes, just one line if not a cluster for line in info: - nodes += 1 # Loop over interfaces on node for ifIndex, ifName, ifType, ifLinkState, ifCarpState in line: ifTypeStr = genua_iftype(str(ifType)) ifLinkStateStr = genua_linkstate(str(ifLinkState)) ifCarpStateStr = genua_carpstate(str(ifCarpState)) # is inventorized interface in state carp master ? - output = "IfName: %s IfType: %s " % (ifName, ifTypeStr) + if ifName == item: + output = "node in carp state %s with IfLinkState %s" \ + % (ifCarpStateStr,ifLinkStateStr) if ifName == item and ifCarpState == "2": # is master masters += 1 @@ -108,45 +112,30 @@ def check_genua_carp(item, _no_params, info): # first master if ifLinkState == "2": state = 0 - output += "IfLinkState: %s IfCarpState: %s" \ - % (ifLinkStateStr, ifCarpStateStr) elif ifLinkState == "1": state = 2 - output += "IfLinkState: %s (!!) IfCarpState: %s " \ - % (ifLinkStateStr, ifCarpStateStr) elif ifLinkState in [ "0", "3" ]: state = 1 - output += "IfLinkState: %s (!) IfCarpState: %s " \ - % (ifLinkStateStr, ifCarpStateStr) else: state = 3 - output += "IfLinkState: %s IfCarpState: %s (!) " \ - % (ifLinkStateStr, ifCarpStateStr) - return(state, output) else: - output = "%d masters found on cluster IF %s with %d nodes" \ - % (masters,item,nodes) - return (2, output) - # carp backup - elif ifName == item and ifCarpState == "1" and ifLinkState == "1": - state = 0 - output += "IfLinkState: %s IfCarpState: %s" \ - % (ifLinkStateStr, ifCarpStateStr) - # carp init - elif ifName == item and ifCarpState == "0": - state = 1 - output += "IfLinkState: %s IfCarpState: %s (!) " \ - % (ifLinkStateStr, ifCarpStateStr) - else: - state = 1 - output += "IfLinkState: %s (!) IfCarpState: %s (!)" \ - % (ifLinkStateStr, ifCarpStateStr) + state = 2 + output = "%d masters found on cluster with %d nodes" \ + % (masters,nodes) + # look for non-masters, only interesting if no cluster + elif ifName == item and nodes == 1: + # carp backup + if ifCarpState == "1" and ifLinkState == "1": + state = 0 + else: + state = 1 - if nodes > 1: - # Called for cluster, and no master found + # no masters found in cluster + if nodes > 1 and masters == 0: state = 2 - output = "No master found on cluster IF %s with %d nodes" % (item, nodes) + output = "No master found on cluster with %d nodes" % nodes + output = prefix + output return(state, output) check_info['genua_carp'] = { @@ -155,28 +144,26 @@ check_info['genua_carp'] = { "service_description": "Carp Interface %s", "has_perfdata" : False, "snmp_info" : [( ".1.3.6.1.4.1.3717.2.1.2",[ - 1.1, # "ifIndex" - 1.2, # "ifName" - 1.3, # "ifType" - 1.4, # "ifLinkState" - 1.7, # "ifCarpState" + "1.1", # "ifIndex" + "1.2", # "ifName" + "1.3", # "ifType" + "1.4", # "ifLinkState" + "1.7", # "ifCarpState" ])], - "snmp_scan_function" : lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and oid(".1.3.6.1.4.1.3717.2.1.2.1.7") != None, + "snmp_scan_function" : lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() } -check_info['genua_carp_bad-eoid'] = { +check_info['genua_carp_bad_eoid'] = { "inventory_function" : inventory_genua_carp, "check_function" : check_genua_carp, "service_description": "Carp Interface %s", "has_perfdata" : False, - "snmp_info" : ( ".1.3.6.1.4.1.3137.2.1.2",[ - 1.1, # "ifIndex" - 1.2, # "ifName" - 1.3, # "ifType" - 1.4, # "ifLinkState" - 1.7, # "ifCarpState" - ]), - "snmp_scan_function" : lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and oid(".1.3.6.1.4.1.3137.2.1.2.1.7") != None + "snmp_info" : [( ".1.3.6.1.4.1.3137.2.1.2",[ + "1.1", # "ifIndex" + "1.2", # "ifName" + "1.3", # "ifType" + "1.4", # "ifLinkState" + "1.7", # "ifCarpState" + ])], + "snmp_scan_function" : lambda oid: "genuscreen" in oid(".1.3.6.1.2.1.1.1.0").lower() }

11 years

Check_MK Git: check_mk: FIX: mail with graph plugin: set explicit session. save_path for php

by Andreas Boesl

Module: check_mk Branch: master Commit: 2c8408298cd9f8e2eee8d0a6ba49d82e65f98ae1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c8408298cd9f8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 22 11:57:12 2013 +0200 FIX: mail with graph plugin: set explicit session.save_path for php --- ChangeLog | 2 ++ notifications/mail | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 67ab390..a5c9951 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ Notifications: * Blacklisting for services in the felixble notification system + * FIX: mail with graph plugin: set explicit session.save_path for php + Fixes instances where the php command couldn't fetch any graphs Checks & Agents: * diskstat: removed (ever incorrect) latency computation for Linux diff --git a/notifications/mail b/notifications/mail index 6127843..7303115 100755 --- a/notifications/mail +++ b/notifications/mail @@ -329,14 +329,16 @@ def fetch_pnp_data(context, params): try: # Autodetect the path in OMD environments path = "%s/share/pnp4nagios/htdocs/index.php" % context['OMD_ROOT'] + php_save_path = "-d session.save_path=%s/tmp/php/session" % context['OMD_ROOT'] except: # Non-omd environment - use plugin argument 1 path = context.get('PARAMETER_1', '') + php_save_path = "" # Using default path if not os.path.exists(path): raise GraphException('Unable to locate pnp4nagios index.php (%s)' % path) - return os.popen('REMOTE_USER="%s" php %s "%s"' % (context['CONTACTNAME'], path, params)).read() + return os.popen('REMOTE_USER="%s" php %s %s "%s"' % (context['CONTACTNAME'], php_save_path, path, params)).read() def fetch_num_sources(context): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC']

11 years

Check_MK Git: check_mk: Updated bug entries #0817, #0900, #0828

by Mathias Kettner

Module: check_mk Branch: master Commit: 76c96dba7106fe1bc904e4e52c4021417da9912a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76c96dba7106fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 21 21:04:26 2013 -0400 Updated bug entries #0817, #0900, #0828 --- .bugs/817 | 7 +++++-- .bugs/828 | 2 +- .bugs/900 | 9 +++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.bugs/817 b/.bugs/817 index 293b0b9..d3348df 100644 --- a/.bugs/817 +++ b/.bugs/817 @@ -1,12 +1,15 @@ Title: PING check removed when legacy check added to host Component: core -State: open +Class: nastiness +State: done Date: 2012-10-23 10:15:13 Targetversion: 1.2.3 -Class: nastiness The PING check should remain on the host when the host has the tag "ping" assigned, event when a legacy check has been added to the host. Resolution: Create a WATO rule for check_icmp as active check. That way the user can do all he wants... + +2013-10-21 21:00:00: changed state open -> done +Rule for check_icmp already exists. diff --git a/.bugs/828 b/.bugs/828 index b652b6c..edae99c 100644 --- a/.bugs/828 +++ b/.bugs/828 @@ -3,7 +3,7 @@ Component: checks State: open Date: 2013-08-19 09:38:38 Targetversion: future -Class: nastiness +Class: bug If using Debian 6 with flexible notification system, plain e mail and umlauts in alias, the mail never receives the mail. Reason is the missing c.utf8 locale. In german debian versions, diff --git a/.bugs/900 b/.bugs/900 index 3dc9cfe..93b70da 100644 --- a/.bugs/900 +++ b/.bugs/900 @@ -1,9 +1,9 @@ Title: Check_MK does not handle interval_length != 60 correctly Component: multisite -State: open +Class: nastiness +State: wontfix Date: 2013-02-15 14:30:58 Targetversion: future -Class: nastiness Reveived via feedback@: @@ -32,3 +32,8 @@ results in display within check_mk GUI: Service normal/retry check interval600s/180s It seems to be a bug in the display only, checks are running correctly. + +2013-10-21 20:56:06: changed state open -> wontfix +Setting interval_length != 60 is not only deprecated, but also not +neccessary any more. Floating point numbers can be used as an +interval length, e.g. 0.01666 for one second.

11 years

Check_MK Git: check_mk: Multisite: add animated triangle to foldable sections

by Mathias Kettner

Module: check_mk Branch: master Commit: 352f786a3a4496a860e59ae633d4c6a9612a5f2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=352f786a3a4496… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 21 20:54:28 2013 -0400 Multisite: add animated triangle to foldable sections --- .bugs/1002 | 6 ++++-- ChangeLog | 1 + web/htdocs/check_mk.css | 3 +++ web/htdocs/htmllib.py | 44 ++------------------------------------------ web/htdocs/js/checkmk.js | 2 ++ 5 files changed, 12 insertions(+), 44 deletions(-) diff --git a/.bugs/1002 b/.bugs/1002 index 48608b1..bba30dd 100644 --- a/.bugs/1002 +++ b/.bugs/1002 @@ -1,11 +1,13 @@ Title: Use triangle as indicator that a view is hidden (or not hidden) Component: multisite -State: open +Class: nastiness +State: done Date: 2013-09-11 13:19:55 Targetversion: future -Class: nastiness In the WATO as well as the multisite GUI views/topic can be hidden by clicking on the title. This may confuse a user in some occasions, because it may not be clear if the topic is hidden, or no item were found under that topic. Therefore a triangle as indicator if the topic is hidden or not should be very useful. + +2013-10-21 20:53:20: changed state open -> done diff --git a/ChangeLog b/ChangeLog index 8b5b781..67ab390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ (needs to be confgured per view via the view editor) * Wiki Sidebar Snapin: showing navigation and quicksearch. OMD only. * Sidebar can now be folded. Simply click somewhere at the left 10 pixels. + * Foldable sections now have an animated triangle icon that shows the folding state * FIX: Fixed encoding problem in webservice column output * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 3a760ad..41169e0 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -245,6 +245,9 @@ img.treeangle { margin-right: 3px; margin-top: 0px; } +img.treeangle.nform { + margin-left: -5px; +} b.treeangle.title { font-weight: bold; color: #ffffff; diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 88226a1..115fef1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1155,48 +1155,6 @@ class html: def begin_foldable_container(self, treename, id, isopen, title, indent = True, first = False): self.folding_indent = indent # try to get persisted state of tree - tree_state = weblib.get_tree_states(treename) - - if id in tree_state: - isopen = tree_state[id] == "on" - - img_num = isopen and "90" or "00" - onclick = ' onclick="toggle_foldable_container(\'%s\', \'%s\')"' % (treename, id) - onclick += ' onmouseover="this.style.cursor=\'pointer\';" ' - onclick += ' onmouseout="this.style.cursor=\'auto\';" ' - - if indent == "nform": - self.write('<tr class=heading><td id="nform.%s.%s" %s colspan=2>' % (treename, id, onclick)) - self.write('%s</td></tr>' % title) - else: - self.write('<img align=absbottom class="treeangle" id="treeimg.%s.%s" ' - 'src="images/tree_%s.png" %s>' % - (treename, id, img_num, onclick)) - if title.startswith('<'): # custom HTML code - self.write(title) - if indent != "form": - self.write("<br>") - else: - self.write('<b class="treeangle title" class=treeangle %s>%s</b><br>' % - (onclick, title)) - - indent_style = "padding-left: %dpx; " % (indent == True and 15 or 0) - if indent == "form": - self.write("</td></tr></table>") - indent_style += "margin: 0; " - self.write('<ul class="treeangle %s" style="%s" id="tree.%s.%s">' % - (isopen and "open" or "closed", indent_style, treename, id)) - - # give caller information about current toggling state (needed for nform) - return isopen - - def end_foldable_container(self): - if self.folding_indent != "nform": - self.write("</ul>") - - def begin_foldable_container(self, treename, id, isopen, title, indent = True, first = False): - self.folding_indent = indent - # try to get persisted state of tree tree_state = self.get_tree_states(treename) if id in tree_state: @@ -1209,6 +1167,8 @@ class html: if indent == "nform": self.write('<tr class=heading><td id="nform.%s.%s" %s colspan=2>' % (treename, id, onclick)) + self.write('<img align=absbottom class="treeangle nform" src="images/tree_%s.png">' % ( + isopen and "90" or "00")) self.write('%s</td></tr>' % title) else: self.write('<img align=absbottom class="treeangle" id="treeimg.%s.%s" ' diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 883b29d..929711f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1055,6 +1055,8 @@ function toggle_foldable_container(treename, id) { // Check, if we fold a NG-Norm var oNform = document.getElementById('nform.' + treename + '.' + id); if (oNform) { + var oImg = oNform.childNodes[0]; + toggle_folding(oImg, oImg.src[oImg.src.length - 6] == '0'); var oTr = oNform.parentNode.nextSibling; toggle_tree_state(treename, id, oTr); }

11 years

Check_MK Git: check_mk: Persist folding state of sidebar per user

by Mathias Kettner

Module: check_mk Branch: master Commit: 07066b4ea702ebdf093535f747efa53d234a9b46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07066b4ea702eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 21 16:18:00 2013 -0400 Persist folding state of sidebar per user --- web/htdocs/images/side_fold.png | Bin 452 -> 488 bytes web/htdocs/js/sidebar.js | 5 ++- web/htdocs/sidebar.py | 71 +++++++++++++++++++++++++++------------ web/plugins/pages/shipped.py | 1 + 4 files changed, 54 insertions(+), 23 deletions(-) diff --git a/web/htdocs/images/side_fold.png b/web/htdocs/images/side_fold.png index 8da7a90..8a3df4f 100644 Binary files a/web/htdocs/images/side_fold.png and b/web/htdocs/images/side_fold.png differ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 86f5b48..0aa98c8 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -535,6 +535,7 @@ function dragScroll(event) { function foldSidebar() { + sidebar_folded = true; document.getElementById('check_mk_sidebar').style.position = "relative"; document.getElementById('check_mk_sidebar').style.left = "-265px"; if (isWebkit()) { @@ -545,7 +546,7 @@ function foldSidebar() } else parent.document.body.cols = "10,*"; - sidebar_folded = true; + get_url('sidebar_fold.py?fold=yes'); } @@ -555,9 +556,11 @@ function unfoldSidebar() document.getElementById('check_mk_sidebar').style.left = "0"; parent.document.body.cols = "280,*"; sidebar_folded = false; + get_url('sidebar_fold.py?fold='); } + /************************************************ * Mausrad scrollen *************************************************/ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index da0a521..f76968e 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -112,19 +112,33 @@ def nagioscgilink(text, target): def heading(text): html.write("<h3>%s</h3>\n" % html.attrencode(text)) +# Load current state of user's sidebar. Convert from +# old format (just a snapin list) to the new format +# (dictionary) on the fly def load_user_config(): path = config.user_confdir + "/sidebar.mk" try: user_config = eval(file(path).read()) + if type(user_config) == list: + user_config = { + "snapins" : user_config, + "fold": False, + } except: - user_config = config.sidebar + user_config = { + "snapins": config.sidebar, + "fold": False, + } # Remove entries the user is not allowed for or which have state "off" (from legacy version) # silently skip configured but not existant snapins - return [ entry for entry in user_config - if entry[0] in sidebar_snapins - and entry[1] != "off" - and config.may("sidesnap." + entry[0])] + user_config["snapins"] = [ + entry for entry in user_config["snapins"] + if entry[0] in sidebar_snapins + and entry[1] != "off" + and config.may("sidesnap." + entry[0])] + + return user_config def save_user_config(user_config): if config.may("general.configure_sidebar"): @@ -172,6 +186,9 @@ def sidebar_foot(): _("© <a target=\"_blank\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) html.write('</div>') + if load_user_config()["fold"]: + html.final_javascript("foldSidebar();") + # Standalone sidebar def page_side(): if not config.may("general.see_sidebar"): @@ -196,7 +213,7 @@ def page_side(): scrolling = ' class=scroll' html.write('<div id="side_content"%s>' % scrolling) - for name, state in user_config: + for name, state in user_config["snapins"]: if not name in sidebar_snapins or not config.may("sidesnap." + name): continue # Performs the initial rendering and might return an optional refresh url, @@ -224,7 +241,7 @@ def page_side(): html.write("if (contentFrameAccessible()) { update_content_location(); };\n") html.write("</script>\n") - html.write("</body>\n</html>") + html.body_end() def render_snapin(name, state): snapin = sidebar_snapins.get(name) @@ -298,15 +315,22 @@ def snapin_exception(e): "<h2>%s</h2>\n" "<p>%s</p></div>" % (_('Error'), e)) +def ajax_fold(): + config = load_user_config() + config["fold"] = not not html.var("fold") + save_user_config(config) + + def ajax_openclose(): config = load_user_config() - new_config = [] - for name, usage in config: + new_snapins = [] + for name, usage in config["snapins"]: if html.var("name") == name: usage = html.var("state") if usage != "off": - new_config.append((name, usage)) - save_user_config(new_config) + new_snapins.append((name, usage)) + config["snapins"] = new_snapins + save_user_config(config) def ajax_snapin(): # Update online state of the user (if enabled) @@ -362,11 +386,11 @@ def move_snapin(): snapname_to_move = html.var("name") beforename = html.var("before") - snapin_config = load_user_config() + user_config = load_user_config() # Get current state of snaping being moved (open, closed) snap_to_move = None - for name, state in snapin_config: + for name, state in user_config["snapins"]: if name == snapname_to_move: snap_to_move = name, state if not snap_to_move: @@ -374,29 +398,32 @@ def move_snapin(): # Build new config by removing snaping at current position # and add before "beforename" or as last if beforename is not set - new_config = [] - for name, state in snapin_config: + new_snapins = [] + for name, state in user_config["snapins"]: if name == snapname_to_move: continue # remove at this position elif name == beforename: - new_config.append(snap_to_move) - new_config.append( (name, state) ) + new_snapins.append(snap_to_move) + new_snapins.append( (name, state) ) if not beforename: # insert as last - new_config.append(snap_to_move) - save_user_config(new_config) + new_snapins.append(snap_to_move) + + user_config["snapins"] = new_snapins + save_user_config(user_config) def page_add_snapin(): if not config.may("general.configure_sidebar"): raise MKGeneralException(_("You are not allowed to change the sidebar.")) html.header(_("Available snapins"), stylesheets=["pages", "sidebar", "status"]) - used_snapins = [name for (name, state) in load_user_config()] + used_snapins = [name for (name, state) in load_user_config()["snapins"]] addname = html.var("name") if addname in sidebar_snapins and addname not in used_snapins and html.check_transaction(): - user_config = load_user_config() + [(addname, "open")] + user_config = load_user_config() + user_config["snapins"].append((addname, "open")) save_user_config(user_config) - used_snapins = [name for (name, state) in load_user_config()] + used_snapins = [name for (name, state) in load_user_config()["snapins"]] html.reload_sidebar() names = sidebar_snapins.keys() diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index c0620b2..d2c7724 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -62,6 +62,7 @@ pagehandlers.update({ "side" : sidebar.page_side, "sidebar_add_snapin" : sidebar.page_add_snapin, "sidebar_snapin" : sidebar.ajax_snapin, + "sidebar_fold" : sidebar.ajax_fold, "sidebar_openclose" : sidebar.ajax_openclose, "sidebar_move_snapin" : sidebar.move_snapin, "sidebar_ajax_speedometer" : sidebar.ajax_speedometer,

11 years

Check_MK Git: check_mk: FIX: EC snapin: handle case when EC not running

by Mathias Kettner

Module: check_mk Branch: master Commit: 737e4a3b9a19a1cb5fa88cd69261d4b5a70f2bfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=737e4a3b9a19a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 21 15:53:15 2013 -0400 FIX: EC snapin: handle case when EC not running --- mkeventd/web/plugins/sidebar/mkeventd.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/sidebar/mkeventd.py b/mkeventd/web/plugins/sidebar/mkeventd.py index cc051fd..a8dfd93 100644 --- a/mkeventd/web/plugins/sidebar/mkeventd.py +++ b/mkeventd/web/plugins/sidebar/mkeventd.py @@ -36,9 +36,15 @@ def render_mkeventd_performance(): html.write("<tr><td class=left>%s:</td>" "<td class=right><strong>%s</strong></td></tr>" % (left, right)) + try: + raw_data = mkeventd.query("GET status") + except: + html.write(_("Event Console is not running.")) + return + html.write("<table class=\"content_center mkeventd_performance\">\n") - raw_data = mkeventd.query("GET status") + data = dict(zip(raw_data[0], raw_data[1])) columns = [ (_("Received messages"), "message", "%.2f/s"),

11 years

Check_MK Git: check_mk: Wiki-Snapin: fix error in exception message

by Mathias Kettner

Module: check_mk Branch: master Commit: 8ea57c600c318e4632a7db3d1982ef97e9c192c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea57c600c318e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 21 15:51:25 2013 -0400 Wiki-Snapin: fix error in exception message --- web/plugins/sidebar/shipped.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 7933dd8..97e6320 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1144,7 +1144,8 @@ def render_wiki(): if ul_started == True: html.write("</ul>") except IOError: - html.write("You have to create a <a href='/%s/wiki/doku.php?id=%s'>sidebar</a> first" % defaults.omd_sites ) + html.write("You have to create a <a href='/%s/wiki/doku.php?id=%s'>sidebar</a> first" % + (defaults.omd_site, _("sidebar") )) if defaults.omd_root: sidebar_snapins["wiki"] = { @@ -1186,7 +1187,7 @@ if defaults.omd_root: font-size: 8pt; width: 194px; height: 25px; - background-image: url("images/search_field_bg.png"); + background-image: url("images/quicksearch_field_bg.png"); background-repeat: no-repeat; -moz-border-radius: 0px; border-style: none;

11 years

Check_MK Git: check_mk: Multisite: make sidebar foldable

by Mathias Kettner

Module: check_mk Branch: master Commit: 1c4114b5f3c2a7f387604b85752a905ed1e499e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c4114b5f3c2a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 21 12:24:23 2013 -0400 Multisite: make sidebar foldable simply click on the left 10 pixels of the screen. Tested on Firefox and Chrome. Please report problems in IE if you experiance any... --- ChangeLog | 3 ++- web/htdocs/images/side_fold.png | Bin 0 -> 452 bytes web/htdocs/js/sidebar.js | 38 +++++++++++++++++++++++++++++++++++++- web/htdocs/sidebar.css | 17 ++++++++++++++++- web/htdocs/sidebar.py | 5 +++-- 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9d0fde..8b5b781 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,7 +23,8 @@ * Added host aliases filter to some views (host/service search) * It is now possible to enforce checkboxes in views upon view loading (needs to be confgured per view via the view editor) - * Wiki Sitebar Snapin: showing navigation and quicksearch. OMD only. + * Wiki Sidebar Snapin: showing navigation and quicksearch. OMD only. + * Sidebar can now be folded. Simply click somewhere at the left 10 pixels. * FIX: Fixed encoding problem in webservice column output * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses diff --git a/web/htdocs/images/side_fold.png b/web/htdocs/images/side_fold.png new file mode 100644 index 0000000..8da7a90 Binary files /dev/null and b/web/htdocs/images/side_fold.png differ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index be179e1..86f5b48 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -29,6 +29,8 @@ var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namor var g_orig_title = null; var g_content_loc = null; +var sidebar_folded = false; + // // Sidebar styling and scrolling stuff // @@ -461,10 +463,19 @@ function startDragScroll(event) { if (!event) event = window.event; + if (sidebar_folded) { + unfoldSidebar(); + return false; + } + else if (!sidebar_folded && event.clientX < 10) { + foldSidebar(); + return false; + } + + var target = getTarget(event); var button = getButton(event); - // Evtl. auch nur mit Shift Taste: (e.button == 0 && (e["shiftKey"]) if (dragging === false && button == 'LEFT' && target.tagName != 'A' && target.tagName != 'INPUT' @@ -522,6 +533,31 @@ function dragScroll(event) { return false; } +function foldSidebar() +{ + document.getElementById('check_mk_sidebar').style.position = "relative"; + document.getElementById('check_mk_sidebar').style.left = "-265px"; + if (isWebkit()) { + var oldcols = parent.document.body.cols.split(","); + var oldwidth = parseInt(oldcols[0]); + var new_width = 10.0 / 280.0 * oldwidth; + parent.document.body.cols = new_width.toString() + ",*"; + } + else + parent.document.body.cols = "10,*"; + sidebar_folded = true; +} + + +function unfoldSidebar() +{ + document.getElementById('check_mk_sidebar').style.position = ""; + document.getElementById('check_mk_sidebar').style.left = "0"; + parent.document.body.cols = "280,*"; + sidebar_folded = false; +} + + /************************************************ * Mausrad scrollen *************************************************/ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 6dacbd7..0a8ed02 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -61,10 +61,25 @@ body.side { #side_header a { display: block; - width: 100%; + width: 255px; height: 55px; text-decoration: none; + margin-left: 10px; /* space for sidebar folding */ +} + +#side_fold { + position: absolute; + left: 0px; + top: 0px; + width: 10px; + height: 55px; } +#side_fold:hover { + background-repeat: no-repeat; + background-position: -3px 7px; + background-image: url("images/side_fold.png"); +} + #side_version { position: absolute; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 5f6b478..da0a521 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -131,8 +131,9 @@ def save_user_config(user_config): config.save_user_file("sidebar", user_config) def sidebar_head(): - html.write('<div id="side_header">' - '<a title="%s" target="main" href="%s">' + html.write('<div id="side_header">') + html.write('<div id="side_fold"></div>') + html.write('<a title="%s" target="main" href="%s">' '<div id="side_version">%s</div>' '</a>' '</div>\n' % (_("Go to main overview"), config.start_url, defaults.check_mk_version))

11 years

← Newer
1
...
8
9
10
11
12
13
14
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013