Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

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

Check_MK Git: check_mk: Mobile: context links work

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f54f39223d24485f896d29920ec81030c4a94bb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f54f39223d2448… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 18:09:59 2011 +0100 Mobile: context links work --- web/htdocs/mobile.css | 51 ++++++- web/htdocs/mobile.py | 27 +++- web/htdocs/views.py | 39 +++-- web/plugins/sidebar/shipped.py | 8 +- web/plugins/views/layouts.py | 76 --------- web/plugins/views/mobile.py | 356 ++++++++++++++++++++++++++++++++++++++++ web/plugins/views/painters.py | 19 ++- 7 files changed, 471 insertions(+), 105 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f54f39223d…

12 years, 9 months

Check_MK Git: check_mk: Mobile: first version of filter form

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e736f0f54a6b08fc5b951650ede6e99188bac85f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e736f0f54a6b08… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 18:41:56 2011 +0100 Mobile: first version of filter form --- web/htdocs/htmllib.py | 27 +++++++++++++++++++++------ web/htdocs/mobile.css | 11 +++++++++++ web/htdocs/mobile.py | 21 ++++++++++++++++++++- web/plugins/views/filters.py | 7 +++---- 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a8c9164..0ac7690 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -439,15 +439,24 @@ class html: if varname: self.form_vars.append(varname) - def radiobutton(self, varname, value, checked, text): + def radiobutton(self, varname, value, checked, label): if self.has_var(varname): checked = self.var(varname) == value checked_text = checked and " checked" or "" - self.write("<input type=radio name=%s value=\"%s\"%s> %s\n" % - (varname, value, checked_text, text)) + if label: + id = "rb_%s_%s" % (varname, value) + idtxt = ' id="%s"' % id + else: + idtxt = "" + self.write("<input type=radio name=%s value=\"%s\"%s%s>\n" % + (varname, value, checked_text, idtxt)) + if label: + self.write('<label for="%s">%s</label>\n' % (id, label)) self.form_vars.append(varname) - def checkbox(self, varname, deflt=False, cssclass = '', onclick = None, add_attr = []): + def checkbox(self, varname, deflt=False, cssclass = '', onclick = None, label=None, id=None, add_attr = None): + if add_attr == None: + add_attr = [] # do not use [] as default element, it will be a global variable! error = self.user_errors.get(varname) if error: html = "<x class=inputerror>" @@ -460,13 +469,19 @@ class html: if value == None: # form not yet filled in value = deflt - checked = value and " CHECKED" or "" + checked = value and " CHECKED " or "" if cssclass: cssclass = ' class="%s"' % cssclass onclick_code = onclick and " onclick=\"%s\"" % (onclick) or "" - self.write("<input type=checkbox name=\"%s\"%s%s%s%s>" % + if label and not id: + id = "cb_" + varname + if id: + add_attr.append('id="%s"' % id) + self.write("<input type=checkbox name=\"%s\"%s%s%s%s>\n" % (varname, checked, cssclass, onclick_code, " ".join(add_attr))) self.form_vars.append(varname) + if label: + self.write('<label for="%s">%s</label>\n' % (id, label)) if error: html += "</x>" diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index 46e5524..b966216 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -36,6 +36,17 @@ body.mobile table.dataset tr.data td { font-size: 10pt; } +/* Forms for filters and commands */ +body.mobile table.form { + width: 100%; +} +body.mobile table.form > tbody > tr > * { + width: 100%; +} +body.mobile table.form th { + border-style: none; +} + /* Perfometers */ diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index b77cbb1..cfa629f 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -168,7 +168,7 @@ def render_view(view, rows, datasource, group_painters, painters, # Page: Filters jqm_page_header(_("Filter / Search"), home="mobile.py", id="filter") - jqm_page_content("Hier kommen die Filter") + show_filter_form(show_filters) jqm_page_navfooter(navbar, '#filter', page_id) # Page: Context buttons @@ -178,6 +178,25 @@ def render_view(view, rows, datasource, group_painters, painters, jqm_page_navfooter(navbar, '#filter', page_id) +def show_filter_form(show_filters): + # Sort filters + s = [(f.sort_index, f.title, f) for f in show_filters if f.available()] + s.sort() + + html.begin_form("filter") + html.write('<table class="form">\n') + + for sort_index, title, f in s: + html.write('<tr><th>%s</th></tr>\n' % title) + html.write('<tr><td>\n') + f.display() + html.write('</td></tr>\n') + html.write("</table>\n") + + html.hidden_fields() + html.end_form() + + def show_context_links(context_links): items = [] for view, title, uri, icon, buttonid in context_links: diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 3325604..e4fbb15 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -191,8 +191,8 @@ class FilterServiceState(Filter): for var, text in [(self.prefix + "st0", "OK"), (self.prefix + "st1", "WARN"), \ (self.prefix + "st2", "CRIT"), (self.prefix + "st3", "UNKNOWN"), (self.prefix + "stp", "PENDING")]: - html.checkbox(var, True) - html.write(" %s " % text) + html.checkbox(var, True, label=text) + # html.write(" %s " % text) def filter(self, infoname): headers = [] @@ -223,8 +223,7 @@ class FilterHostState(Filter): def display(self): for var, text in [("hst0", _("UP")), ("hst1", _("DOWN")), ("hst2", _("UNREACH")), ("hstp", _("PENDING"))]: - html.checkbox(var, True) - html.write(" %s " % text) + html.checkbox(var, True, label=text) def filter(self, infoname): headers = []

