Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

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, 9 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, 9 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, 9 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, 9 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, 9 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, 9 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: 9bf60a0b748abc5d1887d10f825426c33a6829bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf60a0b748abc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 6 15:25:57 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO host edit: Prevent javascript error when no wato_host_tags defined

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1cc8381607efefdec2ec13afb8e9f181746eab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1cc8381607efe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 14:59:54 2011 +0100 WATO host edit: Prevent javascript error when no wato_host_tags defined --- web/htdocs/js/wato.js | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 8d90c80..c27da5c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -72,7 +72,14 @@ function wato_fix_visibility() { /* First collect the current selection of all host attributes. They are in the same table as we are */ var currentTags = []; - var oTable = document.getElementById("wato_host_tags").childNodes[0]; /* tbody */ + + var oHostTags = document.getElementById("wato_host_tags"); + // Skip this function when no tags defined + if(!oHostTags) + return; + + var oTable = oHostTags.childNodes[0]; /* tbody */ + oHostTags = null; for (var i in oTable.childNodes) { var oTr = oTable.childNodes[i]; if (oTr.nodeName == 'TR') { @@ -129,7 +136,7 @@ function wato_fix_visibility() { } } - for each (var item in volatile_topics){ + for (var item in volatile_topics){ var oTr = document.getElementById("topic_" + item); if( hide_topics.indexOf(item) > -1 ){ oTr.style.display = "none";

12 years, 9 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: 44dcddfcc67d4712a785890b4568ebf464d1e087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44dcddfcc67d47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 10:37:23 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Fix ping_levels computation of rta

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 993ed1418a5bbf641e1f871ddf69c92ab1b51abb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=993ed1418a5bbf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 10:37:16 2011 +0100 Fix ping_levels computation of rta rta was without any effect --- .bugs/476 | 13 +++++++++++++ .bugs/477 | 11 +++++++++++ modules/check_mk.py | 2 +- 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/.bugs/476 b/.bugs/476 new file mode 100644 index 0000000..1e88e12 --- /dev/null +++ b/.bugs/476 @@ -0,0 +1,13 @@ +Title: mounts Checks should only check ro flag +Component: checks +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-06 08:52:27 +Targetversion: 1.2.0 +Class: bug + +Currently on my laptop the mounts check is flapping around because +the kernel seems to add a mount option with "commit" and change +it all the time. Basically we'd need to just monitor the ro +status. diff --git a/.bugs/477 b/.bugs/477 new file mode 100644 index 0000000..ecfe2c4 --- /dev/null +++ b/.bugs/477 @@ -0,0 +1,11 @@ +Title: main.mk Variables in Man-Page +Component: docu +Benefit: 2 +State: open +Cost: 2 +Date: 2011-12-06 09:41:11 +Targetversion: future +Class: feature + +We could generate a man-Page from the nowiki-page about +the configuration variables for main.mk and for multisite.mk diff --git a/modules/check_mk.py b/modules/check_mk.py index f884537..609b1e5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1187,7 +1187,7 @@ def check_icmp_arguments(hostname): elif key == "packets": args.append("-n %d" % value) elif key == "rta": - rtas = value + rta = value elif key == "loss": loss = value args.append("-w %.2f,%.2f%%" % (rta[0], loss[0]))

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits