Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: htmllib: Initialize mobile flag

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1da6ad8de2d0b477ded72978867ba20f876ffe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1da6ad8de2d0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 11:20:47 2011 +0100 htmllib: Initialize mobile flag --- web/htdocs/htmllib.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d7f59b4..c888114 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -172,6 +172,7 @@ class html: self.form_name = None self.form_vars = [] self.context_buttons_open = False + self.mobile = False def plugin_stylesheets(self): global plugin_stylesheets

12 years, 9 months

Check_MK Git: check_mk: Implemented user profile management page

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3744abf1c1504700bbef64d74ceb61168f64de54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3744abf1c15047… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 10:59:11 2011 +0100 Implemented user profile management page New page for changing the user password and the default language (if available) --- ChangeLog | 2 + web/htdocs/config.py | 29 +++++++- web/htdocs/images/sidebar_profile_hi.png | Bin 0 -> 848 bytes web/htdocs/images/sidebar_profile_lo.png | Bin 0 -> 957 bytes web/htdocs/index.py | 44 +++++++----- web/htdocs/login.py | 114 +++++++++++++++++++++++++++++- web/htdocs/sidebar.css | 12 +++- web/htdocs/sidebar.py | 3 +- web/htdocs/wato.py | 14 +--- web/plugins/pages/shipped.py | 1 + 10 files changed, 185 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3744abf1c1…

12 years, 9 months

