Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: FIX: missing $maxgb added and better formatting ( thanks to Daniel Roettgermann)

by Götz Golla

Module: check_mk Branch: master Commit: 9a1dd6012f949f787217e80911bb208ec07732a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a1dd6012f949f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 24 14:53:07 2013 +0200 FIX: missing $maxgb added and better formatting (thanks to Daniel Roettgermann) --- pnp-templates/check_mk-statgrab_mem.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pnp-templates/check_mk-statgrab_mem.php b/pnp-templates/check_mk-statgrab_mem.php index 69f30d2..7ee89dc 100644 --- a/pnp-templates/check_mk-statgrab_mem.php +++ b/pnp-templates/check_mk-statgrab_mem.php @@ -25,14 +25,17 @@ $opt[1] = "--vertical-label 'MEMORY(MB)' --upper-limit " . ($MAX[1] * 120 / 100) . " -l0 --title \"Memory usage $hostname\" "; +$maxgb = sprintf("%.1f", $MAX[1] / 1024.0); + $def[1] = "DEF:ram=$RRDFILE[1]:$DS[1]:AVERAGE " ; $def[1] .= "DEF:swap=$RRDFILE[2]:$DS[2]:AVERAGE " ; $def[1] .= "DEF:virt=$RRDFILE[3]:$DS[3]:AVERAGE " ; $def[1] .= "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" "; -$def[1] .= "HRULE:$MAX[1]#2040d0:\"RAM installed\" "; +$def[1] .= "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" "; $def[1] .= "HRULE:$WARN[3]#FFFF00:\"Warning\" "; $def[1] .= "HRULE:$CRIT[3]#FF0000:\"Critical\\n\" "; +$def[1] .= "'COMMENT:\\n' " ; $def[1] .= "AREA:ram#80ff40:\"RAM used \" " ; $def[1] .= "GPRINT:ram:LAST:\"%6.0lf MB last\" " ; $def[1] .= "GPRINT:ram:AVERAGE:\"%6.0lf MB avg\" " ;

10 years, 10 months

Check_MK Git: check_mk: New php template for jolokia_threads (

by Götz Golla

thanks to Daniel Roettgermann) Message-ID: <526920f0.SMLUgxQHN0ovaA26%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: 2cf4de96688599d0c44cee4267d6af75b155a9c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cf4de96688599… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 24 15:29:20 2013 +0200 New php template for jolokia_threads (thanks to Daniel Roettgermann) --- pnp-templates/check_mk-jolokia_metrics.threads.php | 60 ++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/pnp-templates/check_mk-jolokia_metrics.threads.php b/pnp-templates/check_mk-jolokia_metrics.threads.php new file mode 100644 index 0000000..ecbfc08 --- /dev/null +++ b/pnp-templates/check_mk-jolokia_metrics.threads.php @@ -0,0 +1,60 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +$title = str_replace("_", " ", $servicedesc); +$opt[1] = "--vertical-label 'ThreadRate' -l 0 --title \"ThreadRate of $title\" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ; +$def[1] .= "AREA:var1#F2F2F2:\"\" " ; +$def[1] .= "LINE1:var1#FF6600:\"ThreadRate \" " ; +$def[1] .= "GPRINT:var1:LAST:\"%3.2lf LAST \" "; +$def[1] .= "GPRINT:var1:MAX:\"%3.2lf MAX \" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"%3.2lf AVERAGE \" "; + + +$opt[2] = "--vertical-label \"ThreadCount\" -u102 -l0 --title \"Different ThreadCounts of $servicedesc\" "; +$def[2] = "DEF:var1=$RRDFILE[1]:$DS[2]:AVERAGE " ; +$def[2] .= "DEF:var2=$RRDFILE[1]:$DS[3]:AVERAGE " ; +$def[2] .= "DEF:var3=$RRDFILE[1]:$DS[4]:AVERAGE " ; +# +$def[2] .= "AREA:var1#FFFFFF:\"\" " ; +$def[2] .= "AREA:var2#FFFFFF:\"\" " ; +$def[2] .= "AREA:var3#FFFFFF:\"\" " ; +$def[2] .= "LINE1:var1#2B23FF:\"ThreadCount \" " ; +$def[2] .= rrd::gprint("var1", array("LAST", "MAX", "AVERAGE"),"%3.0lf"); +$def[2] .= "LINE1:var2#FF1420:\"DeamonThreadCount \" " ; +$def[2] .= rrd::gprint("var2", array("LAST", "MAX", "AVERAGE"),"%3.0lf"); +$def[2] .= "LINE1:var3#0CD524:\"PeakThreadCount \" " ; +$def[2] .= rrd::gprint("var3", array("LAST", "MAX", "AVERAGE"),"%3.0lf"); + +#TotalStartedThreadCount +$opt[3] = "--vertical-label \"TotalStartedThreadCount\" -l0 --title \"TotalStartedThreadCount of $title\" "; +# +$def[3] = "DEF:var1=$RRDFILE[1]:$DS[5]:AVERAGE " ; +$def[3] .= "AREA:var1#F2F2F2:\"\" " ; +$def[3] .= "LINE1:var1#FF6600:\"TotalStartedThreadCount \" " ; +$def[3] .= "GPRINT:var1:LAST:\"%3.0lf current \" "; +?> +

