Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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: 088ce26ce527e2999a9682decc0982bd91ea8bd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=088ce26ce527e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 10:57:34 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 12 months

Check_MK Git: check_mk: WATO: fixed selection in host-tag drop down menu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3e36e54d029d166ad5474b6357d78c14f12e9ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3e36e54d029d1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 6 21:30:04 2011 +0100 WATO: fixed selection in host-tag drop down menu --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bbb770d..aeb98e1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -433,7 +433,7 @@ class html: (onchange_code, varname, varname, attributes)) for value, text in options: if value == None: value = "" - sel = value == current and " selected" or "" + sel = value.split('|')[0] == current and " selected" or "" self.write("<option value=\"%s\"%s>%s</option>\n" % (value, sel, text)) self.write("</select>\n") if varname:

12 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1fa8db85f686b35b55217c055f03eec853116e50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fa8db85f686b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 6 21:30:38 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 12 months

Check_MK Git: check_mk: FIX: BI - Assuming host states is possible again ( exception: list index "3")

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7bb32b05a1612c510609b0db95b09de01e9a8bf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bb32b05a1612c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 17:01:19 2011 +0100 FIX: BI - Assuming host states is possible again (exception: list index "3") --- ChangeLog | 3 ++ web/htdocs/bi.py | 9 ++++++ web/htdocs/js/bi.js | 71 +++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/js/check_mk.js | 48 +----------------------------- web/htdocs/views.py | 3 +- 5 files changed, 86 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2eea0be..9b88627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,9 @@ * Add Snapin page: show previews of all snapins * New (hidden) button for reloading a snapin (left to the close button) + BI: + * FIX: Assuming host states is possible again (exception: list index "3") + WATO: * Evolved to full featured monitoring configuration tool! * Major internal code cleanup diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c50dada..2679473 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1085,3 +1085,12 @@ def is_part_of_aggregation(what, site, host, service): else: return (site, host, service) in g_user_cache["affected_services"] +def get_state_name(node): + if node[1]['type'] == NT_LEAF: + if 'service' in node[1]: + return service_state_names[node[0]['state']] + else: + return host_state_names[node[0]['state']] + else: + # FIXME: Und wenn ein Hoststatus zum Summary-Status wird? + return service_state_names[node[0]['state']] diff --git a/web/htdocs/js/bi.js b/web/htdocs/js/bi.js new file mode 100644 index 0000000..93f1eaa --- /dev/null +++ b/web/htdocs/js/bi.js @@ -0,0 +1,71 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2011 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. + +function toggle_subtree(oImg) +{ + var oSubtree = oImg.parentNode.childNodes[6]; + var url = "bi_save_treestate.py?path=" + escape(oSubtree.id); + + if (oSubtree.style.display == "none") { + oSubtree.style.display = ""; + url += "&state=open"; + toggle_folding(oImg, 1); + } + else { + oSubtree.style.display = "none"; + url += "&state=closed"; + toggle_folding(oImg, 0); + } + oSubtree = null; + get_url(url); +} + +function toggle_assumption(oImg, site, host, service) +{ + // get current state + var current = oImg.src; + while (current.indexOf('/') > -1) + current = current.substr(current.indexOf('/') + 1); + current = current.substr(7); + current = current.substr(0, current.length - 4); + if (current == 'none') + current = '1'; + else if (current == '3') + current = '0' + else if (current == '0') + current = 'none' + else if (current == '2' && service == '') + current = 'none' + else + current = parseInt(current) + 1; + + var url = "bi_set_assumption.py?site=" + encodeURIComponent(site) + + '&host=' + encodeURIComponent(host); + if (service) { + url += '&service=' + encodeURIComponent(service); + } + url += '&state=' + current; + oImg.src = "images/assume_" + current + ".png"; + get_url(url); +} diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 605d7dd..732208e 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -759,7 +759,7 @@ function handleReload(url) { } // -------------------------------------------------------------------------- -// BI +// Folding // -------------------------------------------------------------------------- // var fold_steps = [ 0, 10, 10, 15, 20, 30, 40, 55, 80 ]; @@ -811,24 +811,6 @@ function toggle_tree_state(tree, name, oContainer) { oContainer = null; } -function toggle_subtree(oImg) -{ - var oSubtree = oImg.parentNode.childNodes[6]; - var url = "bi_save_treestate.py?path=" + escape(oSubtree.id); - - if (oSubtree.style.display == "none") { - oSubtree.style.display = ""; - url += "&state=open"; - toggle_folding(oImg, 1); - } - else { - oSubtree.style.display = "none"; - url += "&state=closed"; - toggle_folding(oImg, 0); - } - oSubtree = null; - get_url(url); -} function toggle_foldable_container(treename, id) { var oImg = document.getElementById('treeimg.' + treename + '.' + id); @@ -839,34 +821,6 @@ function toggle_foldable_container(treename, id) { oBox = null; } -// TODO: Why is this not in a bi.js? -function toggle_assumption(oImg, site, host, service) -{ - // get current state - var current = oImg.src; - while (current.indexOf('/') > -1) - current = current.substr(current.indexOf('/') + 1); - current = current.substr(7); - current = current.substr(0, current.length - 4); - if (current == 'none') - current = '1'; - else if (current == '3') - current = '0' - else if (current == '0') - current = 'none' - else - current = parseInt(current) + 1; - - var url = "bi_set_assumption.py?site=" + encodeURIComponent(site) - + '&host=' + encodeURIComponent(host); - if (service) { - url += '&service=' + encodeURIComponent(service); - } - url += '&state=' + current; - oImg.src = "images/assume_" + current + ".png"; - get_url(url); -} - /* * +----------------------------------------------------------------------+ * | ____ _ _ | diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6bb22d0..14af06b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1295,7 +1295,8 @@ def render_view(view, rows, datasource, group_painters, painters, if show_heading: # Show/Hide the header with page title, MK logo, etc. if 'H' in display_options: - html.body_start(view_title(view), stylesheets=["pages","views","status","bi"]) + # FIXME: view/layout/module related stylesheets/javascripts e.g. in case of BI? + html.body_start(view_title(view), stylesheets=["pages","views","status","bi"], javascripts=['bi']) if 'T' in display_options: html.top_heading(view_title(view))

