Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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, 6 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, 6 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, 6 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, 6 months

Check_MK Git: check_mk: headrify: handle css

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6f981e1abb731f43cf9a6fecce8d05bf04e04dda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f981e1abb731f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 22:44:12 2011 +0100 headrify: handle css --- doc/helpers/headrify | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index b4b9b86..62996a5 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -12,7 +12,7 @@ header () printf "|%-66s|\n" "${line//@/ }" done echo '| |' - echo '| Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de |' + echo '| Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de |' echo '+------------------------------------------------------------------+' cat <<EOF @@ -31,6 +31,10 @@ 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. EOF + if [ -n "$lastline" ] ; then + echo + echo "$lastline" + fi } headrify () @@ -51,6 +55,7 @@ headrify () bangpath="" case "${file##*/}" in *.php) comment="# " ; bangpath="<?php"; ;; + *.css) comment="" ; bangpath="/*"; lastline="*/" ;; *.h|*.c|*.cc|*.h.in|*.js) comment="// " ;; *.conf|*.cfg) comment="# " ;; *.spec|Makefile*) comment="# " ;; @@ -67,10 +72,13 @@ headrify () secondline="$(sed -n 2p < $file)" thirdline="$(sed -n 3p < $file)" shouldbe="$comment+---------------------------------------------------" + endline='.*Boston, MA 02110-1301 USA.' + + if [ -n "$lastline" ] ; then endline="${lastline//\//\/}" ; fi if [ "${firstline:0:20}" = "${shouldbe:0:20}" \ -o "${secondline:0:20}" = "${shouldbe:0:20}" \ -o "${thirdline:0:20}" = "${shouldbe:0:20}" ] ; then - sed '0,/^.*Boston, MA 02110-1301 USA.$/d' $file | sed 1d >> $TMP + sed '0,/^'"${endline//\*/\*}"'$/d' $file | sed 1d >> $TMP else cat $file >> $TMP fi

12 years, 6 months

Check_MK Git: check_mk: Headrified CSS files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59fb83b4d7d38b8231e705059ffab300b4016647 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59fb83b4d7d38b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 22:55:18 2011 +0100 Headrified CSS files --- web/htdocs/bi.css | 27 +++++++++++++++++++++++++++ web/htdocs/check_mk.css | 27 +++++++++++++++++++++++++++ web/htdocs/dashboard.css | 27 +++++++++++++++++++++++++++ web/htdocs/login.css | 27 +++++++++++++++++++++++++++ web/htdocs/logwatch.css | 27 +++++++++++++++++++++++++++ web/htdocs/mobile.css | 27 +++++++++++++++++++++++++++ web/htdocs/pages.css | 27 +++++++++++++++++++++++++++ web/htdocs/sidebar.css | 27 +++++++++++++++++++++++++++ web/htdocs/status.css | 27 +++++++++++++++++++++++++++ web/htdocs/views.css | 27 +++++++++++++++++++++++++++ web/htdocs/wato.css | 27 +++++++++++++++++++++++++++ 11 files changed, 297 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=59fb83b4d7…

12 years, 6 months

Check_MK Git: check_mk: Cleanup CSS files - intermediate phase

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 138fc5aefb882c00883f26afbe0b653280a51271 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=138fc5aefb882c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 22:47:17 2011 +0100 Cleanup CSS files - intermediate phase --- web/htdocs/bi.css | 96 ++ web/htdocs/check_mk.css | 2736 ++--------------------------------------- web/htdocs/dashboard.css | 183 +++ web/htdocs/htmllib.py | 22 +- web/htdocs/login.css | 43 + web/htdocs/logwatch.css | 135 ++ web/htdocs/mobile.css | 24 +- web/htdocs/mobile.py | 9 +- web/htdocs/pages.css | 502 ++++++++ web/htdocs/sidebar.css | 365 ++++++ web/htdocs/status.css | 301 +++++ web/htdocs/views.css | 447 +++++++ web/htdocs/wato.css | 610 +++++++++ web/plugins/views/mobile.py | 18 +- web/plugins/views/painters.py | 2 +- 15 files changed, 2812 insertions(+), 2681 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=138fc5aefb…

12 years, 6 months

Check_MK Git: check_mk: Use check_mk.css also in mobile.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80efbaacd84d9799067aa2e35d82929d204439e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80efbaacd84d97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 30 14:12:15 2011 +0100 Use check_mk.css also in mobile.py --- web/htdocs/mobile.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index a63c318..68466d7 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -25,7 +25,7 @@ def mobile_html_head(title, read_code=""): <meta name="viewport" content="width=device-width, initial-scale=1"> <title>%s</title> <link rel="stylesheet" type="text/css" href="jquery/jquery.mobile-1.0.css"> - <link rel="stylesheet" type="text/css" href="Xcheck_mk.css"> + <link rel="stylesheet" type="text/css" href="check_mk.css"> <link rel="stylesheet" type="text/css" href="status.css"> <link rel="stylesheet" type="text/css" href="mobile.css"> <script type='text/javascript' src='jquery/jquery-1.6.4.min.js'></script>

12 years, 6 months

Check_MK Git: check_mk: Finished splitting up CSS files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e31d99ae254df32e864f8e86e694c3f4e126c89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e31d99ae254df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 23:24:41 2011 +0100 Finished splitting up CSS files --- web/htdocs/dashboard.css | 7 ------- web/htdocs/dashboard.py | 3 +-- web/htdocs/htmllib.py | 18 ++++++++---------- web/htdocs/login.py | 2 +- web/htdocs/sidebar.css | 2 ++ web/htdocs/sidebar.py | 20 ++++---------------- web/htdocs/views.css | 13 +++++++------ web/htdocs/views.py | 6 +++--- web/htdocs/wato.py | 12 +++++++----- 9 files changed, 33 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7e31d99ae2…

12 years, 6 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d7a921147c00da24fb501e643c8e2c438be6e6fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7a921147c00da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 30 14:14:46 2011 +0100 Merge branch 'master' into mobile ---

12 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011