10 years, 10 months

Check_MK Git: check_mk: FIX: Escaping html code in plugin output painters

by Lars Michelsen

Module: check_mk Branch: master Commit: a590920a1706237078689bca644d21a74a460d7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a590920a170623… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 24 14:07:09 2013 +0200 FIX: Escaping html code in plugin output painters --- ChangeLog | 1 + web/htdocs/lib.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3424ed6..b34bfca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -604,6 +604,7 @@ * FIX: correctly display sub-minute check/retry intervals * FIX: fix logic of some numeric sorters * FIX: Improved user provided variable validation in view code + * FIX: Escaping html code in plugin output painters WATO: * FIX: fix layout of Auxiliary tags table diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index ce752f8..0119beb 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -245,7 +245,7 @@ def paint_host_list(site, hosts): return "", h def format_plugin_output(output, row = None): - output = output.replace("(!)", warn_marker) \ + output = html.attrencode(output).replace("(!)", warn_marker) \ .replace("(!!)", crit_marker) \ .replace("(?)", unknown_marker) if row and "[running on" in output:

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0875

by Lars Michelsen

Module: check_mk Branch: master Commit: 472f646f38db4821667afbddee9b7099f4a26df7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=472f646f38db48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 24 13:22:22 2013 +0200 Updated bug entries #0875 --- .bugs/875 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/875 b/.bugs/875 index 59bef6b..797111a 100644 --- a/.bugs/875 +++ b/.bugs/875 @@ -1,9 +1,12 @@ Title: Create ldap debugging page Component: multisite -State: open +Class: feature +State: done Date: 2013-01-07 08:43:52 Targetversion: future -Class: feature It would be nice to have a dedicated ldap connection debugging page which displays the configured ldap settings and maybe shows all objects reported by ldap. + +2013-10-24 13:22:06: changed state open -> done +Already done.

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0008, #0940, #0071

by Lars Michelsen

