Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: Fix style of snapins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 903341c32d3c795c02eaf20000f132d8d4a58b7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=903341c32d3c79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 25 12:07:06 2011 +0100 Fix style of snapins --- web/htdocs/check_mk.css | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 21a49a9..619a68f 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -325,9 +325,10 @@ body.side { /* General layout of snapins */ div.snapin { - width: 275px; + width: 255px; margin: 0 0 0 5px; padding: 0; + overflow: hidden; } /* Header of the snapin */ @@ -1943,7 +1944,7 @@ div.add_snapin div.snapinadder { border-bottom: 1px solid #9ab; border-right: 1px solid #89a; height: 220px; - width: 280px; + width: 270px; margin-right: 10px; margin-bottom: 10px; float: left;

12 years, 7 months

Check_MK Git: check_mk: Changed var reset

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2fb55af0b565f2de2d06c56f56cfd3ece78d686 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2fb55af0b565f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 11:57:03 2011 +0100 Changed var reset --- web/htdocs/login.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index b84bb66..8904b89 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -133,18 +133,21 @@ def login_page(): # c) Show the real requested page (No redirect needed) set_auth_cookie(username, users[username]) - # Remove login vars to hide them from the next page handler - del html.req.vars['_username'] - del html.req.vars['_password'] - del html.req.vars['_login'] - del html.req.vars['_origin'] - # Use redirects for URLs or simply execute other handlers for # mulitsite modules if '/' in origin: html.set_http_header('Location', origin) raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY else: + # Remove login vars to hide them from the next page handler + try: + del html.req.vars['_username'] + del html.req.vars['_password'] + del html.req.vars['_login'] + del html.req.vars['_origin'] + except: + pass + return (username, origin) else: raise MKUserError(None, _('Invalid credentials.'))

12 years, 7 months

Check_MK Git: check_mk: Implemented new cookie based login mechanism with a fancy login GUI

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 624d1cd2f29617b635fdae92dd37b938ca9e0f02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=624d1cd2f29617… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 10:51:28 2011 +0100 Implemented new cookie based login mechanism with a fancy login GUI --- ChangeLog | 3 +- web/htdocs/css/login.css | 31 ++++++++++++++++++++++++ web/htdocs/htmllib.py | 22 +++++++++++----- web/htdocs/index.py | 2 +- web/htdocs/login.py | 59 +++++++++++++++++++++++++++++++++++----------- 5 files changed, 94 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b1df7d..bb9e5de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,7 +30,8 @@ Multisite: * New nifty sidebar snapin "Speed-O-Meter" - * Implemented logout functionality in OMD environments + * Implemented new cookie based login mechanism including a fancy login GUI + * Implemented logout functionality for basic auth and the new cookie based auth * New filter for the (new) state in host/service alerts * New command for sending custom notifications * FIX: Fixed encoding problem when opening dashboard diff --git a/web/htdocs/css/login.css b/web/htdocs/css/login.css new file mode 100644 index 0000000..ca11956 --- /dev/null +++ b/web/htdocs/css/login.css @@ -0,0 +1,31 @@ +#login { + margin: 0; + height: 100%; + width: 100%; + text-align:center; +} +/*#login #logo { + width: 320px; + margin: 7em auto; + height: 55px; + background-repeat: no-repeat; + background-image: url("../images/sidebar_top.png"); +}*/ +#login h1 { + width: 300px; + margin: 3em auto 2em auto; +} +#login a { + color: #ffffff; +} +#login a:hover { + text-decoration: none; +} +#login #table { + width: 320px; margin: 0 auto; +} +#login #foot { + font-size: 0.8em; + font-style: italic; + color: #ffffff; +} diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d4b9ff7..a8c9164 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -161,6 +161,7 @@ class html: self.user_errors = {} self.focus_object = None self.global_vars = [] + self.render_headfoot = True self.browser_reload = 0 self.browser_redirect = '' self.events = set([]) # currently used only for sounds @@ -605,6 +606,9 @@ class html: def html_foot(self): self.write("</html>\n") + def set_render_headfoot(self, render): + self.render_headfoot = render + def set_browser_reload(self, secs): self.browser_reload = secs @@ -618,7 +622,8 @@ class html: self.html_head(title, **args) self.write('<body class="main %s">' % self.var("_body_class", "")) self.header_sent = True - self.top_heading(title) + if self.render_headfoot: + self.top_heading(title) def top_heading(self, title): if type(self.req.user) == str: @@ -643,10 +648,12 @@ class html: obj = formname + "." + varname self.write("<script language=\"javascript\" type=\"text/javascript\">\n" "\n" - "</script>\n" % (obj, obj)) + "</script>\n" % (obj, obj, obj)) def bottom_footer(self): if self.req.header_sent: @@ -654,12 +661,13 @@ class html: corner_text = "" if self.browser_reload: corner_text += _("refresh: %d secs") % self.browser_reload - si = self.render_status_icons() - self.write("<table class=footer><tr>" + if self.render_headfoot: + si = self.render_status_icons() + self.write("<table class=footer><tr>" "<td class=left>%s</td>" "<td class=middle></td>" "<td class=right>%s</td></tr></table>" - % (si, corner_text)) + % (si, corner_text)) def body_end(self): self.write("</body></html>\n") diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b8fbf31..c279a3a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -251,7 +251,7 @@ def handler(req, profiling = True): # Is the user set by the webserver? otherwise use the cookie based auth if not req.user or type(req.user) != str: - config.auth_type == 'cookie' + config.auth_type = 'cookie' # When not authed tell the browser to ask for the password req.user = login.check_auth() if req.user == '': diff --git a/web/htdocs/login.py b/web/htdocs/login.py index c1b3418..c9dfd39 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -27,14 +27,21 @@ import defaults, htmllib, config from lib import * from mod_python import apache -import md5crypt, time +import md5, md5crypt, crypt, time +# Validate hashes taken from the htpasswd file. This method handles +# crypt() and md5 hashes. This should be the common cases in the +# used htpasswd files. def password_valid(pwhash, password): - # FIXME: MD5 unterstützen - import crypt - #html.write(repr(pwhash + ' ' + crypt.crypt(password, pwhash))) - return pwhash == crypt.crypt(password, pwhash[:2]) + if pwhash[:3] == '$1$': + salt = pwhash.split('$', 3)[2] + return pwhash == md5crypt.md5crypt(password, salt, '$1$') + else: + #html.write(repr(pwhash + ' ' + crypt.crypt(password, pwhash))) + return pwhash == crypt.crypt(password, pwhash[:2]) +# Loads the contents of a valid htpasswd file into a dictionary +# and returns the dictionary def load_htpasswd(): creds = {} @@ -44,12 +51,22 @@ def load_htpasswd(): return creds +# Reads the auth secret from a file. Creates the files if it does +# not exist. Having access to the secret means that one can issue valid +# cookies for the cookie auth. +# FIXME: Secret auch replizieren +def load_secret(): + secret_path = '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) + if not os.path.exists(secret_path): + secret = md5.md5(str(time.time())).hexdigest() + file(secret_path, 'w').write(secret) + else: + secret = file(secret_path).read().strip() + return secret + +# Generates the hash to be added into the cookie value def generate_hash(username, now, pwhash): - # FIXME: Secret aus Datei auslesen - # dirname(defaults.htpasswd_file) - # FIXME: Datei automatisch erstellen, wenn nicht vorhanden - # FIXME: Secret auch replizieren - secret = 'asd' + secret = load_secret() return md5crypt.md5crypt(username + now + pwhash, secret) def del_auth_cookie(): @@ -63,9 +80,13 @@ def set_auth_cookie(username, pwhash): + ':' + generate_hash(username, now, pwhash)) def check_auth_cookie(): - username, time, cookie_hash = html.cookie('auth_secret', '').split(':', 2) + username, issue_time, cookie_hash = html.cookie('auth_secret', '').split(':', 2) # FIXME: Ablauf-Zeit des Cookies testen + #max_cookie_age = 10 + #if float(issue_time) < time.time() - max_cookie_age: + # del_auth_cookie() + # return '' users = load_htpasswd() if not username in users: @@ -73,7 +94,7 @@ def check_auth_cookie(): pwhash = users[username] # Validate the hash - if cookie_hash != generate_hash(username, time, pwhash): + if cookie_hash != generate_hash(username, issue_time, pwhash): raise Exception # Once reached this the cookie is a good one. Renew it! @@ -126,12 +147,17 @@ def page(): err = e html.add_user_error(e.varname, e.message) + html.set_render_headfoot(False) + html.header(_("Check_MK Multisite Login"), add_js = False) if err: html.write('<div class=error>%s</div>\n' % e.message) - html.write("<table id=table_login>") + html.write("<div id=login>") + html.write("<div id=logo></div>") + html.write("<h1>Check_MK Multisite</h2>") + html.write("<table id=table>") html.write("<tr class=form>\n") html.write("<td>") html.begin_form("login", method = 'POST', add_transid = False) @@ -159,7 +185,10 @@ def page(): html.write("</td>") html.write("</tr>") - html.write("</table></div>") + html.write("</table>") + html.write("<div id=foot>Version: %s - © " + "<a href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>" % defaults.check_mk_version) + html.write("</div>") html.set_focus('_username') html.end_form() @@ -173,6 +202,8 @@ def check_auth(): return check_auth_cookie() except Exception, e: + if config.debug: + raise return '' def logout():

12 years, 7 months

Check_MK Git: check_mk: cookie login: Added callable login url and made _origin var work

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 21f8c5ebcab82051b0e1e20f3d62ae92f71389e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21f8c5ebcab820… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 11:26:33 2011 +0100 cookie login: Added callable login url and made _origin var work --- web/htdocs/index.py | 2 +- web/htdocs/login.py | 23 ++++++++++++++++------- web/plugins/pages/shipped.py | 1 + 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index c279a3a..5fe58db 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -256,7 +256,7 @@ def handler(req, profiling = True): req.user = login.check_auth() if req.user == '': # After auth check the regular page can be shown - result = login.page() + result = login.login_page() if type(result) == tuple: # This is the redirect to the requested page directly after successful login req.user = result[0] diff --git a/web/htdocs/login.py b/web/htdocs/login.py index c9dfd39..b84bb66 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -108,7 +108,7 @@ def check_auth_cookie(): return username -def page(): +def login_page(): # handle the sent login form err = None if html.var('_login'): @@ -121,7 +121,9 @@ def page(): if password == '': raise MKUserError('_password', _('No password given.')) - origin = html.var('_origin', defaults.url_prefix + 'check_mk/') + origin = html.var('_origin') + if not origin: + origin = defaults.url_prefix + 'check_mk/' users = load_htpasswd() if username in users and password_valid(users[username], password): @@ -137,10 +139,13 @@ def page(): del html.req.vars['_login'] del html.req.vars['_origin'] - return (username, origin) - # An alternative (and maybe cleaner) would be to use a redirect here: - #html.set_http_header('Location', html.var('_origin', defaults.url_prefix + 'check_mk/')) - #return apache.HTTP_MOVED_TEMPORARILY + # Use redirects for URLs or simply execute other handlers for + # mulitsite modules + if '/' in origin: + html.set_http_header('Location', origin) + raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY + else: + return (username, origin) else: raise MKUserError(None, _('Invalid credentials.')) except MKUserError, e: @@ -154,6 +159,10 @@ def page(): if err: html.write('<div class=error>%s</div>\n' % e.message) + origin = html.var('_origin', '') + if not origin and not html.req.myfile == 'login': + origin = html.req.uri + html.write("<div id=login>") html.write("<div id=logo></div>") html.write("<h1>Check_MK Multisite</h2>") @@ -161,7 +170,7 @@ def page(): html.write("<tr class=form>\n") html.write("<td>") html.begin_form("login", method = 'POST', add_transid = False) - html.hidden_field('_origin', htmllib.attrencode(html.req.uri)) + html.hidden_field('_origin', htmllib.attrencode(origin)) html.write("<div class=whiteborder>\n") html.write("<table class=\"form\">\n") diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index e05f656..c861898 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -40,6 +40,7 @@ import login pagehandlers.update({ "index" : main.page_index, "main" : main.page_main, + "login" : login.login_page, "logout" : login.logout, "switch_site" : main.ajax_switch_site, "edit_views" : views.page_edit_views,

12 years, 7 months

Check_MK Git: check_mk: First step implementing the new cookie based login

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 25ae314a961991017dffe9c016d6a82f7704a226 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25ae314a961991… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 19:27:01 2011 +0100 First step implementing the new cookie based login --- web/htdocs/config.py | 6 ++ web/htdocs/htmllib.py | 53 +++++++++-- web/htdocs/index.py | 32 ++++++-- web/htdocs/js/check_mk.js | 2 +- web/htdocs/login.py | 194 ++++++++++++++++++++++++++++++++++++++++++ web/htdocs/sidebar.py | 3 +- web/plugins/pages/shipped.py | 2 + 7 files changed, 273 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=25ae314a96…

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0414

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d7af3d4932555e1ae1519b58b4772596369d0163 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7af3d4932555e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 16:24:48 2011 +0100 Updated bug entries #0414 --- .bugs/414 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/414 b/.bugs/414 new file mode 100644 index 0000000..5f8dcdd --- /dev/null +++ b/.bugs/414 @@ -0,0 +1,11 @@ +Title: BI: FOREACH_* auch in untergeordneten Ebenen nutzbar machen +Component: bi +Benefit: 2 +State: open +Cost: 4 +Date: 2011-11-24 12:26:52 +Targetversion: future +Class: feature + +Um im BI flexibler zu sein, sollte man z.B. FOREACH_SERVICE nicht nur +in der obersten Regel-Ebene nutzne können.

12 years, 7 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: 7997ef9f3fc8baabd006c4e6c5fcd06e9e8e0372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7997ef9f3fc8ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 19:31:01 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: Fix layout in add snapin page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c7f00d5ce81f303c98fe3da2e7b061b1435d52c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c7f00d5ce81f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 24 16:59:28 2011 +0100 Fix layout in add snapin page --- web/plugins/sidebar/shipped.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 3a479e3..811ddda 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -926,18 +926,18 @@ sidebar_snapins["master_control"] = { "render" : render_master_control, "allowed" : [ "admin", ], "styles" : """ -div#check_mk_sidebar table.master_control { +div.snapin table.master_control { width: %dpx; margin: 0px; border-spacing: 0px; } -div#check_mk_sidebar table.master_control td { +div.snapin table.master_control td { padding: 0px 0px; text-align: right; } -div#check_mk_sidebar table.master_control td a { +div.snapin table.master_control td a { font-weight: bold; -moz-border-radius: 4px; margin: 0px; @@ -948,22 +948,22 @@ div#check_mk_sidebar table.master_control td a { display: block; border: 1px solid black; } -div#check_mk_sidebar table.master_control td.left a { +div.snapin table.master_control td.left a { text-align: left; font-size: 8pt; font-weight: normal; } -div#check_mk_sidebar table.master_control td.left { +div.snapin table.master_control td.left { text-align: left; } -div#check_mk_sidebar table.master_control td.enabled a { +div.snapin table.master_control td.enabled a { background-color: #4f6; color: #000; border-color: #080; } -div#check_mk_sidebar table.master_control td.disabled a { +div.snapin table.master_control td.disabled a { background-color: #f33; border-color: #c00; color: #fff;

12 years, 7 months

Check_MK Git: check_mk: Add Snapin page: show previews of all snapins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68c3b7b1082ce9e9a9db03d2eb904c6acf68ca23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68c3b7b1082ce9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 24 16:52:31 2011 +0100 Add Snapin page: show previews of all snapins --- ChangeLog | 1 + web/htdocs/check_mk.css | 45 ++++++++++++++++++++++++---------------- web/htdocs/sidebar.py | 25 ++++++++------------- web/plugins/sidebar/shipped.py | 2 +- 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9e3d55..3b1df7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * Logwatch: Switched strings in logwatch to i18n strings * Logwatch: Fixed styling of context button when acknowleding log messages * Logwatch: Implemented overview page to show all problematic logfiles + * Add Snapin page: show previews of all snapins WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index f693710..21a49a9 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -393,7 +393,7 @@ div.snapin h3 { font-size: 100%; } -body.side li { +div.snapin li { padding-left: 1px; color: #274750; color: #478; @@ -418,7 +418,7 @@ div.snapin ul { /* width: 220px; Bei mehrstufigen Einrueckungen stimmt der rechte Rand nicht */ } -li.sidebar { +div.snapin li.sidebar { margin-left: 0px; margin-left: 0px; } @@ -1936,29 +1936,38 @@ The page to add snapins to the sidebar - linked from the footer of the sidebar */ -table.add_snapin { - margin: 0; - padding: 0; - border-spacing: 5px; - empty-cells: hide; - width: 100%; -} - -table.add_snapin td { - padding: 8px; +div.add_snapin div.snapinadder { + padding: 8px 2px; background-color: #9bc; - width: 33%; -moz-border-radius: 8px; border-bottom: 1px solid #9ab; border-right: 1px solid #89a; - height: 90px; + height: 220px; + width: 280px; + margin-right: 10px; + margin-bottom: 10px; + float: left; +} +div.add_snapin div.snapinadder div.description { color: #369; + padding: 10px; } -table.add_snapin b { - color: #000; +div.add_snapin div.snapin_preview div.clickshield { + z-index: 100; + position: absolute; + top: 0px; + left: 0px; + width: 270px; + height: 120px; } -table.add_snapin i { - color: #fff; + +div.add_snapin div.snapin_preview { + width: 270px; + height: 120px; + overflow: hidden; + position: relative; + top: 0px; + left: 0px; } /* diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index c3958d7..b84779a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -319,36 +319,31 @@ def page_add_snapin(): names = sidebar_snapins.keys() names.sort() - html.write('<table class="add_snapin">\n<tr>\n') - n = 0 + html.write('<div class="add_snapin">\n') for name in names: if name in used_snapins: continue if not config.may("sidesnap." + name): continue # not allowed for this user - if n == 3: - html.write("</tr><tr>\n") - n = 0 - n += 1 snapin = sidebar_snapins[name] title = snapin["title"] description = snapin.get("description", "") - author = snapin.get("author") transid = html.current_transid() url = 'sidebar_add_snapin.py?name=%s&_transid=%d&pos=top' % (name, transid) - html.write('<td onmouseover="this.style.background=\'#cde\'; this.style.cursor=\'pointer\';" ' + html.write('<div class=snapinadder onmouseover="this.style.background=\'#cde\'; this.style.cursor=\'pointer\';" ' 'onmouseout="this.style.background=\'#9bc\' "' 'onclick="window.location.href=\'%s\';">' % url) - html.write("<b>%s</b><br>\n" - "%s" % (title, description)) - if author: - html.write("<br><i>Author: %s</i>" % author) + html.write("<div class=snapin_preview>") + html.write("<div class=clickshield></div>") + render_snapin(name, "open") + html.write("</div>") + html.write("<div class=description>%s</div>" % (description)) + + html.write("</div>") - html.write("<td></td>" * (3-n)) - - html.write("</tr></table>\n") + html.write("</div>\n") html.footer() load_plugins() diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index d597851..3a479e3 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -172,7 +172,7 @@ sidebar_snapins["servicegroups"] = { # -------------------------------------------------------------- def render_hosts(mode): html.live.set_prepend_site(True) - query = "GET hosts\nColumns: name state worst_service_state\n" + query = "GET hosts\nColumns: name state worst_service_state\nLimit: 100" view = "host" if mode == "summary":

12 years, 7 months

Check_MK Git: check_mk: FIX: fixed sidebar group snapins reload

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 49aa677099416666a6397312555421fc032071f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49aa6770994166… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 24 15:29:10 2011 +0100 FIX: fixed sidebar group snapins reload --- ChangeLog | 4 ++++ web/plugins/sidebar/shipped.py | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8ae631..b9e3d55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,10 @@ * New columns num_hosts and num_services in status table * New aggregation functions suminv and avginv (see Documentation) +1.1.12p4: + Multisite: + * FIX: sidebar snapin Hostgroups and Servicegroups sometimes + failed with non-existing "available_views". 1.1.12p3: Core, Setup, etc.: * FIX: really suppress precompiling on PING-only hosts now diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 5f127b1..d597851 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -139,12 +139,11 @@ def render_groups(what): name_to_alias = dict(data) groups = [(name_to_alias[name].lower(), name_to_alias[name], name) for name in name_to_alias.keys()] groups.sort() # sort by Alias in lowercase - target = views.get_context_link(config.user_id, "%sgroup" % what) - if target: - html.write('<ul>') - for alias_lower, alias, name in groups: - bulletlink(alias, target + "&%sgroup=%s" % (what, htmllib.urlencode(name))) - html.write('</ul>') + html.write('<ul>') + for alias_lower, alias, name in groups: + url = "view.py?view_name=%sgroup&%sgroup=%s" % (what, what, htmllib.urlencode(name)) + bulletlink(alias, url) + html.write('</ul>') sidebar_snapins["hostgroups"] = { "title" : _("Hostgroups"),

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011