Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: MobileUI: Finished all basic functions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4a747b1ef3d48ae6ae7bb3420dc0d243b24d9a3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a747b1ef3d48a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 12 15:18:45 2011 +0100 MobileUI: Finished all basic functions --- web/htdocs/mobile.py | 136 ++++++++++++++++++++++++++------------------------ 1 files changed, 71 insertions(+), 65 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index e6d6715..a2cb7ae 100755 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -71,7 +71,9 @@ 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) + for href, title, icon, custom_css in items: + href = html.makeuri([("page", href),("search", "Search")]) if custom_css == False: custom_css = "" if current == href: @@ -146,31 +148,37 @@ def page_index(): for view_name, view in html.available_views.items(): if view.get("mobile") and not view.get("hidden"): url = "mobile_view.py?view_name=%s" % view_name - count = views.show_view(view, only_count = True) if view.get("mustsearch"): - url += "#filter" - items.append((url, '%s <span class="ui-li-count">%d</span>' % (view["title"], count))) + count = "" + else: + count = views.show_view(view, only_count = True) + count = '<span class="ui-li-count">%d</span>' % count + items.append((url, '%s %s' % (view["title"], count))) jqm_page_index(_("Check_MK Mobile"), items) jqm_page_footer() mobile_html_foot() + def page_view(): views.load_views() view_name = html.var("view_name") if not view_name: return page_index() - + view = html.available_views.get(view_name) title = views.view_title(view) mobile_html_head(title) + try: - views.show_view(view, show_heading = False, show_buttons = False, - show_footer = False, render_function = render_view) - pass + views.show_view(view, show_heading = False, show_buttons = False, + show_footer = False, render_function = render_view) + pass except Exception, e: - if config.debug: - raise - html.write("ERROR showing view: %s" % e) + if config.debug: + raise + html.write("ERROR showing view: %s" % e) + + mobile_html_foot() def render_view(view, rows, datasource, group_painters, painters, @@ -179,12 +187,19 @@ def render_view(view, rows, datasource, group_painters, painters, browser_reload): home=("mobile.py", "Home", "home") + + page = html.var("page") + if not page: + if view.get("mustsearch"): + page = "filter" + else: + page = "data" title = views.view_title(view) - navbar = [ ( "#data", _("Results"), "grid", 'results_button'), - ( "#filter", _("Filter"), "search", False )] + navbar = [ ( "data", _("Results"), "grid", 'results_button'), + ( "filter", _("Filter"), "search", False )] if config.may("act"): - navbar.append(( "#commands", _("Commands"), "gear", False )) + navbar.append(( "commands", _("Commands"), "gear", False )) # Should we show a page with context links? context_links = [ @@ -192,49 +207,52 @@ def render_view(view, rows, datasource, group_painters, painters, if e[0].get("mobile") ] if context_links: - navbar.append(( "#context", _("Context"), "arrow-r", False)) + navbar.append(( "context", _("Context"), "arrow-r", False)) page_id = "view_" + view["name"] - # Page: data rows of view - jqm_page_header(title, left_button=home, right_button=("javascript:document.location.reload();", _("Reload"), "refresh"), id="data") - html.write('<div id="view_results">') - if len(rows) == 0: - html.write(_("No hosts/services found.")) - else: - try: - # TODO: special limit for mobile UI - html.check_limit(rows, views.get_limit()) - layout["render"](rows, view, group_painters, painters, num_columns, - show_checkboxes and not html.do_actions()) - except Exception, e: - html.write(_("Error showing view: %s" % e)) - html.write("</div>") - jqm_page_navfooter(navbar, '#data', page_id) - - # Page: Commands - if len(rows) > 0 and config.may("act"): - jqm_page_header(_("Commands"), left_button=home, id="commands") - show_commands = True - if html.has_var("_do_actions"): - try: - show_commands = do_commands(view, datasource["infos"][0], rows) - except MKUserError, e: - html.show_error(e.message) - show_commands = True - if show_commands: - show_command_form(view, datasource, rows) - jqm_page_navfooter(navbar, '#commands', page_id) - - # Page: Filters - jqm_page_header(_("Filter / Search"), left_button=home, id="filter") - show_filter_form(show_filters) - jqm_page_navfooter(navbar, '#filter', page_id) + if page == "filter": + jqm_page_header(_("Filter / Search"), left_button=home, id="filter") + show_filter_form(show_filters) + jqm_page_navfooter(navbar, 'filter', page_id) + + elif page == "commands": + # Page: Commands + if config.may("act"): + jqm_page_header(_("Commands"), left_button=home, id="commands") + show_commands = True + if html.has_var("_do_actions"): + try: + show_commands = do_commands(view, datasource["infos"][0], rows) + except MKUserError, e: + html.show_error(e.message) + show_commands = True + if show_commands: + show_command_form(view, datasource, rows) + jqm_page_navfooter(navbar, 'commands', page_id) + + elif page == "data": + # Page: data rows of view + jqm_page_header(title, left_button=home, right_button=("javascript:document.location.reload();", _("Reload"), "refresh"), id="data") + html.write('<div id="view_results">') + if len(rows) == 0: + html.write(_("No hosts/services found.")) + else: + try: + # TODO: special limit for mobile UI + html.check_limit(rows, views.get_limit()) + layout["render"](rows, view, group_painters, painters, num_columns, + show_checkboxes and not html.do_actions()) + except Exception, e: + html.write(_("Error showing view: %s" % e)) + html.write("</div>") + jqm_page_navfooter(navbar, 'data', page_id) + # Page: Context buttons if context_links: jqm_page_header(_("Context"), left_button=home, id="context") show_context_links(context_links) - jqm_page_navfooter(navbar, '#context', page_id) + jqm_page_navfooter(navbar, 'context', page_id) def show_filter_form(show_filters): @@ -254,25 +272,13 @@ def show_filter_form(show_filters): html.write("</ul>\n") html.hidden_fields() html.write('<input type="hidden" name="search" value="Search">') + html.write('<input type="hidden" name="page" value="data">') html.end_form() - # 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(""" - $(document).ready(function() { - $('.results_button').live('click', function(e) { + $('.results_button').live('click',function(e) { e.preventDefault(); - var view_div = $("#view_results"); - view_div.empty(); - $.get('view.py',$('#form_filter').serialize()+"&mobile=1&display_options=htbfcodezr",function(antwort){ - view_div.html(antwort); - $.mobile.changePage( "#data" ); - $('#data').trigger('create'); - }); + $('#form_filter').submit(); }); - }); """) def show_command_form(view, datasource, rows): @@ -288,7 +294,7 @@ def show_command_form(view, datasource, rows): for command in views.multisite_commands: if what in command["tables"] and config.may(command["permission"]): html.write('<li data-role="fieldcontain">\n') - html.write('<fieldset data-role="controlgroup">\n') + html.write('<fieldset data-role="controlgroup" data-type="horizontal">\n') html.write('<div role="heading" class="ui-controlgroup-label">%s</div>' % command["title"]) html.write('<div class="ui-controlgroup-controls">') command["render"]()

12 years, 9 months

Check_MK Git: check_mk: MobileUI: Making filters work

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97bdf9b1e3f19e3e53aaa6a9ff0cfabab745be22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97bdf9b1e3f19e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 12 12:30:07 2011 +0100 MobileUI: Making filters work --- web/htdocs/js/mobile.js | 5 +++-- web/htdocs/mobile.py | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/mobile.js b/web/htdocs/js/mobile.js index 6f9442e..17107cd 100644 --- a/web/htdocs/js/mobile.js +++ b/web/htdocs/js/mobile.js @@ -24,11 +24,12 @@ /* Disable data-ajax per default, as it makes problems in most of our cases */ -$( function () { + +$(document).ready(function() { $("a").attr("data-ajax", "false"); $("form").attr("data-ajax", "false"); $("div.error").addClass("ui-shadow"); $("div.success").addClass("ui-shadow"); $("div.really").addClass("ui-shadow"); $("div.warning").addClass("ui-shadow"); -}) +}); \ No newline at end of file diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index de0e758..172797c 100755 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -202,6 +202,7 @@ def render_view(view, rows, datasource, group_painters, painters, # Page: data rows of view jqm_page_header(title, left_button=home, right_button=("javascript:document.location.reload();", _("Reload"), "refresh"), id="data") + html.write('<div id="view_results">') if len(rows) == 0: html.write(_("No hosts/services found.")) else: @@ -212,6 +213,7 @@ def render_view(view, rows, datasource, group_painters, painters, show_checkboxes and not html.do_actions()) except Exception, e: html.write(_("Error showing view: %s" % e)) + html.write("</div>") jqm_page_navfooter(navbar, '#data', page_id) # Page: Commands @@ -264,10 +266,18 @@ def show_filter_form(show_filters): # remove the ancor in href. Otherwise jQuery will do some magic # itself and first switch to that page... html.javascript(""" - $('#results_button').live('click',function(e){ + $(document).ready(function() { + $('#results_button').live('click', function(e) { e.preventDefault(); - $('form[name="filter"]').submit(); + var view_div = $("#view_results"); + view_div.empty(); + $.get('view.py',$('#form_filter').serialize()+"&mobile=1&display_options=htbfcodezr",function(antwort){ + view_div.html(antwort); + $.mobile.changePage( "#data" ); + $('#data').trigger('create'); + }); }); + }); """) def show_command_form(view, datasource, rows):

12 years, 9 months

Check_MK Git: check_mk: Multisite: Added name based id attribute to form tag

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5618a48d59a24479b17009fa9f7930c51d7d6853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5618a48d59a244… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 12 13:10:13 2011 +0100 Multisite: Added name based id attribute to form tag --- web/htdocs/htmllib.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index baafac5..109f48f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -236,8 +236,8 @@ class html: onsubmit = ' onsubmit="%s"' % onsubmit else: onsubmit = '' - self.write('<form name=%s class=%s action="%s" method="%s"%s%s>\n' % - (name, name, action, method, enctype, onsubmit)) + self.write('<form id="form_%s" name="%s" class="%s" action="%s" method="%s"%s%s>\n' % + (name, name, name, action, method, enctype, onsubmit)) self.hidden_field("filled_in", name) if add_transid: self.hidden_field("_transid", str(self.current_transid()))

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: af5070d17aa7b00873484f63e5564612bc294894 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af5070d17aa7b0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 12 15:18:58 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: orable_tablespaces: fix output marker for crit/warn

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27f0b7afd54a9ac1ca622c874d9d60d699d3be33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27f0b7afd54a9a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 12 10:05:53 2011 +0100 orable_tablespaces: fix output marker for crit/warn --- checks/oracle_tablespaces | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 8a01132..f13a002 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -139,16 +139,16 @@ def check_oracle_tablespaces(item, params, info): # Check increment size, should not be set to default (1) if oracle_tablespaces_check_default_increment: if uses_default_increment: - infotext += ", DEFAULT INCREMENT!" + infotext += ", DEFAULT INCREMENT(!)" status = 1 # Check autoextend status if parameter not set to None if autoext != None: if autoext and num_extensible == 0: - infotext += ", AUTOEXTEND!!" + infotext += ", AUTOEXTEND(!!)" status = 2 elif not autoext and num_extensible > 0: - infotext += ", NO AUTOTEXTEND!!" + infotext += ", NO AUTOTEXTEND(!!)" status = 2 elif num_extensible > 0: infotext += ", autoextend"

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0489, #0490

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cd68c1957ba861d2ffc8588b8cc5e7a6a0c5014 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cd68c1957ba86… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 9 15:54:57 2011 +0100 Updated bug entries #0489, #0490 --- .bugs/489 | 15 +++++++++++++++ .bugs/490 | 11 +++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/.bugs/489 b/.bugs/489 new file mode 100644 index 0000000..3a51d2e --- /dev/null +++ b/.bugs/489 @@ -0,0 +1,15 @@ +Title: Doku example for dual tcp/snmp monitoring +Component: docu +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-09 11:40:51 +Targetversion: future +Class: todo + +The following example rule could be proposed for solving +the duplicate check problem: + +ignored_checks += [ + ( [ "hr_fs", "hr_mem", "hr_cpu" ], [ "snmp", "tcp" ], ALL_HOSTS ) +] diff --git a/.bugs/490 b/.bugs/490 new file mode 100644 index 0000000..f586de8 --- /dev/null +++ b/.bugs/490 @@ -0,0 +1,11 @@ +Title: cmk -I on cluster should work +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-09 14:27:05 +Targetversion: future +Class: feature + +When doing inventory on a cluster we could simply +replace the cluster name by the node names.

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0488

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4242fb926bc0131182b1b7cf6c25c309b5064b05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4242fb926bc013… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 9 11:35:04 2011 +0100 Updated bug entries #0488 --- .bugs/488 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/.bugs/488 b/.bugs/488 new file mode 100644 index 0000000..8f61886 --- /dev/null +++ b/.bugs/488 @@ -0,0 +1,15 @@ +Title: SNMP v3 settings are not sensible +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-09 10:21:05 +Targetversion: 1.1.13i1 +Class: bug + +Only when selecting authPriv, we should display +privacy protocol and pass phrase. + +Also do not display passwords in clear text when +outputting the data in the WATO GUI. +

12 years, 9 months

Check_MK Git: check_mk: WATO: fix title of rule editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83eb3a1a22a479258a3c58ab1e4266efccbfb506 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83eb3a1a22a479… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 9 11:35:13 2011 +0100 WATO: fix title of rule editor --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0163cbc..0d71234 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8707,8 +8707,8 @@ def mode_edit_ruleset(phase): title = rulespec["title"] if hostname: title += _(" for host %s") % hostname - if html.has_var("item") and rulespec["itemtype"]: - title += _(" and %s '%s'") % (rulespec["itemname"], item) + if html.has_var("item") and rulespec["itemtype"]: + title += _(" and %s '%s'") % (rulespec["itemname"], item) return title elif phase == "buttons":

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0484, #0485, #0486, #0487

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d310517e2f55ff4a005174888ecf922c64ec2b29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d310517e2f55ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 8 17:31:45 2011 +0100 Updated bug entries #0484, #0485, #0486, #0487 --- .bugs/484 | 10 ++++++++++ .bugs/485 | 12 ++++++++++++ .bugs/486 | 12 ++++++++++++ .bugs/487 | 12 ++++++++++++ 4 files changed, 46 insertions(+), 0 deletions(-) diff --git a/.bugs/484 b/.bugs/484 new file mode 100644 index 0000000..2952867 --- /dev/null +++ b/.bugs/484 @@ -0,0 +1,10 @@ +Title: StatsGroupBy -> Columns +Component: docu +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-08 11:24:40 +Targetversion: 1.1.12 +Class: bug + +Update the documentation., diff --git a/.bugs/485 b/.bugs/485 new file mode 100644 index 0000000..4799929 --- /dev/null +++ b/.bugs/485 @@ -0,0 +1,12 @@ +Title: Enable login without password +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-08 16:05:54 +Targetversion: future +Class: feature + +We could make logins without password possible, while the login name +can be specified via an URL variable. That way the admin could +create links to pages for usage in wikis, etc. diff --git a/.bugs/486 b/.bugs/486 new file mode 100644 index 0000000..7b12d87 --- /dev/null +++ b/.bugs/486 @@ -0,0 +1,12 @@ +Title: Replication Slaves should lock WATO +Component: wato +Benefit: 2 +State: open +Cost: 2 +Date: 2011-12-08 16:50:35 +Targetversion: 1.2.0 +Class: todo + +A replication Slave should lock WATO. This feature could be +configured in the Replication configuration in WATO. We +could set the lock while the master is logged in in the slave. diff --git a/.bugs/487 b/.bugs/487 new file mode 100644 index 0000000..8c0d9f9 --- /dev/null +++ b/.bugs/487 @@ -0,0 +1,12 @@ +Title: Add optional comment when restarting Nagios via WATO +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-08 17:03:28 +Targetversion: 1.2.0 +Class: feature + +We add a text input in the "Activate Changes" pages. The user +can enter a comment here. The comment will be added to the +audit-Log and will be used to name or tag the snapshot.

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: 11d9348684de091d8929563184045a2e6797695c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11d9348684de09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 8 17:31:48 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

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