Module: check_mk Branch: master Commit: d90b7730c9cd0165a84f089fed8b9b270dda0cec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d90b7730c9cd01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 24 10:40:47 2013 +0200 Updated bug entries #0008, #0940, #0071 --- .bugs/71 | 8 ++++++-- .bugs/8 | 9 +++++++-- .bugs/940 | 7 +++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.bugs/71 b/.bugs/71 index a6eb4e3..f860a4d 100644 --- a/.bugs/71 +++ b/.bugs/71 @@ -1,8 +1,12 @@ Title: Disk IO read/write: Zu einem Check zusammenfassen Component: checks -State: open -Date: 2010-12-22 11:06:47 Class: feature +State: closed +Date: 2010-12-22 11:06:47 +Targetversion: future Wir reden vom Linux-Check. Dann einen gemeinsamen PNP-Graphen mit dem Windows-Check machen. Ist doch doof, wenn In und Out getrennte Graphen geben. + +2013-10-24 09:51:34: changed state open -> closed +Has been fixed a long time ago diff --git a/.bugs/8 b/.bugs/8 index 17e48ff..0f1a56e 100644 --- a/.bugs/8 +++ b/.bugs/8 @@ -1,8 +1,9 @@ Title: Inventurcheck: retry-interval konfigurieren Component: core -State: open -Date: 2010-12-21 10:59:01 Class: feature +State: works4me +Date: 2010-12-21 10:59:01 +Targetversion: future Eigentlich könnte der Inventurcheck doch - wenn er nicht OK ist - öfters laufen. Auf diese Art wird er schneller von selbst wieder grün, @@ -12,3 +13,7 @@ es oft macht (gilt das auch für den SNMP-Scan?). Lösung könnte sein: in main.mk inventory_check_retry = 5. Und diesen Wert per Default auf 5 setzen (5 Minuten). + +2013-10-24 09:48:31: changed state open -> works4me +This is already possible using the regular rule "Retry check interval for service checks". +I see no reason to introduce a new option for this. Closing.... diff --git a/.bugs/940 b/.bugs/940 index f493797..ff9bfae 100644 --- a/.bugs/940 +++ b/.bugs/940 @@ -1,9 +1,12 @@ Title: rrdtoolmodule.so installed two times in ~/lib/ Component: core -State: open +Class: nastiness +State: done Date: 2013-10-14 13:17:24 Targetversion: future -Class: nastiness The file rrdtoolmodule.so is installed in ~/lib/python (good) and also installed in ~/lib/python2.7/site-packages (bad) + +2013-10-24 09:39:17: changed state open -> done +Just fixed this in OMD.

10 years, 10 months

Check_MK Git: check_mk: FIX: check lgb_pdu_aux can now handle several items of one type with the

by Götz Golla

Module: check_mk Branch: master Commit: 46458abc8e77395eae364d649fcc0a71843f8f83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46458abc8e7739… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 24 10:52:18 2013 +0200 FIX: check lgb_pdu_aux can now handle several items of one type with the same TypeIndex but different SystemLabels --- checks/lgp_pdu_aux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/lgp_pdu_aux b/checks/lgp_pdu_aux index cc228d0..9c7c074 100644 --- a/checks/lgp_pdu_aux +++ b/checks/lgp_pdu_aux @@ -116,13 +116,13 @@ def inventory_lgp_pdu_aux(info): for id, pdu in info.iteritems(): # Using SystemLabel as index. But it is not uniq in all cases. # Adding the Type-Index to prevent problems - inv.append((pdu['Type'] + '-' + pdu['TypeIndex'], None)) + inv.append((pdu['Type'] + '-' + pdu['SystemLabel'] + '-' + pdu['TypeIndex'], None)) return inv def check_lgp_pdu_aux(item, params, info): info = lgp_pdu_aux_fmt(info) for id, pdu in info.iteritems(): - if item == pdu['Type'] + '-' + pdu['TypeIndex']: + if item == pdu['Type'] + '-' + pdu['SystemLabel'] + '-' + pdu['TypeIndex']: state = 0 output = [] perfdata = []

10 years, 10 months