12 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 58eefb28007fa1016d51c59d3babcee169e78b94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58eefb28007fa1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 15:42:19 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0480, #0481, #0478, #0479

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61890625dce17aaac40e0763b927459e637e2f5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61890625dce17a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 15:41:55 2011 +0100 Updated bug entries #0480, #0481, #0478, #0479 --- .bugs/478 | 12 ++++++++++++ .bugs/479 | 11 +++++++++++ .bugs/480 | 11 +++++++++++ .bugs/481 | 11 +++++++++++ 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/.bugs/478 b/.bugs/478 new file mode 100644 index 0000000..a52034c --- /dev/null +++ b/.bugs/478 @@ -0,0 +1,12 @@ +Title: parents ruleset should only use first entry +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-12-06 11:46:35 +Targetversion: 1.2.0 +Class: feature + +Currently all rules are executed. This makes the +configuration more complicated. Change this and +write migration notes. diff --git a/.bugs/479 b/.bugs/479 new file mode 100644 index 0000000..ba51093 --- /dev/null +++ b/.bugs/479 @@ -0,0 +1,11 @@ +Title: Host tags reorder works only partially +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-06 12:11:21 +Targetversion: 1.2.0 +Class: bug + +Changing the order of host tags in WATO does not +work with the down arrow on the first tag group. diff --git a/.bugs/480 b/.bugs/480 new file mode 100644 index 0000000..1f1c46d --- /dev/null +++ b/.bugs/480 @@ -0,0 +1,11 @@ +Title: Check for duplicate host tags values +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-06 12:18:18 +Targetversion: 1.2.0 +Class: bug + +When editing host tags make sure that within one tag group +each tag is unique. diff --git a/.bugs/481 b/.bugs/481 new file mode 100644 index 0000000..ad05856 --- /dev/null +++ b/.bugs/481 @@ -0,0 +1,11 @@ +Title: Tag group with empty tag does not show default +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-06 12:26:37 +Targetversion: 1.2.0 +Class: bug + +If a tag group has an empty tag then that choice is not +being shown in the combo box.

12 years, 12 months

Check_MK Git: check_mk: WATO: fix three tag-dependency problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c0c89a67bb77c86f1c44f83329e54f64ff24724 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0c89a67bb77c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 15:42:14 2011 +0100 WATO: fix three tag-dependency problems --- web/htdocs/wato.py | 9 ++++++--- web/plugins/wato/check_parameters.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ecc3987..e479174 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9093,7 +9093,8 @@ def construct_rule(ruleset, value, tag_specs, host_list, item_list): def tag_alias(tag): - for id, title, tags in config.wato_host_tags: + for entry in config.wato_host_tags: + id, title, tags = entry[:3] for t in tags: if t[0] == tag: return t[1] @@ -9187,7 +9188,8 @@ def ruleeditor_hover_code(varname, rulenr, mode, boolval, folder=None): def get_rule_conditions(ruleset): # Tag list tag_list = [] - for id, title, tags in config.wato_host_tags: + for entry in config.wato_host_tags: + id, title, tags = entry[:3] mode = html.var("tag_" + id) tagvalue = html.var("tagvalue_" + id) if mode == "is": @@ -9345,7 +9347,8 @@ def mode_edit_rule(phase): "to your <tt>multisite.mk</tt>. You will find an example there.")) else: html.write("<table>") - for id, title, tags in config.wato_host_tags: + for entry in config.wato_host_tags: + id, title, tags = entry[:3] html.write("<tr><td>%s:  </td>" % title) default_tag = None ignore = True diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b14c81e..06ec33c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -73,7 +73,8 @@ register_rule(group, "of how many packets have been received yet."), minvalue = 1, )), - ])) + ]), + match="dict") checkgroups = [] checkgroups.append((

