Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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

Check_MK Git: check_mk: Hosts dashlet can now show > 100k Hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0c3b2b8f3adadc109650b739ba4b3f31f0b5ee1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0c3b2b8f3adad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 10:40:47 2011 +0100 Hosts dashlet can now show > 100k Hosts --- web/htdocs/check_mk.css | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9c3c35a..61d2e52 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1896,8 +1896,8 @@ div.dashlet table.hoststats a:hover { div.dashlet table.hoststats td { text-align: right; - padding-right: 6px; - padding-left: 6px; + padding-right: 4px; + padding-left: 4px; background-image: url("images/form_background.png"); background-repeat: repeat; } @@ -1905,10 +1905,10 @@ div.dashlet table.hoststats td { div.dashlet table.hoststats th { text-align: left; background-color: transparent; - padding-left: 6px; + padding-left: 4px; } div.dashlet table.hoststats td.color { - padding: 3px; + padding: 2px; } div.dashlet table.hoststats th, table.hoststats td { padding-top: 3px;

12 years, 6 months

Check_MK Git: check_mk: Fix volatile with empty topic

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6ae40bffffcca82f86083cfed569a6efc30db5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6ae40bffffcca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 10:40:26 2011 +0100 Fix volatile with empty topic --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c0de3d1..422571e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3873,7 +3873,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if len(topics) > 1: html.write("</table>") html.end_foldable_container() # end of topic - if topic_is_volatile: + if topic: volatile_topics.append(topic.encode('utf-8')) if topic == topics[-1]: html.write('<table class="form nomargin">')

12 years, 6 months

Check_MK Git: check_mk: figheader: support different languages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c32a529333a79c5d94dd275c22a20909031ad039 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c32a529333a79c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 29 21:27:36 2011 +0100 figheader: support different languages --- doc/helpers/figheader | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/doc/helpers/figheader b/doc/helpers/figheader index ed36a9d..41abf0f 100755 --- a/doc/helpers/figheader +++ b/doc/helpers/figheader @@ -1,14 +1,36 @@ #!/usr/bin/python import os, sys + +if sys.argv[1] == '--css': + first = "/*-" + sep = "+" + cont = "" + last = "'" + end = "*/" +elif sys.argv[1] == '--c++': + first = "// ." + cont = "// " + sep = "// +" + last = "// '" + end = "'" +else: + first = "# .-" + sep = "# +" + cont = "# " + last = "# '-" + end = "'" + +if sys.argv[1].startswith("-"): + sys.argv = sys.argv[1:] + width = 76 -septop = "# ." + '-' * (width - 6) + '.' -sepmid = "# +" + '-' * (width - 6) + '+' -sepbot = "# '" + '-' * (width - 6) + "'" -print septop +sepmid = sep + '-' * (width - len(sep) - 1) + '+' + +print first + '-' * (width - len(first) - 1) + '.' for line in os.popen("figlet -c -w %d '%s'" % (width - 7, " ".join(sys.argv[1:])), "r"): line = line[:-1] - print ("# |%-" + str(width - 6) + "s|") % line + print (cont + "|%-" + str(width - len(cont) - 2) + "s|") % line print sepmid -print "# |" + " " * (width - 6) + "|" -print sepbot +print cont + "|" + " " * (width - len(cont) - 2) + "|" +print last + '-' * (width - len(last) - len(end)) + end

12 years, 6 months

Check_MK Git: check_mk: First hello-world application with jQuery Mobile

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd8b63b08937c960162670a1e36c2b1eb22a2c8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd8b63b08937c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 26 22:39:20 2011 +0100 First hello-world application with jQuery Mobile --- web/htdocs/jquery/images/ajax-loader.png | Bin 0 -> 366 bytes web/htdocs/jquery/images/icons-18-black.png | Bin 0 -> 2152 bytes web/htdocs/jquery/images/icons-18-white.png | Bin 0 -> 1958 bytes web/htdocs/jquery/images/icons-36-black.png | Bin 0 -> 4260 bytes web/htdocs/jquery/images/icons-36-white.png | Bin 0 -> 3746 bytes web/htdocs/jquery/jquery-1.6.4.min.js | 4 + web/htdocs/jquery/jquery-1.7.1.min.js | 4 + web/htdocs/jquery/jquery.mobile-1.0.css | 1847 ++++++ web/htdocs/jquery/jquery.mobile-1.0.js | 6951 ++++++++++++++++++++ web/htdocs/jquery/jquery.mobile-1.0.min.css | 2 + web/htdocs/jquery/jquery.mobile-1.0.min.js | 172 + web/htdocs/jquery/jquery.mobile.structure-1.0.css | 714 ++ .../jquery/jquery.mobile.structure-1.0.min.css | 2 + web/htdocs/mobile.css | 5 + web/htdocs/mobile.py | 71 + web/htdocs/views.py | 12 +- web/plugins/pages/mobile.py | 7 + 17 files changed, 9789 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cd8b63b089…

12 years, 6 months

Check_MK Git: check_mk: Mobile: intermediate version

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: acaa779f39f665c3f85b1da3d04592b13b0c910c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acaa779f39f665… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 27 21:37:38 2011 +0100 Mobile: intermediate version --- web/htdocs/index.py | 11 +++- web/htdocs/mobile.css | 30 ++++++++- web/htdocs/mobile.py | 142 ++++++++++++++++++++++++++++++++++------- web/htdocs/views.py | 121 +++++++++++++++++++++++++---------- web/plugins/pages/mobile.py | 1 + web/plugins/views/layouts.py | 77 ++++++++++++++++++++++ web/plugins/views/painters.py | 23 ++++++- 7 files changed, 342 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=acaa779f39…

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: 8d7e8cc38a3e4ce520003a043d502ba19011cc3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d7e8cc38a3e4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 15:31:06 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