Check_MK Git: check_mk: Added new snapin "Folders", which interacts with the views snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ef9cc7139d45c41124a6dee076b0db4750973d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ef9cc7139d45c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 24 09:13:30 2013 +0200 Added new snapin "Folders", which interacts with the views snapin --- ChangeLog | 2 + web/htdocs/js/sidebar.js | 57 +++++++++++++++++++++++++++- web/htdocs/sidebar.py | 10 +++-- web/plugins/sidebar/shipped.py | 4 +- web/plugins/sidebar/wato.py | 82 ++++++++++++++++++++++++---------------- 5 files changed, 115 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f25894..3424ed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ * 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 + * Added new snapin "Folders", which interacts with the views snapin when + both are enabled. You can use it to open views in a specific folder context * LDAP: Added option to make group and role sync plugin handle nested groups (only in Active Directory at the moment). Enabling this feature might increase the sync time a lot - use only when really needed. diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 0aa98c8..7e295d8 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -791,8 +791,63 @@ function storeScrollPos() { setCookie('sidebarScrollPos', document.getElementById('side_content').scrollTop, null); } +/************************************************ + * WATO Folders snapin handling + *************************************************/ + +// FIXME: Make this somehow configurable - use the start url? +g_last_view = 'dashboard.py?name=main'; +g_last_folder = ''; + +// highlight the followed link (when both needed snapins are available) +function highlight_link(link_obj, container_id) { + var this_snapin = document.getElementById(container_id); + if (container_id == 'snapin_container_wato_folders') + var other_snapin = document.getElementById('snapin_container_views'); + else + var other_snapin = document.getElementById('snapin_container_wato_folders'); + + if (this_snapin && other_snapin) { + if (this_snapin.getElementsByClassName) + var links = this_snapin.getElementsByClassName('link'); + else + var links = document.getElementsByClassName('link', this_snapin); + + for (var i = 0; i < links.length; i++) { + links[i].style = 'font-weight:normal;'; + } + + link_obj.style = 'font-weight:bold;'; + } +} + +function wato_folders_clicked(link_obj, folderpath) { + g_last_folder = folderpath; + highlight_link(link_obj, 'snapin_container_wato_folders'); + parent.frames[1].location = g_last_view + '&wato_folder=' + escape(g_last_folder); +} + +function wato_views_clicked(link_obj) { + g_last_view = link_obj.href; + + highlight_link(link_obj, 'snapin_container_views'); + + if (g_last_folder != '') { + // Navigate by using javascript, cancel following the default link + parent.frames[1].location = g_last_view + '&wato_folder=' + escape(g_last_folder); + return false; + } else { + // Makes use the url stated in href attribute + return true; + } +} + +/************************************************ + * WATO Foldertree (Standalone) snapin handling + *************************************************/ + /* Foldable Tree in snapin */ -function wato_tree_click(folderpath) { +function wato_tree_click(link_obj, folderpath) { var topic = document.getElementById('topic').value; var target = document.getElementById('target_' + topic).value; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 1fe55bd..1bb7f4c 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -63,7 +63,7 @@ def load_plugins(): snapin["allowed"]) # Helper functions to be used by snapins -def link(text, url, target="main"): +def link(text, url, target="main", onclick = None): # Convert relative links into absolute links. We have three kinds # of possible links and we change only [3] # [1] protocol://hostname/url/link.py @@ -71,14 +71,16 @@ def link(text, url, target="main"): # [3] relative.py if not (":" in url[:10]) and url[0] != '/': url = defaults.url_prefix + "check_mk/" + url + onclick = onclick and (' onclick="%s"' % html.attrencode(onclick)) or '' return '<a onfocus="if (this.blur) this.blur();" target="%s" ' \ - 'class=link href="%s">%s</a>' % (html.attrencode(target), html.attrencode(url), html.attrencode(text)) + 'class=link href="%s"%s>%s</a>' % \ + (html.attrencode(target), html.attrencode(url), onclick, html.attrencode(text)) def simplelink(text, url, target="main"): html.write(link(text, url, target) + "<br>\n") -def bulletlink(text, url, target="main"): - html.write("<li class=sidebar>" + link(text, url, target) + "</li>\n") +def bulletlink(text, url, target="main", onclick = None): + html.write("<li class=sidebar>" + link(text, url, target, onclick) + "</li>\n") def iconlink(text, url, icon): linktext = '<img class=iconlink src="images/icon_%s.png">%s' % \ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 97e6320..f526090 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -111,9 +111,9 @@ def render_views(): html.begin_foldable_container("views", topic, False, topic, indent=True) first = False if topic == _('Dashboards'): - bulletlink(title, 'dashboard.py?name=%s' % name) + bulletlink(title, 'dashboard.py?name=%s' % name, onclick = "return wato_views_clicked(this)") else: - bulletlink(title, "view.py?view_name=%s" % name) + bulletlink(title, "view.py?view_name=%s" % name, onclick = "return wato_views_clicked(this)") if not first: # at least one item rendered html.end_foldable_container() diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index cf124f5..539eed3 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -105,13 +105,7 @@ sidebar_snapins["admin_mini"] = { # | | # '----------------------------------------------------------------------' -def render_wato_foldertree(): - if not config.wato_enabled: - html.write(_("WATO is disabled in <tt>multisite.mk</tt>.")) - else: - render_wato_foldertree() - -def render_wato_foldertree(): +def compute_foldertree(): html.live.set_prepend_site(True) query = "GET hosts\n" \ "Stats: state >= 0\n" \ @@ -184,6 +178,35 @@ def render_wato_foldertree(): reduce_tree(folders) reduce_tree(user_folders) + return user_folders + + +def render_tree_folder(f, js_func): + subfolders = f.get(".folders", {}) + is_leaf = len(subfolders) == 0 + + # Suppress indentation for non-emtpy root folder + if f['.path'] == '' and is_leaf: + html.write("<ul>") # empty root folder + elif f and f['.path'] != '': + html.write("<ul style='padding-left: 0px;'>") + + title = '<a class="link" href="#" onclick="%s(this, \'%s\');">%s (%d)</a>' % ( + js_func, f[".path"], f["title"], f[".num_hosts"]) + + if not is_leaf: + html.begin_foldable_container('wato-hosts', "/" + f[".path"], False, title) + for sf in wato.api.sort_by_title(subfolders.values()): + render_tree_folder(sf, js_func) + html.end_foldable_container() + else: + html.write("<li>" + title + "</li>") + + html.write("</ul>") + + +def render_wato_foldertree(): + user_folders = compute_foldertree() # # Render link target selection @@ -220,34 +243,11 @@ def render_wato_foldertree(): # Now render the whole tree if user_folders: - render_tree_folder(user_folders.values()[0]) - -def render_tree_folder(f): - subfolders = f.get(".folders", {}) - is_leaf = len(subfolders) == 0 - - # Suppress indentation for non-emtpy root folder - if f['.path'] == '' and is_leaf: - html.write("<ul>") # empty root folder - elif f and f['.path'] != '': - html.write("<ul style='padding-left: 0px;'>") - - title = '<a href="#" onclick="wato_tree_click(\'%s\');">%s (%d)</a>' % ( - f[".path"], f["title"], f[".num_hosts"]) - - if not is_leaf: - html.begin_foldable_container('wato-hosts', "/" + f[".path"], False, title) - for sf in wato.api.sort_by_title(subfolders.values()): - render_tree_folder(sf) - html.end_foldable_container() - else: - html.write("<li>" + title + "</li>") - - html.write("</ul>") + render_tree_folder(user_folders.values()[0], 'wato_tree_click') sidebar_snapins['wato_foldertree'] = { - 'title' : _('Foldertree'), - 'description' : _('This snapin shows the folders defined in WATO. It can be used to open views filtered by the WATO folder.'), + 'title' : _('Foldertree (standalone)'), + 'description' : _('This snapin shows the folders defined in WATO. It can be used to open views filtered by the WATO folder. It works standalone, without interaction with any other snapin.'), 'render' : render_wato_foldertree, 'allowed' : [ 'admin', 'user', 'guest' ], 'styles' : """ @@ -273,3 +273,19 @@ sidebar_snapins['wato_foldertree'] = { } """ } + +def render_wato_folders(): + user_folders = compute_foldertree() + + if user_folders: + render_tree_folder(user_folders.values()[0], 'wato_folders_clicked') + +sidebar_snapins['wato_folders'] = { + 'title' : _('Folders'), + 'description' : _('This snapin shows the folders defined in WATO. It can ' + 'be used to open views filtered by the WATO folder. This ' + 'snapin interacts with the "Views" snapin, when both are ' + 'enabled.'), + 'render' : render_wato_folders, + 'allowed' : [ 'admin', 'user', 'guest' ], +}

