Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: typo fixed that broke the whole check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 72e93b2cceec3a31dd4ceae4da335fac078e60dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72e93b2cceec3a… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 4 08:17:39 2011 +0200 typo fixed that broke the whole check --- checks/f5_bigip_pool | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/f5_bigip_pool b/checks/f5_bigip_pool index 7e61daa..69086bc 100644 --- a/checks/f5_bigip_pool +++ b/checks/f5_bigip_pool @@ -50,9 +50,9 @@ def check_f5_bigip_pool(item, _no_params, info): return (0, "OK - all members online") elif pool_act_members > 1: return (1, "WARN - only %i of %i pool members are up" % (pool_act_members, pool_def_members)) - elif pool_members == 1: + elif pool_act_members == 1: return (2, "CRIT - only 1 pool member left") - elif pool_members == 0: + elif pool_act_members == 0: return (2, "CRIT - no pool members left") else: return (3, "UNKNOWN output for pool %s" % item)

13 years, 2 months

Check_MK Git: check_mk: Multisite: fix two bugs in view editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be983a20c73b1491b66c38738e16af5fcc2a66a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be983a20c73b14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 3 16:15:45 2011 +0200 Multisite: fix two bugs in view editor --- web/htdocs/views.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3794ad7..da50f88 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -453,6 +453,8 @@ def page_edit_view(h): view["title"] += " (Copy)" else: view = html.multisite_views.get((html.req.user, viewname)) + if not view: + view = html.multisite_views.get(('', viewname)) # load builtin view datasourcename = view["datasource"] if view: @@ -928,9 +930,9 @@ def create_view(): if is_joined_value(joined_cols, "col_%d" % n) and not join_index: raise MKUserError('col_join_index_%d' % n, "Please specify the service to show the data for") - if join_index != '' and col_title != '': + if join_index and col_title: painternames.append((pname, viewname, tooltip, join_index, col_title)) - elif join_index != '': + elif join_index: painternames.append((pname, viewname, tooltip, join_index)) else: painternames.append((pname, viewname, tooltip))

13 years, 2 months

Check_MK Git: check_mk: Fixed bug in vieweditor

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b20c1482f29c3fa01b6a9d1c126e8531baaeda2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b20c1482f29c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 16:47:15 2011 +0200 Fixed bug in vieweditor --- web/htdocs/views.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d20e455..3794ad7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -712,7 +712,9 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): html.write('</td>') html.write('<td id="%slabel_%d" class=celeft>Column %d:</td><td>' % (var_prefix, n, n)) html.select("%s%d" % (var_prefix, n), collist, "", "toggle_join_fields('%s', %d, this)" % (var_prefix, n)) - display = joined and not is_joined_value(collist, "%s%d" % (var_prefix, n)) and 'none' or '' + display = 'none' + if joined and is_joined_value(collist, "%s%d" % (var_prefix, n)): + display = '' html.write("</td></tr><tr id='%sjoin_index_row%d' style='display:%s'><td class=celeft>of Service:</td><td>" % (var_prefix, n, display)) html.text_input("%sjoin_index_%d" % (var_prefix, n)) html.write("</td></tr><tr><td class=celeft>Link:</td><td>")

13 years, 2 months

