Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: Added empty custom styles to all wato builtin modes

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8dce7034ef0ad42ed2c40881a4a8c21d46ab8b44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dce7034ef0ad4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 16:19:22 2012 +0100 Added empty custom styles to all wato builtin modes --- web/htdocs/wato.py | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1fc1890..d0d1e9f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -730,6 +730,9 @@ def mode_folder(phase): if phase == "title": return g_folder["title"] + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() if config.may("wato.rulesets") or config.may("wato.seeall"): @@ -1414,6 +1417,9 @@ def mode_editfolder(phase, new): if phase == "title": return page_title + elif phase == 'styles': + return [] + elif phase == "buttons": linkvars = [("mode", "folder")] if html.has_var("backfolder"): @@ -1642,6 +1648,9 @@ def mode_edithost(phase, new): if phase == "title": return title + elif phase == 'styles': + return [] + elif phase == "buttons": if not new: host_status_button(hostname, "hoststatus") @@ -1795,6 +1804,9 @@ def mode_inventory(phase, firsttime): title += _(" (cached data)") return title + elif phase == 'styles': + return [] + elif phase == "buttons": host_status_button(hostname, "host") html.context_button(_("Folder"), @@ -1959,6 +1971,9 @@ def mode_search(phase): if phase == "title": return _("Search for hosts in %s and below" % (g_folder["title"])) + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") @@ -2192,6 +2207,9 @@ def mode_bulk_inventory(phase): if phase == "title": return _("Bulk service detection (inventory)") + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2289,6 +2307,9 @@ def mode_bulk_edit(phase): if phase == "title": return _("Bulk edit hosts") + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2345,6 +2366,9 @@ def mode_bulk_cleanup(phase): if phase == "title": return _("Bulk removal of explicit attributes") + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2467,6 +2491,9 @@ def mode_random_hosts(phase): if phase == "title": return _("Random Hosts") + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2562,6 +2589,9 @@ def mode_auditlog(phase): if phase == "title": return _("Audit logfile") + elif phase == 'styles': + return [] + elif phase == "buttons": home_button() changelog_button() @@ -2613,6 +2643,9 @@ def mode_changelog(phase): if phase == "title": return _("Pending changes to activate") + elif phase == 'styles': + return [] + elif phase == "buttons": home_button() # Commit pending log right here, if all sites are up-to-date @@ -4068,6 +4101,10 @@ def effective_attributes(host, folder): def mode_snapshot(phase): if phase == "title": return _("Backup/Restore") + + elif phase == 'styles': + return [] + elif phase == "buttons": home_button() changelog_button() @@ -4317,6 +4354,9 @@ def mode_main(phase): if phase == "title": return _("WATO - Check_MK's Web Administration Tool") + elif phase == 'styles': + return [] + elif phase == "buttons": changelog_button() return @@ -4359,6 +4399,9 @@ def mode_globalvars(phase): if phase == "title": return _("Global configuration settings for Check_MK") + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() return @@ -4440,6 +4483,9 @@ def mode_edit_configvar(phase): if phase == "title": return "Global configuration settings for Check_MK" + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("Abort"), make_link([("mode", "globalvars")]), "abort") return @@ -4568,6 +4614,9 @@ def mode_groups(phase, what): if phase == "title": return what_name.title() + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() html.context_button(_("New group"), make_link([("mode", "edit_%s_group" % what)]), "new") @@ -4672,6 +4721,9 @@ def mode_edit_group(phase, what): elif what == "contact": return _("Edit contact group") + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("All groups"), make_link([("mode", "%s_groups" % what)]), "back") return @@ -4804,6 +4856,9 @@ def mode_timeperiods(phase): if phase == "title": return _("Timeperiod definitions") + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() html.context_button(_("New Timeperiod"), make_link([("mode", "edit_timeperiod")]), "new") @@ -4961,6 +5016,9 @@ def mode_edit_timeperiod(phase): else: return _("Edit time period") + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("All Timeperiods"), make_link([("mode", "timeperiods")]), "back") return @@ -5160,6 +5218,9 @@ def mode_sites(phase): if phase == "title": return _("Manage Multisite connections") + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() html.context_button(_("New connection"), make_link([("mode", "edit_site")]), "new") @@ -5383,6 +5444,9 @@ def mode_edit_site(phase): else: return _("Edit site connection %s" % siteid) + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("All Sites"), make_link([("mode", "sites")]), "back") return @@ -6331,6 +6395,9 @@ def mode_users(phase): if phase == "title": return _("Manage Users & Contacts") + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() html.context_button(_("New user"), make_link([("mode", "edit_user")]), "new") @@ -6471,6 +6538,9 @@ def mode_edit_user(phase): else: return _("Edit user %s" % userid) + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("All Users"), make_link([("mode", "users")]), "back") return @@ -6987,6 +7057,9 @@ def mode_roles(phase): if phase == "title": return _("Manage Roles & Permissions") + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() return @@ -7097,6 +7170,9 @@ def mode_edit_role(phase): if phase == "title": return _("Edit user role %s" % id) + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("All Roles"), make_link([("mode", "roles")]), "back") return @@ -7301,6 +7377,9 @@ def mode_hosttags(phase): if phase == "title": return _("Manage host tag groups") + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() html.context_button(_("New Tag group"), make_link([("mode", "edit_hosttag")]), "new") @@ -7417,6 +7496,9 @@ def mode_edit_hosttag(phase): else: return _("Edit tag group") + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("All Hosttags"), make_link([("mode", "hosttags")]), "back") return @@ -7906,6 +7988,9 @@ def mode_rulesets(phase): else: return _("Rulesets for hosts and services") + elif phase == 'styles': + return [] + elif phase == "buttons": if only_host: home_button() @@ -8048,6 +8133,9 @@ def mode_edit_ruleset(phase): title += _(" and %s '%s'") % (rulespec["itemname"], item) return title + elif phase == 'styles': + return [] + elif phase == "buttons": global_buttons() html.context_button(_("All rulesets"), @@ -8603,6 +8691,9 @@ def mode_edit_rule(phase): if phase == "title": return _("Edit rule %s") % rulespec["title"] + elif phase == 'styles': + return [] + elif phase == "buttons": html.context_button(_("Abort"), make_link([("mode", "edit_ruleset"),

12 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae600eaffe0107c10a273a4a17f85cba3c54d8ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae600eaffe0107… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 18:24:54 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: MobileUI: Changed searchhost view

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eeb2a62270538220dd9519b64162336f1a1e5156 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeb2a622705382… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 12 14:56:33 2012 +0100 MobileUI: Changed searchhost view --- web/plugins/views/mobile.py | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index b78df0b..750f894 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -366,15 +366,11 @@ multisite_builtin_views.update({ 'layout': 'mobilelist', 'linktitle': 'Host search', 'mustsearch': True, - 'num_columns': 1, + 'num_columns': 2, 'painters': [ - ('host_state_appr', None), - ('host', 'mobile_host'), - ('num_services_ok', None), - ('num_services_warn', None), - ('num_services_crit', None), - ('num_services_unknown', None), - ('num_services_pending', None), + ('host_state_appr', None), + ('host', 'mobile_host'), + ('host_plugin_output', None), ], 'show_filters': [ 'hoststate',

12 years, 8 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: 53d99d3eba516de626ad6a9e994742c83d72f337 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53d99d3eba516d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 12 14:56:49 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0598

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 81407469f9b93b1f2242418ee1e1de1e42ac507f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81407469f9b93b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 12 14:52:13 2012 +0100 Updated bug entries #0598 --- .bugs/598 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/598 b/.bugs/598 new file mode 100644 index 0000000..a2ca04f --- /dev/null +++ b/.bugs/598 @@ -0,0 +1,10 @@ +Title: WATO inventory does not honor clustered services +Component: wato +State: open +Date: 2012-01-12 13:59:10 +Targetversion: 1.2.0 +Class: bug + +When doing inventory on a cluster node in WATO, the +clustered services are not honored but put to the +node.

12 years, 8 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: 4b20158988dbe4f37173c27ea12660c1acb17653 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b20158988dbe4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 12 14:52:20 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: MobileUI: Persistent header toolbar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78e8ec474f71103fb51bb7232368d2b1b29936fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78e8ec474f7110… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 12 14:45:21 2012 +0100 MobileUI: Persistent header toolbar --- web/htdocs/mobile.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 0409e17..53bdd4e 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -70,13 +70,13 @@ def mobile_html_foot(): html.write("</body></html>\n") def jqm_header_button(url, title, icon=""): - html.write('<a href="%s" data-direction="reverse" data-iconpos="notext" data-icon="%s" title="%s" data-theme="f"></a>' % (url, icon, title)) + html.write('<a href="%s" data-direction="reverse" data-icon="%s" title="%s" >%s</a>' % (url, icon, title, title )) def jqm_page_header(title, id=None, left_button=None, right_button=None): idtxt = id and (' id="%s"' % id) or '' html.write( '<div data-role="page"%s>\n' - '<div data-role="header">\n' % idtxt) + '<div data-role="header" data-position="fixed">\n' % idtxt) if left_button: jqm_header_button(*left_button) html.write('<h1>%s</h1>\n' % title)

12 years, 8 months

Check_MK Git: check_mk: MobileUI: Service view improvments

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f9caa6be9cab9e0ed49cae1f709357b2ee4d9e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f9caa6be9cab9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 12 14:22:50 2012 +0100 MobileUI: Service view improvments --- web/htdocs/mobile.css | 15 ++++++++++++++- web/plugins/views/mobile.py | 1 - 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index 29a37d7..3ac57aa 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -164,9 +164,12 @@ body.mobile table.data td.perfometer td.inner { } td.pnpgraph img { - max-width: 100%; + max-width: 97%; } +body.mobile table.dataset tr.data td.state { + font-size: 25px; +} /*-------------------------------------------------------------------------. | _ _ | | | | ___ __ _(_)_ __ | @@ -196,3 +199,13 @@ img.logomk { } +td.icons img { + height: 40px; + width: 40px; +} + +td.icons a { + padding-left: 8px; +} + + diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 628a654..b78df0b 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -257,7 +257,6 @@ multisite_builtin_views.update({ ('svc_in_downtime', None, ''), ('svc_in_notifper', None, ''), ('svc_notifper', None, ''), - ('check_manpage', None, ''), ('svc_custom_notes', None, ''), ('svc_pnpgraph', None, ''), ],

12 years, 8 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: 9a269ffb5736ff98744411e3069a6a6135d15311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a269ffb5736ff… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 12 13:28:06 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: MobileUI: New sorting for main page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02afa8e6538849a5a7977b5843c4c1206c1774c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02afa8e6538849… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 12 13:24:51 2012 +0100 MobileUI: New sorting for main page --- ChangeLog | 3 +++ web/htdocs/mobile.py | 33 ++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index f27558c..ae87de8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,9 @@ * FIX: Fixed auth problem when following logwatch icon links while using the form based auth + Mobile: + * Improved sorting of views in main page + WATO: * Removed IP-Address attribute from folders * FIX: Fixed missing folders in "move to" dropdown fields diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 9d441bc..0409e17 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -117,19 +117,26 @@ def jqm_page_navfooter(items, current, page_id): html.write('</div>') # close page-div -def jqm_page_index(title, items): - last_topic = '' - first_run = True - items.sort(cmp = lambda a,b: cmp((a[0],a[2]),(b[0],b[2]))) - for topic, href, title in items: - if last_topic != topic: - if first_run != True: - html.write("</ul>") - last_topic = topic - html.write('<p>%s</p><ul data-role="listview" data-inset="true">\n' % topic) - first_run = False; - html.write('<li><a data-ajax="false" data-transition="flip" href="%s">%s</a></li>\n' % (href, title)) - html.write("</ul>\n") +def jqm_page_index(title, items): + manual_sort = [_("Hosts"), _("Services"), _("Events")] + + for topic in manual_sort: + jqm_page_index_topic_renderer(topic, items) + + other_topics = list(set([ x[0] for x in items if x[0] not in manual_sort])) + other_topics.sort() + + for topic in other_topics: + jqm_page_index_topic_renderer(topic, items) + + +def jqm_page_index_topic_renderer(topic, items): + html.write('<p>%s</p><ul data-role="listview" data-inset="true">\n' % topic) + for top, href, title in items: + if top == topic: + html.write('<li><a data-ajax="false" data-transition="flip" href="%s">%s</a></li>\n' % (href, title)) + html.write('</ul>') + def jqm_page(title, content, foot, id=None): jqm_page_header(title, id)

12 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012