Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: Revert " Preventing creation of users which are only found in htpasswd (-> hidden from WATO)"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 33ef988e13cd180bad6e3cf9bf2b9e7ae44d7494 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33ef988e13cd18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 10:51:18 2012 +0200 Revert "Preventing creation of users which are only found in htpasswd (-> hidden from WATO)" This reverts commit 49c48b609aa0c21b1f9d486409ff0739a1c6f6e6. --- web/htdocs/wato.py | 57 ++++++++++++++++++++------------------------------- 1 files changed, 22 insertions(+), 35 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f8f7ff3..57fdd2b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6815,7 +6815,7 @@ def mode_edit_user(phase): return "users" id = html.var("userid").strip() - if new and (id in users or in_htpasswd(id)): + if new and id in users: raise MKUserError("userid", _("This username is already being used by another user.")) if not re.match("^[-a-z0-9A-Z_\.]+$", id): raise MKUserError("userid", _("The username must consist only of letters, digit and the underscore.")) @@ -7139,27 +7139,6 @@ def mode_edit_user(phase): html.hidden_fields() html.end_form() -def load_htpasswd(): - users = {} - filename = defaults.htpasswd_file - if os.path.exists(filename): - for line in file(filename): - id, password = line.strip().split(":")[:2] - if password.startswith("!"): - locked = True - password = password[1:] - else: - locked = False - - users[id] = { - 'password': password, - 'locked': locked, - } - return users - -def in_htpasswd(id): - return id in load_htpasswd() - def load_users(): # First load monitoring contacts from Check_MK's world filename = root_dir + "contacts.mk" @@ -7216,19 +7195,27 @@ def load_users(): # they are getting according to the multisite old-style # configuration variables. - for id, user in load_htpasswd().items(): - if id in result: - result[id]["password"] = user['password'] - result[id]["locked"] = user['locked'] - elif config.wato_create_users_from_htpasswd: - # Create entry if this is an admin user - new_user = { - "roles" : config.roles_of_user(id), - "password" : user['password'], - "locked" : False - } - result[id] = new_user - # Other unknown entries will silently be dropped. Sorry... + filename = defaults.htpasswd_file + if os.path.exists(filename): + for line in file(filename): + id, password = line.strip().split(":")[:2] + if password.startswith("!"): + locked = True + password = password[1:] + else: + locked = False + if id in result: + result[id]["password"] = password + result[id]["locked"] = locked + elif wato_create_users_from_htpasswd: + # Create entry if this is an admin user + new_user = { + "roles" : config.roles_of_user(id), + "password" : password, + "locked" : False + } + result[id] = new_user + # Other unknown entries will silently be dropped. Sorry... # Now read the automation secrets and add them to existing # users or create new users automatically

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 032d7c62772dc572d9b685aecfa105b248fa4548 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=032d7c62772dc5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Apr 16 17:46:52 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6d11b24bc656d6c1e5fb133212fb713110c19270 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d11b24bc656d6… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Apr 16 17:46:29 2012 +0200 Add new bug entry --- .bugs/707 | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/.bugs/707 b/.bugs/707 new file mode 100644 index 0000000..eca28fe --- /dev/null +++ b/.bugs/707 @@ -0,0 +1,26 @@ +Title: WATO dashlets Service problems and Events of rec. 4 hours can die if view is missing +Component: multisite +State: open +Date: 2012-04-16 17:10:07 +Targetversion: 1.2.0 +Class: nastiness + +The dashlets will print the following error +Internal error:: 'aggr_onlyproblems' +Traceback (most recent call last): + File "/omd/sites/new/share/check_mk/web/htdocs/index.py", line 312, in handler + handler() + File "/omd/sites/new/share/check_mk/web/htdocs/views.py", line 1047, in page_view + show_view(view, True, True, True) + File "/omd/sites/new/share/check_mk/web/htdocs/views.py", line 1163, in show_view + vo = view_options(view["name"]) + File "/omd/sites/new/share/check_mk/web/htdocs/views.py", line 1564, in view_options + del v[on] +KeyError: 'aggr_onlyproblems' + +The error can be reproduced if you modify the following +Multisite role setting to 'no': +Change column display options + + +Since this is user-modifyable we need to catch it and i.e. disable the dashlets.

12 years, 5 months