Check_MK Git: check_mk: BI: Removed wrong scaling tds

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b4793ca3b165091b1825a35ea9593657a0065f17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4793ca3b16509… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 16:27:32 2011 +0200 BI: Removed wrong scaling tds --- web/htdocs/check_mk.css | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a9d14c1..dee728f 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1703,10 +1703,6 @@ tr.even0 .aggrtree ul.subtree { vertical-align:middle; } -td.aggrtree { - width: 100%; -} - table.aggrtree { border-collapse: collapse; width: 100%;

13 years, 2 months

Check_MK Git: check_mk: View editor foldable states are now permament per user

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f096a7e52b7355aa08767f192b5e31c420c1096 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f096a7e52b735… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 16:25:07 2011 +0200 View editor foldable states are now permament per user --- ChangeLog | 1 + livestatus/.f12 | 2 +- web/htdocs/bi.py | 24 +++++++++++++--------- web/htdocs/js/check_mk.js | 13 ++++++++++++ web/htdocs/js/sidebar.js | 15 +------------ web/htdocs/views.py | 43 ++++++++++++++++++++++----------------- web/plugins/pages/shipped.py | 3 +- web/plugins/sidebar/shipped.py | 17 +-------------- web/plugins/views/bi.py | 5 +++- 9 files changed, 63 insertions(+), 60 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1f096a7e52…

13 years, 2 months

Check_MK Git: check_mk: Added missing file

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83668f05aadff9f2944357dd43a1a3b2322c6728 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83668f05aadff9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 16:25:28 2011 +0200 Added missing file --- web/htdocs/weblib.py | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py new file mode 100644 index 0000000..3ec120e --- /dev/null +++ b/web/htdocs/weblib.py @@ -0,0 +1,74 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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. + +import config +import lib + +treestates = {} + +def load_tree_states(): + global treestates + treestates = config.load_user_file("treestates", {}) + +def save_tree_states(): + config.save_user_file("treestates", treestates) + +def get_tree_states(tree): + if not treestates: + load_tree_states() + return treestates.get(tree, {}) + +def set_tree_state(tree, key, val): + global treestates + + if not treestates: + load_tree_states() + + if tree not in treestates: + treestates[tree] = {} + + treestates[tree][key] = val + + +def set_tree_states(tree, val): + global treestates + if not treestates: + load_tree_states() + treestates[tree] = val + +def ajax_tree_openclose(h): + global html + html = h + + tree = html.var("tree") + name = html.var("name") + + if not tree or not name: + MKUserError('tree or name parameter missing') + + set_tree_state(tree, name, html.var("state")) + save_tree_states() +

13 years, 2 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e0b39e07f29e6fdb0efb26caea8ae6e2f75053f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0b39e07f29e6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 13:23:32 2011 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3f448e..1fdfd27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * find configuration file in subdirectories of conf.d also Multisite: + * FIX: customlinks snapin: Suppressing exception when no links configured * FIX: webservice: suppress livestatus errors in multi-site setups * FIX: install missing example icons in web/htdocs/images/icons * FIX: Nagios-Snapin: avoid duplicate slash in URL

13 years, 2 months

Check_MK Git: check_mk: FIX: customlinks snapin: Suppressing exception when no links configured

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf76ec82fcc04e6b69b739df7289e8c8f05f773c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf76ec82fcc04e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 13:21:05 2011 +0200 FIX: customlinks snapin: Suppressing exception when no links configured --- web/plugins/sidebar/shipped.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 2eec199..4f95f97 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -960,6 +960,7 @@ def render_custom_links(): if not links: html.write("Please edit <tt>%s</tt> in order to configure which links are shown in this snapin.\n" % (defaults.default_config_dir + "/multisite.mk")) + return def render_list(ids, links): states = load_customlink_states()

13 years, 2 months

Check_MK Git: check_mk: View editor can handle service columns in host views now (in progress)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 76ffe7785e62ddc07efc899dc916166abee065b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76ffe7785e62dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 11:45:17 2011 +0200 View editor can handle service columns in host views now (in progress) --- web/htdocs/js/check_mk.js | 9 +++++ web/htdocs/views.py | 77 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 69 insertions(+), 17 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 75b11d5..1b7826a 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -420,6 +420,15 @@ function move_column_down(oImg) { oImg = null; } +function toggle_join_fields(prefix, n, obj) { + if(obj.options[obj.selectedIndex].text.substr(0, 8) == 'SERVICE:') { + document.getElementById(prefix + 'join_index_row' + n).style.display = ''; + document.getElementById(prefix + 'title_row' + n).style.display = ''; + } else { + document.getElementById(prefix + 'join_index_row' + n).style.display = 'none'; + document.getElementById(prefix + 'title_row' + n).style.display = 'none'; + } +} // ---------------------------------------------------------------------------- // page reload stuff diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b12c406..b8e060c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -616,6 +616,11 @@ function toggle_section(nr, oImg) { def column_selection(id, title, var_prefix, data): allowed = allowed_for_datasource(data, datasourcename) + + joined = [] + if var_prefix == 'col_' and ds_joined(datasourcename): + joined = allowed_for_datasource(data, multisite_datasources[datasourcename]['join'][0]) + section_header(id, title) # make sure, at least 3 selection boxes are free for new columns maxnum = 1 @@ -623,7 +628,7 @@ function toggle_section(nr, oImg) { maxnum += 1 html.write('<div>') for n in range(1, maxnum): - view_edit_column(n, var_prefix, maxnum, allowed) + view_edit_column(n, var_prefix, maxnum, allowed, joined) html.write('</div>') html.buttonlink("javascript:add_view_column(%d, '%s', '%s')" % (id, datasourcename, var_prefix), "Add Column") section_footer() @@ -675,10 +680,19 @@ function toggle_section(nr, oImg) { html.footer() -def view_edit_column(n, var_prefix, maxnum, allowed): - collist = [ ("", "") ] + [ (name, p["title"]) for name, p in allowed.items() ] +def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): + def sort_list(l): + # Sort the lists but don't mix them up + swapped = [ (disp, key) for key, disp in l ] + swapped.sort() + return [ (key, disp) for disp, key in swapped ] + + collist = sort_list([ ("", "") ] + [ (name, p["title"]) for name, p in allowed.items() ]) + if joined: + collist += [ ("-", "---") ] + sort_list([ (name, 'SERVICE: ' + p["title"]) for name, p in joined.items() if (name, p["title"]) not in collist]) + html.write("<div class=columneditor id=%seditor_%d><table><tr>" % (var_prefix, n)) - html.write('<td class="cebuttons" rowspan=3>') + html.write('<td class="cebuttons" rowspan=5>') html.write('<img onclick="delete_view_column(this);" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\" ' @@ -697,15 +711,21 @@ def view_edit_column(n, var_prefix, maxnum, allowed): 'src="images/button_movedown_lo.png"%s>' % (var_prefix, n, display)) html.write('</td>') html.write('<td id="%slabel_%d" class=celeft>Column %d:</td><td>' % (var_prefix, n, n)) - html.sorted_select("%s%d" % (var_prefix, n), collist) - # html.write('<div style="display: yes;">of Service: ') - # html.text_input("%s_svc%d" % (var_prefix, n), "") - # html.write('</div>') + html.select("%s%d" % (var_prefix, n), collist, "", "toggle_join_fields('%s', %d, this)" % (var_prefix, n)) + display = 'none' + if joined: + selected_label = [ label for name, label in collist if name == html.var("%s%d" % (var_prefix, n), '') ][0] + if selected_label[:8] == 'SERVICE:': + display = '' + html.write("</td></tr><tr id='%sjoin_index_row%d' style='display:%s'><td class=celeft>of Service:</td><td>" % (var_prefix, n, display)) + html.text_input("%sjoin_index_%d" % (var_prefix, n)) html.write("</td></tr><tr><td class=celeft>Link:</td><td>") select_view("%slink_%d" % (var_prefix, n)) html.write("</td></tr><tr><td class=celeft>Tooltip:</td><td>") - html.sorted_select("%stooltip_%d" % (var_prefix, n), collist) - html.write("</td></table>") + html.select("%stooltip_%d" % (var_prefix, n), collist) + html.write("</td></tr><tr id='%stitle_row%d' style='display:%s'><td class=celeft>Title:</td><td>" % (var_prefix, n, display)) + html.text_input("%stitle_%d" % (var_prefix, n)) + html.write("</td></tr></table>") html.write("</div>") def ajax_get_edit_column(h): @@ -720,6 +740,11 @@ def ajax_get_edit_column(h): load_views() allowed = allowed_for_datasource(multisite_painters, html.var('ds')) + + joined = [] + if html.var('pre') == 'col_' and ds_joined(html.var('ds')): + joined = allowed_for_datasource(multisite_painters, multisite_datasources[html.var('ds')]['join'][0]) + num = int(html.var('num', 0)) html.form_vars = [] @@ -784,14 +809,20 @@ def load_view_into_html_vars(view): # [6] Columns n = 1 for entry in view["painters"]: - name = entry[0] - viewname = entry[1] - tooltip = len(entry) > 2 and entry[2] or None + name = entry[0] + viewname = entry[1] + tooltip = len(entry) > 2 and entry[2] or None + join_index = len(entry) > 3 and entry[3] or None + title = len(entry) > 4 and entry[4] or None html.set_var("col_%d" % n, name) if viewname: html.set_var("col_link_%d" % n, viewname) if tooltip: html.set_var("col_tooltip_%d" % n, tooltip) + if join_index: + html.set_var("col_join_index_%d" % n, join_index) + if title: + html.set_var("col_title_%d" % n, title) n += 1 # Make sure, checkboxes with default "on" do no set "on". Otherwise they @@ -885,13 +916,15 @@ def create_view(): # have read this comment you might want to mail me a (simple) patch for # doing this more cleanly... for n in range(1, 500): - pname = html.var("col_%d" % n) - viewname = html.var("col_link_%d" % n) - tooltip = html.var("col_tooltip_%d" % n) + pname = html.var("col_%d" % n) + viewname = html.var("col_link_%d" % n) + tooltip = html.var("col_tooltip_%d" % n) + join_index = html.var('col_join_index_%d' % n) + title = html.var('col_title_%d' % n) if pname: if viewname not in html.available_views: viewname = None - painternames.append((pname, viewname, tooltip)) + painternames.append((pname, viewname, tooltip, join_index, title)) return { "name" : name, @@ -1557,6 +1590,7 @@ def allowed_for_datasource(collection, datasourcename): datasource = multisite_datasources[datasourcename] infos_available = set(datasource["infos"]) add_columns = datasource.get("add_columns", []) + allowed = {} for name, item in collection.items(): columns = item["columns"] @@ -1565,6 +1599,15 @@ def allowed_for_datasource(collection, datasourcename): allowed[name] = item return allowed +#def joined_datasource(c +# joined = multisite_datasources[datasource['join'][0]] +# infos_available.update(set(joined['infos'])) +# add_columns += joined.get("add_columns", []) +# html.write(repr(set(collection))) + +def ds_joined(datasourcename): + return 'join' in multisite_datasources[datasourcename] + # ----------------------------------------------------------------------------- # _ _ _ # / \ ___| |_(_) ___ _ __ ___

13 years, 2 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: 91f74dfb94f5eb61b3c219d07db01fb9fe62e4de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91f74dfb94f5eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 11:45:21 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011