12 years, 12 months

Check_MK Git: check_mk: Fixed default values in exception case ( when sample config file is missing)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d2af3706c08ad31d480e29511506a6a6f4a6f476 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2af3706c08ad3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 15:30:53 2011 +0100 Fixed default values in exception case (when sample config file is missing) --- web/htdocs/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index efb81ee..f195e96 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -73,8 +73,8 @@ def include(filename): except Exception, e: global user_id global roles - user = "nobody" - roles = [] + user_id = "nobody" + roles = {} raise MKConfigError("Cannot read configuration file %s: %s:" % (filename, e)) modification_timestamps = []

12 years, 12 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: f2d75c869d2d10fd4cf9002c8b163cad4706fbc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2d75c869d2d10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 15:30:59 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 12 months

Check_MK Git: check_mk: Changes in mobile UI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c9fc96a275d8e8ef15332290d995ddfca1585b77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9fc96a275d8e8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 6 15:25:26 2011 +0100 Changes in mobile UI --- web/htdocs/mobile.py | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py old mode 100644 new mode 100755 index c98ed52..de0e758 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -42,9 +42,8 @@ def mobile_html_head(title, ready_code=""): def mobile_html_foot(): html.write("</body></html>\n") -def jqm_header_button(url, title, icon=""): - html.write('<a href="%s" data-icon="%s" data-iconpos="left" ' - 'data-transition="flip" data-direction="reverse">%s</a>\n' % (url, icon, title)) +def jqm_header_button(url, title, icon=""): + html.write('<a href="%s" data-direction="reverse" data-iconpos="notext" data-icon="%s" title="%s" data-theme="f"></a>' % (url, icon, title)) def jqm_page_header(title, id=None, left_button=None, right_button=None): idtxt = id and (' id="%s"' % id) or '' @@ -72,17 +71,21 @@ def jqm_page_navfooter(items, current, page_id): '<div data-role="footer" data-id="%s" data-position="fixed">\n' '<div data-role="navbar">\n' '<ul>\n' % page_id) - data_direction = "reverse" - for href, title, icon in items: + for href, title, icon, obj_id in items: + #Is there an html id attribute + if obj_id != False: + obj_id = ' id="%s"' % obj_id + else: + obj_id = '' + if current == href: active = ' class="ui-state-persist ui-btn-active"' - data_direction = "" else: active = '' - html.write('<li><a data-transition="slide" data-direction="%s" ' + html.write('<li><a data-transition="slide" %s ' 'data-icon="%s" data-iconpos="bottom" ' 'href="%s"%s>%s</a></li>\n' % - (data_direction, icon, href, active, title)) + (obj_id, icon, href, active, title)) html.write( '</ul>\n' '</div>\n' @@ -183,10 +186,10 @@ def render_view(view, rows, datasource, group_painters, painters, home=("mobile.py", "Home", "home") title = views.view_title(view) - navbar = [ ( "#data", _("Results"), "grid"), - ( "#filter", _("Filter"), "search" )] + navbar = [ ( "#data", _("Results"), "grid", 'results_button'), + ( "#filter", _("Filter"), "search", False )] if config.may("act"): - navbar.append(( "#commands", _("Commands"), "gear" )) + navbar.append(( "#commands", _("Commands"), "gear", False )) # Should we show a page with context links? context_links = [ @@ -194,7 +197,7 @@ def render_view(view, rows, datasource, group_painters, painters, if e[0].get("mobile") ] if context_links: - navbar.append(( "#context", _("Context"), "arrow-r")) + navbar.append(( "#context", _("Context"), "arrow-r", False)) page_id = "view_" + view["name"] # Page: data rows of view @@ -253,16 +256,19 @@ def show_filter_form(show_filters): html.write('</div></fieldset></li>\n') html.write("</ul>\n") html.hidden_fields() + html.write('<input type="hidden" name="search" value="Search">') html.end_form() - # Make the tab 'Results' not simply switch to the results page + # Make the tab 'b' not simply switch to the results page # but submit the form and fetch new data. This is done by overriding # that buttons click function to submit the form. Note: We need to # remove the ancor in href. Otherwise jQuery will do some magic # itself and first switch to that page... - html.javascript( - "$('div#filter a[href=\"#data\"]')" - ".attr('href', '').live('click', function(e) " - "{ e.preventDefault(); $('div#filter form[name=\"filter\"]').submit();});") + html.javascript(""" + $('#results_button').live('click',function(e){ + e.preventDefault(); + $('form[name="filter"]').submit(); + }); + """) def show_command_form(view, datasource, rows): what = datasource["infos"][0]

12 years, 12 months

← Newer
1
...
26
27
28
29
30
31
32
33
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011