Check_MK Git: check_mk: Finalized sidebar styling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ed7de56d8bd357459b4f8c7769219413e974145a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed7de56d8bd357… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 16 17:42:19 2012 +0200 Finalized sidebar styling --- web/htdocs/images/button_quicksearch_hi.png | Bin 0 -> 1553 bytes web/htdocs/images/button_quicksearch_lo.png | Bin 0 -> 1473 bytes web/htdocs/images/quicksearch_field_bg.png | Bin 0 -> 444 bytes web/htdocs/js/search.js | 6 ++++ web/plugins/sidebar/search.py | 35 +++++++++++++++++--------- web/plugins/sidebar/shipped.py | 6 ++-- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/web/htdocs/images/button_quicksearch_hi.png b/web/htdocs/images/button_quicksearch_hi.png new file mode 100644 index 0000000..d1ddbe5 Binary files /dev/null and b/web/htdocs/images/button_quicksearch_hi.png differ diff --git a/web/htdocs/images/button_quicksearch_lo.png b/web/htdocs/images/button_quicksearch_lo.png new file mode 100644 index 0000000..ae3589a Binary files /dev/null and b/web/htdocs/images/button_quicksearch_lo.png differ diff --git a/web/htdocs/images/quicksearch_field_bg.png b/web/htdocs/images/quicksearch_field_bg.png new file mode 100644 index 0000000..1f19397 Binary files /dev/null and b/web/htdocs/images/quicksearch_field_bg.png differ diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index c4a6492..eca8609 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -150,6 +150,12 @@ function mkSearchKeyRepeat(e, oField) { // On key press down event handler +function mkSearchButton() { + var oField = document.getElementById("mk_side_search_field"); + var ev = { "which" : 0, "keyCode" : 13 } + return mkSearchKeyDown(ev, oField); +} + function mkSearchKeyDown(e, oField) { var keyCode = e.which || e.keyCode; diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 40ba14a..88e2bce 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -47,6 +47,7 @@ def render_searchform(): html.write('<div id="mk_side_search" class="content_center" onclick="mkSearchClose();">') html.write('<input id="mk_side_search_field" type="text" name="search" autocomplete="off" />') + html.icon_button("#", _("Search"), "quicksearch", onclick="mkSearchButton();") html.write('</div>') html.write("<script type='text/javascript' src='js/search.js'></script>\n") html.write("<script type='text/javascript'>\n") @@ -96,23 +97,33 @@ sidebar_snapins["search"] = { "restart": True, "allowed": [ "user", "admin", "guest" ], "styles": """ + #mk_side_search { - width: %dpx; + width: 225px; padding: 0; + position: relative; + left: -2px; +} + +#mk_side_search img.iconbutton { + width: 33px; + height: 26px; + position: absolute; + top: 0px; + left: 196px; } #mk_side_search input { margin: 0; - padding: 0; + padding: 0px 5px; font-size: 8pt; - /* The padding and border defined below stretch the object by 2px in each - * direction. This needs to be substracted from the width to position the - * field correctly - */ - width: %dpx; - padding: 1px; - border: 1px #73767A solid; - outline: 1px solid #fff; + width: 194px; + height: 25px; + background-image: url("images/quicksearch_field_bg.png"); + background-repeat: no-repeat; + -moz-border-radius: 0px; + border-style: none; + } #mk_search_results { @@ -121,7 +132,7 @@ sidebar_snapins["search"] = { top: 1px; background-color: #DFDFDF; color: #000; - font-size: 80%%; + font-size: 80%; width: 223px; } @@ -138,5 +149,5 @@ sidebar_snapins["search"] = { background-color: #BFBFBF; } -""" % (snapin_width - 4, snapin_width - 8) +""" } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 91ab9ac..6c12c36 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -972,8 +972,8 @@ sidebar_snapins["master_control"] = { "allowed" : [ "admin", ], "styles" : """ div.snapin table.master_control { - width: %dpx; - margin: 0px 0px 8px 0px; + width: 100%; + margin: 0px 0px 0px 0px; border-spacing: 0px; } @@ -997,7 +997,7 @@ div.snapin table.master_control td img.iconbutton { height: 16px; } -""" % (snapin_width - 15) +""" } def ajax_switch_masterstate():

12 years, 5 months

Check_MK Git: check_mk: New footer buttons for sidebar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 950a9b5751de616bfbc4c69e1c1ff7474bc70d10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=950a9b5751de61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 16 16:49:29 2012 +0200 New footer buttons for sidebar --- ChangeLog | 1 + web/htdocs/htmllib.py | 9 ++- web/htdocs/images/button_sidebar_addsnapin_hi.png | Bin 0 -> 1145 bytes web/htdocs/images/button_sidebar_addsnapin_lo.png | Bin 0 -> 1129 bytes web/htdocs/images/button_sidebar_logout_hi.png | Bin 0 -> 1582 bytes web/htdocs/images/button_sidebar_logout_lo.png | Bin 0 -> 1569 bytes web/htdocs/images/button_sidebar_settings_hi.png | Bin 0 -> 1462 bytes web/htdocs/images/button_sidebar_settings_lo.png | Bin 0 -> 1464 bytes web/htdocs/sidebar.css | 66 ++------------------ web/htdocs/sidebar.py | 11 ++- web/htdocs/wato.py | 7 +- web/plugins/sidebar/wato.py | 2 +- 12 files changed, 26 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ea1d0c..5143458 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ of the main frameset (%s will be replaced with OMD site name) * FIX: Fix problem where snapins where invisible * FIX: Fixed multisite timeout errors when nagios not running + * Sidebar: some new layout improvements BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0044448..e180460 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -359,7 +359,7 @@ class html: def empty_icon(self): self.write('<img class=icon src="images/trans.png">') - def icon_button(self, url, help, icon, id="", onclick="", style=""): + def icon_button(self, url, help, icon, id="", onclick="", style="", target=""): if id: id = "id='%s' " % id @@ -370,12 +370,15 @@ class html: if style: style = 'style="%s" ' % style - self.write('<a %s%s%sonfocus="if (this.blur) this.blur();" href="%s">' + if target: + target = 'target="%s" ' % target + + self.write('<a %s%s%s%sonfocus="if (this.blur) this.blur();" href="%s">' '<img align=absmiddle class=iconbutton title="%s" ' 'src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>' % (id, onclick, style, url, help, icon)) + '</a>' % (id, onclick, style, target, url, help, icon)) def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">') diff --git a/web/htdocs/images/button_sidebar_addsnapin_hi.png b/web/htdocs/images/button_sidebar_addsnapin_hi.png new file mode 100644 index 0000000..3fc7fd0 Binary files /dev/null and b/web/htdocs/images/button_sidebar_addsnapin_hi.png differ diff --git a/web/htdocs/images/button_sidebar_addsnapin_lo.png b/web/htdocs/images/button_sidebar_addsnapin_lo.png new file mode 100644 index 0000000..21ee712 Binary files /dev/null and b/web/htdocs/images/button_sidebar_addsnapin_lo.png differ diff --git a/web/htdocs/images/button_sidebar_logout_hi.png b/web/htdocs/images/button_sidebar_logout_hi.png new file mode 100644 index 0000000..9c760de Binary files /dev/null and b/web/htdocs/images/button_sidebar_logout_hi.png differ diff --git a/web/htdocs/images/button_sidebar_logout_lo.png b/web/htdocs/images/button_sidebar_logout_lo.png new file mode 100644 index 0000000..a48cd56 Binary files /dev/null and b/web/htdocs/images/button_sidebar_logout_lo.png differ diff --git a/web/htdocs/images/button_sidebar_settings_hi.png b/web/htdocs/images/button_sidebar_settings_hi.png new file mode 100644 index 0000000..0083b45 Binary files /dev/null and b/web/htdocs/images/button_sidebar_settings_hi.png differ diff --git a/web/htdocs/images/button_sidebar_settings_lo.png b/web/htdocs/images/button_sidebar_settings_lo.png new file mode 100644 index 0000000..716f4da Binary files /dev/null and b/web/htdocs/images/button_sidebar_settings_lo.png differ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index ba42335..1e9f0c8 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -93,77 +93,25 @@ body.side { position: absolute; bottom: 0; left: 0; - height: 35px; + height: 50px; width: 100%; z-index: 10; background-repeat: no-repeat; background-image: url("images/sidebar_bottom.png"); } -#side_footer ul.buttons { - height: 20px; - z-index: 20; - position: absolute; +#side_footer img.iconbutton { + position: relative; top: 10px; - left: 15px; - margin: 0; - padding: 0; -} - -#side_footer ul.buttons li { - list-style-type: none; - float: left; - display: inline; - margin-left: 0; -} - -#side_footer ul.buttons a { - width: 75px; - height: 17px; - display: block; - color: #fff; - text-align: center; - vertical-align: middle; - padding-top: 3px; - text-decoration: none; - background-repeat: repeat; - background-image: url("images/sidebar_button_lo.png"); - margin: 0; -} - -#side_footer ul.buttons a:hover { - background-image: url("images/sidebar_button_hi.png"); -} - -#side_footer ul.buttons a.logout { - width: 20px; - margin-left: 5px; - background-image: url("images/sidebar_logout_lo.png"); -} - -#side_footer ul.buttons a.logout:hover { - background-image: url("images/sidebar_logout_hi.png"); -} - -#side_footer ul.buttons a.profile { - width: 20px; - margin-left: 2px; - background-image: url("images/sidebar_profile_lo.png"); -} - -#side_footer ul.buttons a.profile:hover { - background-image: url("images/sidebar_profile_hi.png"); -} - -#side_footer div.buttons a { - float: left; + left: 10px; + margin-right: 3px; } #side_footer div.copyright { color: #fff; position: relative; - left: 130px; - top: 12px; + left: 141px; + top: -5px; width: 122px; text-align: right; } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e9521ac..915efde 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -126,13 +126,16 @@ def sidebar_head(): def sidebar_foot(): html.write('<div id="side_footer">') - html.write('<ul class=buttons>\n') if config.may("configure_sidebar"): - html.write('<li><a target="main" href="sidebar_add_snapin.py">%s</a></li>' % _('Add snapin')) + html.icon_button("sidebar_add_snapin.py", _("Add snapin to the sidebar"), "sidebar_addsnapin", + target="main") if config.may("edit_profile") or config.may("change_password"): - html.write('<li><a class=profile target="main" href="user_profile.py" title="%s"></a></li>' % _('Edit user profile')) + html.icon_button("user_profile.py", _("Edit your personal settings, change your password"), "sidebar_settings", + target="main") + # html.write('<li><a class=profile target="main" href="user_profile.py" title="%s"></a></li>' % _('Edit user profile')) if config.may("logout"): - html.write('<li><a class=logout target="_top" href="logout.py" title="%s"></a></li>' % _('Logout')) + html.icon_button("logout.py", _("Log out"), "sidebar_logout", target="_top") + # html.write('<li><a class=logout target="_top" href="logout.py" title="%s"></a></li>' % _('Logout')) html.write('</ul>') html.write("<div class=copyright>%s</div>\n" % _("© <a target=\"_blank\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) html.write('</div>') diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1b3a234..255ff38 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -228,7 +228,7 @@ def page_handler(): if modefunc == None: html.header(_("Sorry"), stylesheets=wato_styles) html.begin_context_buttons() - html.context_button(_("Home"), make_link([("mode", "main")]), "home") + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") html.end_context_buttons() html.message(_("This module has not yet been implemented.")) html.footer() @@ -769,6 +769,7 @@ def mode_folder(phase): elif phase == "buttons": global_buttons() + # html.write("<br><br><hr>") if config.may("wato.rulesets") or config.may("wato.seeall"): html.context_button(_("Rulesets"), make_link([("mode", "ruleeditor")]), "rulesets") html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") @@ -9921,7 +9922,7 @@ def mode_pattern_editor(phase): return _("Logfile Patterns of Logfile %s on Host %s") % (item, hostname) elif phase == "buttons": - html.context_button(_("Home"), make_link([("mode", "main")]), "home") + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") if host: if item: title = _("Show Logfile") @@ -10467,7 +10468,7 @@ def global_buttons(): home_button() def home_button(): - html.context_button(_("Home"), make_link([("mode", "main")]), "home") + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") def search_button(): html.context_button(_("Search"), make_link([("mode", "search")]), "search") diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 7cc162f..26c3c2c 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -41,7 +41,7 @@ def render_wato(): html.write(_("You are not allowed to use Check_MK's web configuration GUI.")) return False - iconlink(_("Main menu"), "wato.py", "home") + iconlink(_("Main Menu"), "wato.py", "home") for mode, title, icon, permission, help in wato.modules: if config.may("wato." + permission) or config.may("wato.seeall"): iconlink(title, "wato.py?mode=%s" % mode, icon)