Check_MK Git: check_mk: Further restructuration of commands

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 550b999ce33b66f7a39506909f58be474beef717 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=550b999ce33b66… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 1 20:40:47 2011 +0100 Further restructuration of commands --- web/htdocs/views.py | 69 ++++------------------------ web/plugins/views/commands.py | 103 ++++++++++++++++++++++++++++++++++------ 2 files changed, 96 insertions(+), 76 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e5861f0..86cd034 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -60,18 +60,10 @@ def load_plugins(): loaded_with_language = current_language config.declare_permission_section("action", _("Commands on host and services")) - config.declare_permission("action.enablechecks", - _("Enable/disable checks"), - _("Enable and disable active or passive checks on hosts and services"), - [ "admin" ]) config.declare_permission("action.clearmodattr", _("Clear modified attributes"), _("Remove the information that an attribute (like check enabling) has been changed"), [ "admin" ]) - config.declare_permission("action.reschedule", - _("Reschedule checks"), - _("Reschedule host and service checks"), - [ "user", "admin" ]) config.declare_permission("action.fakechecks", _("Fake check results"), _("Manually submit check results for host and service checks"), @@ -2002,29 +1994,6 @@ def show_comment_actions(): def show_host_service_actions(what): - # if config.may("action.notifications"): - # html.write("<tr><td class=legend>"+_('Notifications')+"</td>\n" - # "<td class=content>\n" - # "<input type=submit name=_enable_notifications value=\""+_('Enable')+"\"> " - # "<input type=submit name=_disable_notifications value=\""+_('Disable')+"\">" - # "</td></tr>\n") - - if config.may("action.enablechecks") or config.may("action.reschedule"): - html.write("<tr><td class=legend>"+_('Active checks')+"</td>\n" - "<td class=content>\n") - if config.may("action.enablechecks"): - html.write("<input type=submit name=_enable_checks value=\""+_('Enable')+"\"> " - "<input type=submit name=_disable_checks value=\""+_('Disable')+"\"> ") - if config.may("action.reschedule"): - html.write("<input type=submit name=_resched_checks value=\""+_('Reschedule next check now')+"\">\n" - "</td></tr>\n") - - if config.may("action.enablechecks"): - html.write("<tr><td class=legend>"+_('Passive checks')+"</td>\n" - "<td class=content>\n") - html.write("<input type=submit name=_enable_passive_checks value=\""+_('Enable')+"\"> " - "<input type=submit name=_disable_passive_checks value=\""+_('Disable')+"\">" - "</td></tr>\n") if config.may("action.clearmodattr"): html.write("<tr><td class=legend>"+_('Modified attributes')+"</td>\n" @@ -2155,38 +2124,18 @@ def nagios_host_service_action_command(what, dataset): else: raise MKInternalError(_("Sorry, no actions possible on table %s") % tablename) - if html.var("_enable_notifications") and config.may("action.notifications"): - command = "ENABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec - title = _("<b>enable notifications</b> for") - - elif html.var("_disable_notifications") and config.may("action.notifications"): - command = "DISABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec - title = _("<b>disable notifications</b> for") - - elif html.var("_enable_checks") and config.may("action.enablechecks"): - command = "ENABLE_" + cmdtag + "_CHECK;%s" % spec - title = _("<b>enable active checks</b> of") - - elif html.var("_disable_checks") and config.may("action.enablechecks"): - command = "DISABLE_" + cmdtag + "_CHECK;%s" % spec - title = _("<b>disable active checks</b> of") - - elif html.var("_enable_passive_checks") and config.may("action.enablechecks"): - command = "ENABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec - title = _("<b>enable passive checks</b> of") - - elif html.var("_disable_passive_checks") and config.may("action.enablechecks"): - command = "DISABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec - title = _("<b>disable passive checks</b> of") + command = None + for cmd in multisite_commands: + if config.may(cmd["permission"]): + result = cmd["action"](cmdtag, spec) + if result: + command, title = result + break - elif html.var("_clear_modattr") and config.may("action.clearmodattr"): + if html.var("_clear_modattr") and config.may("action.clearmodattr"): command = "CHANGE_" + cmdtag + "_MODATTR;%s;0" % spec title = _("<b>clear the information about modified attributes</b> of") - elif html.var("_resched_checks") and config.may("action.reschedule"): - command = "SCHEDULE_FORCED_" + cmdtag + "_CHECK;%s;%d" % (spec, int(time.time())) - title = _("<b>reschedule an immediate check</b> of") - elif html.var("_fake") and config.may("action.fakechecks"): statename = html.var("_fake") pluginoutput = _("Manually set to %s by %s") % (statename, config.user_id) @@ -2285,7 +2234,7 @@ def nagios_host_service_action_command(what, dataset): title = _("<b>remove all scheduled downtimes</b> of ") return title, commands - else: + if not command: raise MKUserError(None, _("Sorry. This command is not implemented.")) if down_to: diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 44cdd5a..37c3156 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -36,19 +36,90 @@ # - function that outputs the HTML input fields # - function that creates the nagios command and title -# config.declare_permission("action.notifications", -# _("Enable/disable notifications"), -# _("Enable and disable notifications on hosts and services"), -# [ "admin" ]) -# -# multisite_commands.append({ -# "tables" : [ "host", "service" ], -# "permission" : "action.notifications", -# "title" : _("Notifications"), -# "render" : lambda: \ -# html.button("_enable_notifications", _("Enable")) == \ -# html.button("_disable_notifications", _("Disable")), -# "action" : lambda cmdtag, spec: \ -# "ENABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec, -# _("<b>enable notifications</b> for") -# }) +config.declare_permission("action.reschedule", + _("Reschedule checks"), + _("Reschedule host and service checks"), + [ "user", "admin" ]) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.reschedule", + "title" : _("Reschedule"), + "render" : lambda: \ + html.button("_resched_checks", _("Reschedule active checks")), + "action" : lambda cmdtag, spec: + html.var("_resched_checks") and ( + "SCHEDULE_FORCED_" + cmdtag + "_CHECK;%s;%d" % (spec, int(time.time())), + _("<b>reschedule an immediate check</b> of")) +}) + + + +config.declare_permission("action.notifications", + _("Enable/disable notifications"), + _("Enable and disable notifications on hosts and services"), + [ "admin" ]) + +def command_notifications(cmdtag, spec): + if html.var("_enable_notifications"): + return ("ENABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec, + _("<b>enable notifications</b> for")) + elif html.var("_disable_notifications"): + return ("DISABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec, + _("<b>disable notifications</b> for")) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.notifications", + "title" : _("Notifications"), + "render" : lambda: \ + html.button("_enable_notifications", _("Enable")) == \ + html.button("_disable_notifications", _("Disable")), + "action" : command_notifications, +}) + + + +config.declare_permission("action.enablechecks", + _("Enable/disable checks"), + _("Enable and disable active or passive checks on hosts and services"), + [ "admin" ]) + +def command_enable_active(cmdtag, spec): + if html.var("_enable_checks"): + return ("ENABLE_" + cmdtag + "_CHECKS;%s" % spec, + _("<b>enable active checks</b> for")) + elif html.var("_disable_checks"): + return ("DISABLE_" + cmdtag + "_CHECKS;%s" % spec, + _("<b>disable active checks</b> for")) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.enablechecks", + "title" : _("Active checks"), + "render" : lambda: \ + html.button("_enable_checks", _("Enable")) == \ + html.button("_disable_checks", _("Disable")), + "action" : command_enable_active, +}) + +def command_enable_passive(cmdtag, spec): + if html.var("_enable_passive_checks"): + return ("ENABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec, + _("<b>enable passive checks</b> for")) + elif html.var("_disable_passive_checks"): + return ("DISABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec, + _("<b>disable passive checks</b> for")) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.enablechecks", + "title" : _("Passive checks"), + "render" : lambda: \ + html.button("_enable_passive_checks", _("Enable")) == \ + html.button("_disable_passive_checks", _("Disable")), + "action" : command_enable_passive, +}) + + +

12 years, 9 months

Check_MK Git: check_mk: All commands are modularized now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 11e1527fd24d0a60c4ff8104c0dfa923a8321424 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11e1527fd24d0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Dec 3 21:08:19 2011 +0100 All commands are modularized now --- web/htdocs/views.py | 383 +++++++---------------------------------- web/plugins/views/commands.py | 319 +++++++++++++++++++++++++++++++++- 2 files changed, 376 insertions(+), 326 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=11e1527fd2…

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' into mobile

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d815847efe55b09fac408028b79a50a7fde99f4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d815847efe55b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 4 23:34:03 2011 +0100 Merge branch 'master' into mobile Conflicts: web/htdocs/check_mk.css web/htdocs/login.py ---

12 years, 9 months

Check_MK Git: check_mk: Mobile: executing commands works

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d3fac902d4c9fb44a4ab2277595a23ef25777941 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3fac902d4c9fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 4 23:24:47 2011 +0100 Mobile: executing commands works --- web/htdocs/check_mk.css | 36 ++++++++++++++++++++++++ web/htdocs/htmllib.py | 26 +++++++++++++++-- web/htdocs/js/mobile.js | 34 ++++++++++++++++++++++ web/htdocs/mobile.css | 19 ++++++++++++ web/htdocs/mobile.py | 71 +++++++++++++++++++++++++++++++++++++++++----- web/htdocs/pages.css | 24 ---------------- web/htdocs/views.py | 9 +++-- 7 files changed, 180 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d3fac902d4…

12 years, 9 months

Check_MK Git: check_mk: Mobile: improved layout of views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f44d83a357c8a10d35dd7892c5b3b4eafe358038 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f44d83a357c8a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 30 18:25:10 2011 +0100 Mobile: improved layout of views --- web/htdocs/index.py | 7 +++- web/htdocs/mobile.css | 41 +++++++++++++++++++---- web/htdocs/mobile.py | 54 +++++++++++++++++++---------- web/plugins/views/mobile.py | 77 ++++++++++++++++++++++++++++++++---------- 4 files changed, 132 insertions(+), 47 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f44d83a357…

12 years, 9 months

Check_MK Git: check_mk: Mobile: intermediate state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 506e6d7edc1b128245b9f25f558f3868b511eb85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=506e6d7edc1b12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 1 15:37:32 2011 +0100 Mobile: intermediate state --- web/htdocs/htmllib.py | 2 +- web/htdocs/mobile.py | 13 +++++++-- web/htdocs/views.py | 26 +++++++++++-------- web/plugins/views/commands.py | 54 +++++++++++++++++++++++++++++++++++++++++ web/plugins/views/mobile.py | 12 ++++---- 5 files changed, 86 insertions(+), 21 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 38eb078..bba0f26 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -235,7 +235,7 @@ class html: onsubmit = ' onsubmit="%s"' % onsubmit else: onsubmit = '' - self.write("<form name=%s class=%s action=\"%s\" method=%s%s%s>\n" % + self.write('<form name=%s class=%s action="%s" method="%s"%s%s>\n' % (name, name, action, method, enctype, onsubmit)) self.hidden_field("filled_in", name) if add_transid: diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index a54872b..02210fd 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -221,7 +221,7 @@ def render_view(view, rows, datasource, group_painters, painters, if context_links: jqm_page_header(_("Context"), left_button=home, id="context") show_context_links(context_links) - jqm_page_navfooter(navbar, '#filter', page_id) + jqm_page_navfooter(navbar, '#context', page_id) def show_filter_form(show_filters): @@ -239,10 +239,17 @@ def show_filter_form(show_filters): f.display() html.write('</div></fieldset></li>\n') html.write("</ul>\n") - html.button("search", _("Search")) - html.hidden_fields() html.end_form() + # Make the tab 'Results' 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();});") def show_context_links(context_links): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 740e9a8..e5861f0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -48,6 +48,7 @@ multisite_painters = {} multisite_sorters = {} multisite_builtin_views = {} multisite_painter_options = {} +multisite_commands = [] ubiquitary_filters = [] # Always show this filters view_hooks = {} @@ -58,11 +59,7 @@ def load_plugins(): return loaded_with_language = current_language - config.declare_permission_section("action", _("Commands on Objects")) - config.declare_permission("action.notifications", - _("Enable/disable notifications"), - _("Enable and disable notifications on hosts and services"), - [ "admin" ]) + config.declare_permission_section("action", _("Commands on host and services")) config.declare_permission("action.enablechecks", _("Enable/disable checks"), _("Enable and disable active or passive checks on hosts and services"), @@ -1969,6 +1966,13 @@ def show_action_form(is_open, datasource): html.write("<div class=whiteborder>\n") html.write("<table class=\"form\">\n") + for command in multisite_commands: + if what in command["tables"] and config.may(command["permission"]): + html.write('<tr><td class=legend>%s</td>\n' % command["title"]) + html.write('<td class=content>\n') + command["render"]() + html.write('</td></tr>\n') + if what in [ "host", "service" ]: show_host_service_actions(what) elif what == "downtime": @@ -1998,12 +2002,12 @@ def show_comment_actions(): def show_host_service_actions(what): - if config.may("action.notifications"): - html.write("<tr><td class=legend>"+_('Notifications')+"</td>\n" - "<td class=content>\n" - "<input type=submit name=_enable_notifications value=\""+_('Enable')+"\"> " - "<input type=submit name=_disable_notifications value=\""+_('Disable')+"\">" - "</td></tr>\n") + # if config.may("action.notifications"): + # html.write("<tr><td class=legend>"+_('Notifications')+"</td>\n" + # "<td class=content>\n" + # "<input type=submit name=_enable_notifications value=\""+_('Enable')+"\"> " + # "<input type=submit name=_disable_notifications value=\""+_('Disable')+"\">" + # "</td></tr>\n") if config.may("action.enablechecks") or config.may("action.reschedule"): html.write("<tr><td class=legend>"+_('Active checks')+"</td>\n" diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py new file mode 100644 index 0000000..44cdd5a --- /dev/null +++ b/web/plugins/views/commands.py @@ -0,0 +1,54 @@ +#!/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. + + +# Declarations of commands on monitoring objects. This file is +# read in with execfile by views.py. +# +# Each command has the following aspects: +# +# - permission +# - title +# - table ("hostservices", "downtime", "comment") +# - function that outputs the HTML input fields +# - function that creates the nagios command and title + +# config.declare_permission("action.notifications", +# _("Enable/disable notifications"), +# _("Enable and disable notifications on hosts and services"), +# [ "admin" ]) +# +# multisite_commands.append({ +# "tables" : [ "host", "service" ], +# "permission" : "action.notifications", +# "title" : _("Notifications"), +# "render" : lambda: \ +# html.button("_enable_notifications", _("Enable")) == \ +# html.button("_disable_notifications", _("Disable")), +# "action" : lambda cmdtag, spec: \ +# "ENABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec, +# _("<b>enable notifications</b> for") +# }) diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 96383b2..67d108f 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -308,13 +308,13 @@ multisite_builtin_views.update({ ('num_services_pending', None), ], 'show_filters': [ - 'host_scheduled_downtime_depth', - 'host_in_notification_period', - 'hoststate', + # 'host_scheduled_downtime_depth', + # 'host_in_notification_period', + # 'hoststate', 'hostregex', - 'host_notifications_enabled', - 'opthostgroup', - 'opthost_contactgroup', + # 'host_notifications_enabled', + # 'opthostgroup', + # 'opthost_contactgroup', ], 'sorters': [], 'title': _('Host search'),

12 years, 9 months

Check_MK Git: check_mk: Mobile: own version of login form

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 896b31f2b7732e8e4861e16c6402b93e990c6af8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=896b31f2b7732e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 30 15:48:53 2011 +0100 Mobile: own version of login form --- web/.f12 | 2 +- web/htdocs/htmllib.py | 19 ++++++++++++--- web/htdocs/images/logo_mk.png | Bin 0 -> 18935 bytes web/htdocs/index.py | 4 +- web/htdocs/login.py | 49 ++++++++++++++++++++++++++--------------- web/htdocs/mobile.css | 27 ++++++++++++++++++++++ web/htdocs/mobile.py | 41 ++++++++++++++++++++++++++++------ web/htdocs/wato.py | 2 +- web/plugins/pages/shipped.py | 4 +- 9 files changed, 113 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=896b31f2b7…

12 years, 9 months

Check_MK Git: check_mk: Mobile: show counts in list overviews

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24513fe9e4da5633d4281536be03744a0a6e5078 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24513fe9e4da56… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 30 16:20:10 2011 +0100 Mobile: show counts in list overviews --- web/htdocs/mobile.py | 3 ++- web/htdocs/views.py | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 645b7cb..aea183a 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -134,9 +134,10 @@ 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, view["title"])) + items.append((url, '%s <span class="ui-li-count">%d</span>' % (view["title"], count))) jqm_page_index(_("Check_MK Mobile"), items) jqm_page_footer() mobile_html_foot() diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 47c7c17..740e9a8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1164,7 +1164,7 @@ def prepare_display_options(): # Display view with real data. This is *the* function everying # is about. def show_view(view, show_heading = False, show_buttons = True, - show_footer = True, render_function = None): + show_footer = True, render_function = None, only_count=False): display_options = prepare_display_options() # User can override the layout settings via HTML variables (buttons) @@ -1274,17 +1274,22 @@ def show_view(view, show_heading = False, show_buttons = True, painter_options.sort() # Fetch data. Some views show data only after pressing [Search] - if (not view["mustsearch"]) or html.var("search"): + if (only_count or (not view["mustsearch"]) or html.var("search")): # names for additional columns (through Stats: headers) add_columns = datasource.get("add_columns", []) # tablename may be a function instead of a livestatus tablename # In that case that function is used to compute the result. + if type(tablename) == type(lambda x:None): rows = tablename(columns, query, only_sites, get_limit(), all_active_filters) else: rows = query_data(datasource, columns, add_columns, query, only_sites, get_limit()) + # TODO: Use livestatus Stats: instead of fetching rows! + if only_count: + return len(rows) + # Now add join information, if there are join columns if len(join_painters) > 0: do_table_join(datasource, rows, filterheaders, join_painters, join_columns, only_sites)

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