Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: WATO snapin: reload every 60s (refreshes pending)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50ce240cb4971fb8b189893430f937df0cb1352b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50ce240cb4971f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 13:52:56 2012 +0200 WATO snapin: reload every 60s (refreshes pending) --- web/plugins/sidebar/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 5f51afe..e052a41 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -56,6 +56,7 @@ sidebar_snapins["admin"] = { "description" : _("Direct access to WATO - the web administration GUI of Check_MK"), "author" : "Mathias Kettner", "render" : render_wato, + "refresh" : 60, # refresh pending changes, if other user modifies something "allowed" : [ "admin", "user" ], }

12 years, 1 month

Check_MK Git: check_mk: Better styling of snapin buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78d901de6373d88244634ff25422b17ce71f5b55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78d901de6373d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 13:48:18 2012 +0200 Better styling of snapin buttons --- web/htdocs/sidebar.css | 17 ++++++++++++----- web/htdocs/sidebar.py | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index a44d87b..03b68fe 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -289,18 +289,25 @@ div.snapin div.footnotelink { } div.snapin div.footnotelink a { - border: 1px solid #ddd; + border-width: 1px; + border-style: solid; + background-color: #497e95; + border-color: #86a9b8 #22404d #22414d #86a9b8; + box-shadow: 0 0 0.5px #444444; font-size: 7pt; - -moz-border-radius: 4px; + border-radius: 4px; padding: 1px 4px; margin-left: 5px; } div.snapin div.footnotelink a:hover { - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: #6da1b8; text-decoration: none; - border: 1px solid #fff; +} +div.snapin div.footnotelink a:active { + border-color: #22414d #86a9b8 #86a9b8 #22404d; + background-color: #3b6678; + box-shadow: inset 0 0 0.5px #444444; } /* Small iconbutton (e.g. at bookmarks) */ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 915efde..097bd40 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -63,7 +63,8 @@ def link(text, target): # [3] relative.py if not (":" in target[:10]) and target[0] != '/': target = defaults.url_prefix + "check_mk/" + target - return "<a target=\"main\" class=link href=\"%s\">%s</a>" % (target, htmllib.attrencode(text)) + return '<a onfocus="if (this.blur) this.blur();" target="main" ' \ + 'class=link href="%s">%s</a>' % (target, htmllib.attrencode(text)) def simplelink(text, target): html.write(link(text, target) + "<br>\n")

12 years, 1 month

Check_MK Git: check_mk: Show pending changes in WATO snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb27a7d1d6842c2352b668f0b759b02b0b1f8b76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb27a7d1d6842c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 13:48:09 2012 +0200 Show pending changes in WATO snapin --- ChangeLog | 1 + web/plugins/sidebar/wato.py | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e679e7c..62562ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * New layout of global settings * Folder layout: show contact groups of folder * Folder movement: always show complete path to target folder + * Sidebar snapin: show pending changes * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 26c3c2c..5f51afe 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -46,6 +46,10 @@ def render_wato(): if config.may("wato." + permission) or config.may("wato.seeall"): iconlink(title, "wato.py?mode=%s" % mode, icon) + num_pending = wato.api.num_pending_changes() + if num_pending: + footnotelinks([(_("%d changes") % num_pending, "wato.py?mode=changelog")]) + sidebar_snapins["admin"] = { "title" : _("WATO · Configuration"),

12 years, 1 month

Check_MK Git: check_mk: WATO: show complete path when moving folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 37dadd920de17ea3558e9a4efcb547265a514eb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37dadd920de17e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 13:02:40 2012 +0200 WATO: show complete path when moving folders --- ChangeLog | 1 + web/htdocs/wato.css | 13 +++++++------ web/htdocs/wato.py | 29 ++++++++++++++++++----------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10d374f..e679e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * Hide check_mk variable names per default now (change via global settings) * New layout of global settings * Folder layout: show contact groups of folder + * Folder movement: always show complete path to target folder * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 42a703c..b7bdd87 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -377,20 +377,20 @@ table.validationerror img { .wato div.floatfolder .edit { position: absolute; - top:20px; - right:54px; + top: 20px; + right: 47px; } .wato div.floatfolder .move { position: absolute; - top:20px; - right:32px; + top: 20px; + right: 25px; } .wato div.floatfolder .delete { position: absolute; - top:20px; - right:10px; + top: 20px; + right: 3px; } .wato div.floatfolder .infos { @@ -448,6 +448,7 @@ table.validationerror img { .wato div.move_dialog span { display: block; margin-bottom: 2px; + color: white; } .wato div.hoverarea { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7058b02..a301a36 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -917,6 +917,18 @@ def prepare_folder_info(): set_current_folder() # set g_folder from HTML variable +def folder_title_path(path, withlinks = False): + folder = g_folders.get(path) + titles = [] + while (folder): + title = folder["title"] + if withlinks: + title = "<a href='wato.py?mode=folder&folder=%s'>%s</a>" % (folder[".path"], title) + titles.append(title) + folder = folder.get(".parent") + return titles[::-1] + + def check_host_permissions(hostname, exception=True, folder=None): if folder == None: folder = g_folder @@ -1370,7 +1382,11 @@ def move_to_folder_combo(what, thing = None, top = False, multiple = False): # avoid naming conflict! or thing[".name"] in afolder[".folders"])): os_path = afolder[".path"] - msg = afolder["title"] + title_path = folder_title_path(os_path) + if len(title_path) > 1: + del title_path[0] # remove name of main folder + msg = " / ".join(title_path) + # msg = afolder["title"] if os_path and not config.wato_hide_filenames: msg += " (%s)" % os_path selections.append((os_path, msg)) @@ -10918,16 +10934,7 @@ class API: # components, e.g. "muc/north" -> [ "Main Directory", "Munich", "North" ] def get_folder_title_path(self, path, withlinks=False): load_all_folders() # TODO: speed up! - folder = g_folders.get(path) - titles = [] - while (folder): - title = folder["title"] - if withlinks: - title = "<a href='wato.py?mode=folder&folder=%s'>%s</a>" % (folder[".path"], title) - titles.append(title) - folder = folder.get(".parent") - return titles[::-1] - + return folder_title_path(path, withlinks) # Returns the number of not activated changes. def num_pending_changes(self):

12 years, 1 month

Check_MK Git: check_mk: WATO: fix parent scan on single site installations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d5d2fa9e95a91093ee6205b8a669e6b96aadab93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5d2fa9e95a910… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 12:25:10 2012 +0200 WATO: fix parent scan on single site installations --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5820590..10d374f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * Hide check_mk variable names per default now (change via global settings) * New layout of global settings * Folder layout: show contact groups of folder + * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting and modifiying rules diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d04acee..7058b02 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3037,7 +3037,7 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): # only set it explicitely if it differs from the id of the # folder. e = effective_attributes(new_host, gw_folder) - if e["site"] != site_id: + if "site" in e and e["site"] != site_id: new_host["site"] = site_id gw_folder[".hosts"][new_host[".name"]] = new_host

12 years, 1 month

Check_MK Git: check_mk: Remove obsolete URL main.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66265edb502b2b239b426439627942ce9e4c1395 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66265edb502b2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 12:14:51 2012 +0200 Remove obsolete URL main.py --- web/htdocs/main.py | 33 +-------------------------------- web/plugins/pages/shipped.py | 1 - 2 files changed, 1 insertions(+), 33 deletions(-) diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 4e0be86..4b25d9e 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -30,7 +30,7 @@ def page_index(): start_url = html.var("start_url", config.start_url) html.req.headers_out.add("Cache-Control", "max-age=7200, public"); if "%s" in config.page_heading: - heading = config.page_heading % (defaults.omd_site or "Multisite") + heading = config.page_heading % (defaults.omd_site or _("Multisite")) else: heading = config.page_heading @@ -48,37 +48,6 @@ def page_index(): </html> """ % (heading, start_url)) -def page_main(): - html.header("Check_MK Multisite") - html.write(""" -<p>Welcome to Check_MK Multisite - a new GUI for viewing status information -and controlling your monitoring system. Multisite is not just another GUI -for Nagios - it uses a completely new architecture and design scheme. It's -key benefits are:</p> -<ul> -<li>It is fast.</li> -<li>it is flexible.</li> -<li>It supports distributed monitoring.</li> -</ul> - -<p>Multisite is completely based on -<a href="http://mathias-kettner.de/checkmk_livestatus.html">MK -Livestatus</a>, which is what makes it fast in the first place - especially -in huge installations with a large number of hosts and services. </p> - -<p>User customizable <b>views</b> is what makes Multisite flexible. Customize -the builtin views or create completely own views in order to need your -demands.</p> - -<p>Multisite supports distributed monitoring by allowing you to combine an -arbitrary number of Monitoring servers under a common visualisation layer, -without the need of a centralized data storage. No SQL database is needed. -No network traffic is generated due to the monitoring.</p> - -<p>Please learn more about Multisite at its <a href="http://mathias-kettner.de/checkmk_multisite.html">Documentation home page</a>.</p> -""") - html.footer() - # This function does nothing. The sites have already # been reconfigured according to the variable _site_switch, # because that variable is processed by connect_to_livestatus() diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index bb4d558..f8ea32f 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -40,7 +40,6 @@ import help pagehandlers.update({ "index" : main.page_index, - "main" : main.page_main, "login" : login.page_login, "logout" : login.page_logout, "ajax_switch_help" : help.ajax_switch_help,

12 years, 1 month

Check_MK Git: check_mk: Make texts in config.py i10n-able

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c492b48d04f6a6fb3f8392b6ade7a89b7dea01f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c492b48d04f6a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 12:17:21 2012 +0200 Make texts in config.py i10n-able --- web/htdocs/config.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index b50f942..d4381c1 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -111,7 +111,7 @@ def include(filename): except Exception, e: global user_id user_id = "nobody" - raise MKConfigError("Cannot read configuration file %s: %s:" % (filename, e)) + raise MKConfigError(_("Cannot read configuration file %s: %s:") % (filename, e)) # Load multisite.mk and all files in multisite.d/. This will happen # for *each* HTTP request. @@ -330,7 +330,7 @@ def save_user_file(name, content): try: write_settings_file(path, content) except Exception, e: - raise MKConfigError("Cannot save %s options for user <b>%s</b> into <b>%s</b>: %s" % \ + raise MKConfigError(_("Cannot save %s options for user <b>%s</b> into <b>%s</b>: %s") % \ (name, user, path, e)) # ------------------------------------------------------------------- @@ -656,13 +656,13 @@ declare_permission('logout', ) declare_permission("ignore_soft_limit", - "Ignore soft query limit", - "Allows to ignore the soft query limit imposed upon the number of datasets returned by a query", + _("Ignore soft query limit"), + _("Allows to ignore the soft query limit imposed upon the number of datasets returned by a query"), [ "admin", "user" ]) declare_permission("ignore_hard_limit", - "Ignore hard query limit", - "Allows to ignore the hard query limit imposed upon the number of datasets returned by a query", + _("Ignore hard query limit"), + _("Allows to ignore the hard query limit imposed upon the number of datasets returned by a query"), [ "admin" ]) # Make sure, we have all values set right now - until

12 years, 1 month

Check_MK Git: check_mk: Make text inputs in tag config larger

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b5601733923070055f6a6225976ab429b7f6093d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5601733923070… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 12:11:50 2012 +0200 Make text inputs in tag config larger --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dfba860..d04acee 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8666,7 +8666,7 @@ def mode_edit_hosttag(phase): elements = [ TextAscii( title = _("Tag ID"), - size=10, + size = 16, regex="^[-a-z0-9A-Z_]*$", none_is_empty = True, regex_error = _("Invalid tag ID. Only the characters a-z, A-Z, " @@ -8674,7 +8674,7 @@ def mode_edit_hosttag(phase): TextUnicode( title = _("Description"), allow_empty = False, - size=20), + size = 40), Foldable( ListChoice(

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0686

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c7e0c42f8f3c5743edb6f6e42bb64b9129b1571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c7e0c42f8f3c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 10:48:02 2012 +0200 Updated bug entries #0686 --- .bugs/686 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/686 b/.bugs/686 new file mode 100644 index 0000000..c63e070 --- /dev/null +++ b/.bugs/686 @@ -0,0 +1,12 @@ +Title: Dashboard/Sidebar on Chrome sometimes not sized +Component: multisite +State: open +Date: 2012-05-11 10:46:54 +Targetversion: 1.2.0 +Class: bug + +It seems like we miss an initial resize() event on Chrome. +This affects both the sidebar and the dashboard. Can we +simulate that event somehow? Currently the dashboard +and sidebar sometimes only work after a manual resize +of the browser window.

12 years, 1 month

Check_MK Git: check_mk: WATO: show contact groups in folder overview

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2c982705b12ab25008a965687c18ea19d66657cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c982705b12ab2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 11 11:59:30 2012 +0200 WATO: show contact groups in folder overview --- ChangeLog | 2 + web/htdocs/check_mk.css | 5 ++- web/htdocs/wato.css | 13 ++++- web/htdocs/wato.py | 133 ++++++++++++++++++++++++++++------------------- 4 files changed, 96 insertions(+), 57 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0816f5..5820590 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ * New layout of ruleset overviews * Hide check_mk variable names per default now (change via global settings) * New layout of global settings + * Folder layout: show contact groups of folder + * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting and modifiying rules * FIX: detect non-local site even if unix: is being used diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 047873b..a0a1c01 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -73,7 +73,10 @@ input, select, textarea { } input[type=text] { - box-shadow: 0.5px 0.5px 0.8px 0 #888 inset; + box-shadow: 0.1px 1.2px 1.8px 0 #888 inset; +} +input[type=password] { + box-shadow: 0.1px 1.2px 1.8px 0 #800 inset; } select { diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 145875b..42a703c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -364,8 +364,15 @@ table.validationerror img { .wato div.floatfolder .autherr { position: absolute; - top: 20px; - right: 23px; + top: 28px; + right: 19px; +} + +.wato div.floatfolder div.infos img { + width: 14px; + height: 14px; + position: relative; + top: -1px; } .wato div.floatfolder .edit { @@ -388,7 +395,7 @@ table.validationerror img { .wato div.floatfolder .infos { position: absolute; - bottom: 29px; + bottom: 23px; left: 20px; color: #bde; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4cd7574..dfba860 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -895,7 +895,9 @@ def mode_folder(phase): else: render_folder_path() have_something = show_subfolders(g_folder) - have_something = show_hosts(g_folder) or have_something + # Show hosts only if we have permission to this folder + if True == check_folder_permissions(g_folder, "read", False): + have_something = show_hosts(g_folder) or have_something if not have_something: render_main_menu([ ("newhost", _("Create new host"), "new", "hosts", @@ -1041,64 +1043,83 @@ def show_subfolders(folder): edit_url = make_link_to([("mode", "editfolder"), ("backfolder", g_folder[".path"])], entry) delete_url = make_action_link([("mode", "folder"), ("_delete_folder", entry[".name"])]) - # Am I authorized? - auth = check_folder_permissions(entry, "write", False) + # Am I authorized at least for read access? + auth_message = check_folder_permissions(entry, "read", False) + auth_read = auth_message == True + auth_write = check_folder_permissions(entry, "write", False) == True + + html.write('<div class="floatfolder%s" id="folder_%s"' % ( + auth_read and " unlocked" or " locked", entry['.name'])) + if auth_write: + html.write(' onclick="wato_open_folder(event, \'%s\');"' % enter_url) + html.write('>') - html.write('<div class=floatfolder id="folder_%s" onclick="wato_open_folder(event, \'%s\');">' % ( - entry[".name"], enter_url)) # Only make folder openable when permitted to edit - if auth == True: + if auth_read: html.write( '<div class=hoverarea onmouseover="wato_toggle_folder(event, this, true);" ' 'onmouseout="wato_toggle_folder(event, this, false)">' ) - if auth != True: - html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \ - (htmllib.strip_tags(auth))) - - html.icon_button( - edit_url, - _("Edit the properties of this folder"), - "edit", - id = 'edit_' + entry['.name'], - cssclass = 'edit', - style = 'display:none', - ) - - may_move_folders = config.may("wato.manage_folders") and \ - check_folder_permissions(g_folder, "write", False) - if may_move_folders: - html.icon_button( - '', # url is replaced by onclick code - _("Move this folder to another place"), - "move", - id = 'move_' + entry['.name'], - cssclass = 'move', - style = 'display:none', - onclick = 'wato_toggle_move_folder(event, this);' - ) - html.write('<div id="move_dialog_%s" class=move_dialog style="display:none">' % entry['.name']) - html.write('<span>%s</span>' % _('Move this folder to:')) - move_to_folder_combo("folder", entry, False, multiple = True) - html.write('</div>') - - if config.may("wato.manage_folders"): - html.icon_button( - delete_url, - _("Delete this folder"), - "delete", - id = 'delete_' + entry['.name'], - cssclass = 'delete', - style = 'display:none', - ) - - # Close the eventuall hoverarea - if auth == True: + if auth_read: + html.icon_button( + edit_url, + _("Edit the properties of this folder"), + "edit", + id = 'edit_' + entry['.name'], + cssclass = 'edit', + style = 'display:none', + ) + + if config.may("wato.manage_folders") and auth_write: + html.icon_button( + '', # url is replaced by onclick code + _("Move this folder to another place"), + "move", + id = 'move_' + entry['.name'], + cssclass = 'move', + style = 'display:none', + onclick = 'wato_toggle_move_folder(event, this);' + ) + html.write('<div id="move_dialog_%s" class=move_dialog style="display:none">' % entry['.name']) + html.write('<span>%s</span>' % _('Move this folder to:')) + move_to_folder_combo("folder", entry, False, multiple = True) + html.write('</div>') + + if auth_write and config.may("wato.manage_folders"): + html.icon_button( + delete_url, + _("Delete this folder"), + "delete", + id = 'delete_' + entry['.name'], + cssclass = 'delete', + style = 'display:none', + ) html.write('</div>') + else: + html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \ + (htmllib.strip_tags(auth_message))) html.write('<div class=infos>') - html.write('Hosts: %d' % num_hosts_in(entry, recurse=True)) + # Show contact groups of the folder + effective = effective_attributes(None, entry) + use, cgs = effective.get("contactgroups", (None, [])) + group_info = load_group_information().get("contact", {}) + for num, cg in enumerate(cgs): + cgalias = group_info.get(cg,cg) + html.icon(_("Contactgroup assign to this folder"), "contactgroups") + html.write(' %s<br>' % cgalias) + if num > 1 and len(cgs) > 4: + html.write(_('<i>%d more contact groups</i><br>') % (len(cgs) - num - 1)) + break + + num_hosts = num_hosts_in(entry, recurse=True) + if num_hosts == 1: + html.write(_("1 Host")) + elif num_hosts > 0: + html.write("%d %s" % (num_hosts, _("Hosts"))) + else: + html.write("<i>%s</i>" % _("(no hosts)")) html.write('</div>') title = entry['title'] @@ -1107,7 +1128,11 @@ def show_subfolders(folder): title += ' (%s)' % entry['.name'] html.write('<div class=title title="%s">' % title) - html.write('<a href="%s">%s</a>' % (enter_url, entry['title'])) + if auth_read: + html.write('<a href="%s">' % enter_url) + html.write(entry['title']) + if auth_read: + html.write("</a>") html.write('</div>') html.write('</div>') @@ -5502,8 +5527,9 @@ def mode_edit_group(phase, what): html.begin_form("group") html.write("<table class=form>") html.write("<tr><td class=legend>") - html.write(_("Name<br><i>The name of the group is used as an internal key. It cannot be " - "changed later. It is also visible in the status GUI.</i>")) + html.write(_("Name")) + html.help(_("The name of the group is used as an internal key. It cannot be " + "changed later. It is also visible in the status GUI.")) html.write("</td><td class=content>") if new: html.text_input("name") @@ -5514,7 +5540,8 @@ def mode_edit_group(phase, what): html.write("</td></tr>") html.write("<tr><td class=legend>") - html.write(_("Alias<br><i>An Alias or description of this group.</i>")) + html.write(_("Alias")) + html.help(_("An Alias or description of this group.")) html.write("</td><td class=content>") html.text_input("alias", name and groups.get(name, "") or "") html.write("</td></tr>")

12 years, 1 month

← Newer
1
...
30
31
32
33
34
35
36
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012