12 years, 5 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: def98220c3d531ce5a3b8388e83b1f45938bc62f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=def98220c3d531… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 16 15:52:27 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Sidebar: added new buttons for site status/ master control

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f96da821a83c2b945ded76fb8d977bd6c99f329c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f96da821a83c2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 16 15:52:24 2012 +0200 Sidebar: added new buttons for site status/master control --- web/htdocs/images/button_sitestatus_dead_hi.png | Bin 0 -> 1179 bytes web/htdocs/images/button_sitestatus_dead_lo.png | Bin 0 -> 1110 bytes .../images/button_sitestatus_disabled_hi.png | Bin 0 -> 1009 bytes .../images/button_sitestatus_disabled_lo.png | Bin 0 -> 1024 bytes web/htdocs/images/button_sitestatus_down_hi.png | Bin 0 -> 1112 bytes web/htdocs/images/button_sitestatus_down_lo.png | Bin 0 -> 1032 bytes web/htdocs/images/button_sitestatus_online_hi.png | Bin 0 -> 1155 bytes web/htdocs/images/button_sitestatus_online_lo.png | Bin 0 -> 1179 bytes web/htdocs/images/button_sitestatus_unknown_hi.png | Bin 0 -> 1301 bytes web/htdocs/images/button_sitestatus_unknown_lo.png | Bin 0 -> 1301 bytes web/htdocs/images/button_sitestatus_unreach_hi.png | Bin 0 -> 1253 bytes web/htdocs/images/button_sitestatus_unreach_lo.png | Bin 0 -> 1243 bytes web/htdocs/images/button_sitestatus_waiting_hi.png | Bin 0 -> 1325 bytes web/htdocs/images/button_sitestatus_waiting_lo.png | Bin 0 -> 1301 bytes web/htdocs/images/button_snapin_switch_off_hi.png | Bin 0 -> 1086 bytes web/htdocs/images/button_snapin_switch_off_lo.png | Bin 0 -> 1026 bytes web/htdocs/images/button_snapin_switch_on_hi.png | Bin 0 -> 1162 bytes web/htdocs/images/button_snapin_switch_on_lo.png | Bin 0 -> 1157 bytes web/htdocs/images/sidebar_bottom.png | Bin 643 -> 462 bytes web/htdocs/images/sidebar_top.png | Bin 7761 -> 6961 bytes web/htdocs/images/snapin_background.png | Bin 300 -> 196 bytes web/htdocs/images/snapin_closed.png | Bin 1134 -> 845 bytes web/htdocs/images/snapin_footer.png | Bin 633 -> 475 bytes web/htdocs/images/snapin_header.png | Bin 669 -> 509 bytes web/htdocs/sidebar.css | 2 +- web/plugins/sidebar/shipped.py | 56 ++++++------------- 26 files changed, 19 insertions(+), 39 deletions(-) diff --git a/web/htdocs/images/button_sitestatus_dead_hi.png b/web/htdocs/images/button_sitestatus_dead_hi.png new file mode 100644 index 0000000..06e240c Binary files /dev/null and b/web/htdocs/images/button_sitestatus_dead_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_dead_lo.png b/web/htdocs/images/button_sitestatus_dead_lo.png new file mode 100644 index 0000000..ca1e945 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_dead_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_disabled_hi.png b/web/htdocs/images/button_sitestatus_disabled_hi.png new file mode 100644 index 0000000..a516dfe Binary files /dev/null and b/web/htdocs/images/button_sitestatus_disabled_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_disabled_lo.png b/web/htdocs/images/button_sitestatus_disabled_lo.png new file mode 100644 index 0000000..cedbfc9 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_disabled_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_down_hi.png b/web/htdocs/images/button_sitestatus_down_hi.png new file mode 100644 index 0000000..32537e3 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_down_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_down_lo.png b/web/htdocs/images/button_sitestatus_down_lo.png new file mode 100644 index 0000000..c7b838e Binary files /dev/null and b/web/htdocs/images/button_sitestatus_down_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_online_hi.png b/web/htdocs/images/button_sitestatus_online_hi.png new file mode 100644 index 0000000..8c6a3cb Binary files /dev/null and b/web/htdocs/images/button_sitestatus_online_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_online_lo.png b/web/htdocs/images/button_sitestatus_online_lo.png new file mode 100644 index 0000000..7163693 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_online_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_unknown_hi.png b/web/htdocs/images/button_sitestatus_unknown_hi.png new file mode 100644 index 0000000..afb78ce Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unknown_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_unknown_lo.png b/web/htdocs/images/button_sitestatus_unknown_lo.png new file mode 100644 index 0000000..fde96b1 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unknown_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_unreach_hi.png b/web/htdocs/images/button_sitestatus_unreach_hi.png new file mode 100644 index 0000000..b7c7a73 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unreach_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_unreach_lo.png b/web/htdocs/images/button_sitestatus_unreach_lo.png new file mode 100644 index 0000000..d5e795d Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unreach_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_waiting_hi.png b/web/htdocs/images/button_sitestatus_waiting_hi.png new file mode 100644 index 0000000..deb4d3c Binary files /dev/null and b/web/htdocs/images/button_sitestatus_waiting_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_waiting_lo.png b/web/htdocs/images/button_sitestatus_waiting_lo.png new file mode 100644 index 0000000..034e3aa Binary files /dev/null and b/web/htdocs/images/button_sitestatus_waiting_lo.png differ diff --git a/web/htdocs/images/button_snapin_switch_off_hi.png b/web/htdocs/images/button_snapin_switch_off_hi.png new file mode 100644 index 0000000..a6cdaf2 Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_off_hi.png differ diff --git a/web/htdocs/images/button_snapin_switch_off_lo.png b/web/htdocs/images/button_snapin_switch_off_lo.png new file mode 100644 index 0000000..db5a76b Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_off_lo.png differ diff --git a/web/htdocs/images/button_snapin_switch_on_hi.png b/web/htdocs/images/button_snapin_switch_on_hi.png new file mode 100644 index 0000000..974583d Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_on_hi.png differ diff --git a/web/htdocs/images/button_snapin_switch_on_lo.png b/web/htdocs/images/button_snapin_switch_on_lo.png new file mode 100644 index 0000000..d7b8049 Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_on_lo.png differ diff --git a/web/htdocs/images/sidebar_bottom.png b/web/htdocs/images/sidebar_bottom.png index b945e5a..30284e7 100644 Binary files a/web/htdocs/images/sidebar_bottom.png and b/web/htdocs/images/sidebar_bottom.png differ diff --git a/web/htdocs/images/sidebar_top.png b/web/htdocs/images/sidebar_top.png index 6e20f09..2057a38 100644 Binary files a/web/htdocs/images/sidebar_top.png and b/web/htdocs/images/sidebar_top.png differ diff --git a/web/htdocs/images/snapin_background.png b/web/htdocs/images/snapin_background.png index 1bd35a0..c967a98 100644 Binary files a/web/htdocs/images/snapin_background.png and b/web/htdocs/images/snapin_background.png differ diff --git a/web/htdocs/images/snapin_closed.png b/web/htdocs/images/snapin_closed.png index 9607c94..c8c489b 100644 Binary files a/web/htdocs/images/snapin_closed.png and b/web/htdocs/images/snapin_closed.png differ diff --git a/web/htdocs/images/snapin_footer.png b/web/htdocs/images/snapin_footer.png index f4938ec..c1b8dbc 100644 Binary files a/web/htdocs/images/snapin_footer.png and b/web/htdocs/images/snapin_footer.png differ diff --git a/web/htdocs/images/snapin_header.png b/web/htdocs/images/snapin_header.png index df703d4..b83aaec 100644 Binary files a/web/htdocs/images/snapin_header.png and b/web/htdocs/images/snapin_header.png differ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index b503957..ba42335 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -204,7 +204,7 @@ div.snapin div.head.open { div.snapin div.head.closed { background-image: url("images/snapin_closed.png"); - height: 22px; + height: 23px; } /* close button on header */ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 46ea3c1..91ab9ac 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -421,8 +421,8 @@ def render_sitestatus(): html.write("<tr><td class=left>%s</td>" % text) onclick = "switch_site('_site_switch=%s:%s')" % (sitename, switch) html.write("<td class=state>") - html.write('<a title="%s" href="#" onclick="%s" class="sitestatus %s">%s</a></td>' % - (title, onclick, state, state)) + html.icon_button("#", _("%s this site") % (state == "disabled" and "enable" or "disable"), + "sitestatus_%s" % state, onclick=onclick) html.write("</tr>\n") html.write("</table>\n") @@ -448,14 +448,11 @@ table.sitestate td.left { text-align: left; } -table.sitestate a { - font-weight: bold; - -moz-border-radius: 4px; - margin: 0px; - padding: 0px 0px; - text-align: center; - display: block; +div.snapin table.sitestate td img.iconbutton { + width: 60px; + height: 16px; } + table.sitestate td.left a { text-align: left; font-weight: normal; @@ -466,10 +463,6 @@ table.sitestate td.state { font-size: 7pt; } -table.sitestate td.state a { - border-width: 1px; - border-style: solid; -} """ % snapin_width } @@ -574,11 +567,11 @@ table.tacticaloverview th span { table.tacticaloverview td { width: 33.3%%; text-align: right; - border: 1px solid #123a4a; + /* border: 1px solid #123a4a; */ background-color: #6da1b8; padding: 0px; height: 14px; - box-shadow: 0px 0px 1px #386068; + /* box-shadow: 1px 0px 1px #386068; */ } table.tacticaloverview a { display: block; margin-right: 2px; } """ % snapin_width @@ -962,8 +955,11 @@ def render_master_control(): colvalue = siteline[i + 1] url = defaults.url_prefix + ("check_mk/switch_master_state.py?site=%s&switch=%s&state=%d" % (siteid, colname, 1 - colvalue)) onclick = "get_url('%s', updateContents, 'snapin_master_control')" % url - enabled = colvalue and "enabled" or "disabled" - html.write("<tr><td class=left>%s</td><td class=%s><a onclick=\"%s\" href=\"#\">%s</a></td></tr>\n" % (title, enabled, onclick, enabled)) + html.write("<tr><td class=left>%s</td><td>" % title) + html.icon_button("#", _("Switch %s %s") % (title, colvalue and "off" or "on"), + "snapin_switch_" + (colvalue and "on" or "off"), onclick=onclick) + html.write("</td></tr>") + # html.write("<a onclick=\"%s\" href=\"#\">%s</a></td></tr>\n" % (title, enabled, onclick, enabled)) html.write("</table>") if siteid: html.end_foldable_container() @@ -986,17 +982,6 @@ div.snapin table.master_control td { text-align: right; } -div.snapin table.master_control td a { - font-weight: bold; - -moz-border-radius: 4px; - margin: 0px; - padding: 0px 3px; - text-align: center; - font-size: 7pt; - margin-right: 0px; - display: block; - border: 1px solid black; -} div.snapin table.master_control td.left a { text-align: left; font-size: 8pt; @@ -1007,17 +992,12 @@ div.snapin table.master_control td.left { text-align: left; } -div.snapin table.master_control td.enabled a { - background-color: #4f6; - color: #000; - border-color: #080; -} -div.snapin table.master_control td.disabled a { - background-color: #f33; - border-color: #c00; - color: #fff; +div.snapin table.master_control td img.iconbutton { + width: 60px; + height: 16px; } -""" % (snapin_width - 20) + +""" % (snapin_width - 15) } def ajax_switch_masterstate():

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 17917dfbff5791e2a39e0b87991304574c9e131e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17917dfbff5791… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 08:21:28 2012 +0200 Merge branch 'master' into logwatch ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0690

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 39ca554bfb7babb80102e32bc85ddb32174ded83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39ca554bfb7bab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 08:21:23 2012 +0200 Updated bug entries #0690 --- .bugs/690 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/690 b/.bugs/690 new file mode 100644 index 0000000..f38fe52 --- /dev/null +++ b/.bugs/690 @@ -0,0 +1,11 @@ +Title: Change default thresholds of ntp check +Component: checks +State: open +Date: 2012-04-02 15:25:35 +Targetversion: future +Class: nastiness + +The default thresholds of the ntp check are too strict for most environments. Thresholds of +20.0ms and 50.0ms are not realistic for datacenter environments. + +We should change the default values to something less strict like around several seconds.

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e00e6acfad1323c5ddc42a144a94f823c6f2f4a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e00e6acfad1323… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 12:06:44 2012 +0200 Merge branch 'master' into logwatch ---

12 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012