12 years, 9 months

Check_MK Git: check_mk: Mobile: host search view

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: efcb8b474f6f927b81322271d741b222c6c286c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efcb8b474f6f92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 18:54:20 2011 +0100 Mobile: host search view --- web/plugins/views/filters.py | 3 +- web/plugins/views/mobile.py | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index e4fbb15..899e7af 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -103,8 +103,7 @@ class FilterGroupCombo(Filter): html.select(self.htmlvars[0], choices) if not self.enforce: html.write(" <nobr>") - html.checkbox(self.htmlvars[1]) - html.write(_("negate")) + html.checkbox(self.htmlvars[1], label=_("negate")) html.write("</nobr>") def current_value(self, infoname): diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index c742f1c..f238c46 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -270,6 +270,54 @@ multisite_builtin_views.update({ 'linktitle': _('Host status'), 'title': _('Status of Host'), }), + + # Search hosts + 'mobile_searchhost': mobile_view({ + 'datasource': 'hosts', + 'group_painters': [], + 'hard_filters': [], + 'hard_filtervars': [ + ('is_host_scheduled_downtime_depth', '-1'), + ('is_host_in_notification_period', '-1'), + ('hst0', 'on'), + ('hst1', 'on'), + ('hst2', 'on'), + ('hstp', 'on'), + ('site', ''), + ('host', ''), + ('is_host_notifications_enabled', '-1'), + ('opthostgroup', ''), + ('neg_opthostgroup', ''), + ('opthost_contactgroup', ''), + ('neg_opthost_contactgroup', ''), + ], + 'hide_filters': [], + 'layout': 'mobilelist', + 'linktitle': 'Host search', + 'mustsearch': True, + 'num_columns': 3, + 'painters': [ + ('host_state', None), + ('host', 'mobile_host'), + ('num_services_ok', None), + ('num_services_warn', None), + ('num_services_crit', None), + ('num_services_unknown', None), + ('num_services_pending', None), + ], + 'show_filters': [ + 'host_scheduled_downtime_depth', + 'host_in_notification_period', + 'hoststate', + 'hostregex', + 'host_notifications_enabled', + 'opthostgroup', + 'opthost_contactgroup', + ], + 'sorters': [], + 'title': _('Host search'), + }) + })

12 years, 9 months

Check_MK Git: check_mk: Hostmatrix: limit to 900 hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50d1b9e49303416fef34d58aef1ecc85e1b7c0ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50d1b9e4930341… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 09:42:16 2011 +0100 Hostmatrix: limit to 900 hosts --- web/plugins/sidebar/shipped.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index e658a45..b51e3f8 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -274,10 +274,16 @@ sidebar_snapins["problem_hosts"] = { # -------------------------------------------------------------- def render_hostmatrix(): html.live.set_prepend_site(True) - query = "GET hosts\nColumns: name state has_been_checked worst_service_state scheduled_downtime_depth\nFilter: custom_variable_names < _REALNAME\n" + query = "GET hosts\n" \ + "Columns: name state has_been_checked worst_service_state scheduled_downtime_depth\n" \ + "Filter: custom_variable_names < _REALNAME\n" \ + "Limit: 901\n" hosts = html.live.query(query) html.live.set_prepend_site(False) hosts.sort() + if len(hosts) > 900: + html.write(_("Sorry, I will not display more than 900 hosts.")) + return # Choose smallest square number large enough # to show all hosts

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