10 years, 10 months

Check_MK Git: check_mk: Finally removed long deprecated snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: d42b4f72fc06086e288bd7f93893bbc7dbfeb22c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d42b4f72fc0608… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 23 16:07:10 2013 +0200 Finally removed long deprecated snapin --- web/plugins/sidebar/wato.py | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index d404f28..cf124f5 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -94,30 +94,6 @@ sidebar_snapins["admin_mini"] = { """, } - -# +----------------------------------------------------------------------+ -# | _____ _ _ _____ | -# | | ___|__ | | __| | ___ _ __ |_ _| __ ___ ___ | -# | | |_ / _ \| |/ _` |/ _ \ '__|____| || '__/ _ \/ _ \ | -# | | _| (_) | | (_| | __/ | |_____| || | | __/ __/ | -# | |_| \___/|_|\__,_|\___|_| |_||_| \___|\___| | -# | | -# +----------------------------------------------------------------------+ - -def render_wato_folders(): - if not config.wato_enabled: - html.write(_("WATO is disabled in <tt>multisite.mk</tt>.")) - else: - html.write(_('This snapin is deprecated. Please use the WATO foldertree snapin instead.')) - -sidebar_snapins["wato"] = { - "title" : _("Hosts"), - "description" : _("A foldable tree showing all your WATO folders and files - " - "allowing you to navigate in the tree while using views or being in WATO"), - "render" : render_wato_folders, - "allowed" : [ "admin", "user", "guest" ], -} - # .----------------------------------------------------------------------. # | _____ _ _ _ | # | | ___|__ | | __| | ___ _ __| |_ _ __ ___ ___ |

10 years, 10 months

Check_MK Git: check_mk: bug fix

by Götz Golla

Module: check_mk Branch: master Commit: cf5b07ef0ebbe16c02770d0481e8c5d69cb0d497 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf5b07ef0ebbe1… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 23 22:00:38 2013 +0200 bug fix --- checks/brocade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/brocade b/checks/brocade index 255a240..d71057d 100644 --- a/checks/brocade +++ b/checks/brocade @@ -62,7 +62,7 @@ def check_brocade_fan(item, params, info): warn, crit = params.get("lower") if params.get("upper"): upperwarn, uppercrit = params["upper"] - else + else: upperwarn, uppercrit = ( None, None ) for snmp_item, name, value in info:

10 years, 10 months

Check_MK Git: check_mk: FIX: port handling when using oracle dbms used the wrong data type

by Götz Golla

Module: check_mk Branch: master Commit: 1eddd4058c5092c7fef102f8638eb8031699c5e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eddd4058c5092… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 23 19:45:01 2013 +0200 FIX: port handling when using oracle dbms used the wrong data type --- doc/treasures/active_checks/check_sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 4d803ed..d8d17cf 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -158,7 +158,7 @@ try: db = cx_Oracle if opt_port == None: opt_port=1521 - cstring = opt_user+"/"+opt_password+"@"+opt_hostname+":"+opt_port+"/"+opt_name + cstring = opt_user+"/"+opt_password+"@"+opt_hostname+":"+str(opt_port)+"/"+opt_name db_connection = db.connect(cstring) else: print "UNKNOWN - dbms not found"

10 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
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