Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

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: 59aab8a5411c0ddfe9274efb5dc2fb1a85ff2ed2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59aab8a5411c0d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 15:41:41 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 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: 6c7c8b65c2c0f052949042a2395059b5c7ab448e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c7c8b65c2c0f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 08:13:46 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 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: f76e090207e9c979e53b99dc0ba8fc74fc6e1621 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f76e090207e9c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 20:23:08 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Changed path to nagvis to use url_prefix

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 951a9deaf02608bdaa8e928d6b632214a00dc1a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=951a9deaf02608… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 15:22:06 2011 +0100 Changed path to nagvis to use url_prefix --- web/plugins/sidebar/nagvis_maps.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/plugins/sidebar/nagvis_maps.py b/web/plugins/sidebar/nagvis_maps.py index a0366eb..8341d46 100644 --- a/web/plugins/sidebar/nagvis_maps.py +++ b/web/plugins/sidebar/nagvis_maps.py @@ -33,10 +33,8 @@ import views, defaults def render_nagvis_maps(): - nagvis_base_url = '/nagvis' - if hasattr(config, 'nagvis_base_url'): - nagvis_base_url = config.nagvis_base_url - refresh_url = "%s/server/core/ajax_handler.php?mod=Multisite&act=getMaps" % nagvis_base_url + refresh_url = "%s/server/core/ajax_handler.php?mod=Multisite&act=getMaps" % \ + (defaults.url_prefix, nagvis_base_url) return refresh_url sidebar_snapins["nagvis_maps"] = {

12 years, 6 months

Check_MK Git: check_mk: cookie auth: Recoded to be able to handle cookies with dynamic names

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d508811f65825e2d0e87f59034033bbeaef636bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d508811f65825e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 15:22:36 2011 +0100 cookie auth: Recoded to be able to handle cookies with dynamic names --- web/htdocs/htmllib.py | 5 +++- web/htdocs/login.py | 54 +++++++++++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a8c9164..63152e7 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -909,6 +909,9 @@ class html: def has_cookie(self, varname): return varname in self.req.cookies + def get_cookie_names(self): + return self.req.cookies.keys() + def cookie(self, varname, deflt): try: return self.req.cookies[varname].value @@ -916,7 +919,7 @@ class html: return deflt def set_cookie(self, varname, value, expires = None): - c = Cookie.Cookie(varname, value, path = defaults.url_prefix) + c = Cookie.Cookie(varname, value, path = '/') if expires is not None: c.expires = expires diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 8904b89..93b9443 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -29,6 +29,13 @@ from lib import * from mod_python import apache import md5, md5crypt, crypt, time +class MKAuthException(MKGeneralException): + pass + +def site_cookie_name(): + name = os.path.dirname(defaults.url_prefix).replace('/', '_') + return 'auth%s' % name + # 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. @@ -67,20 +74,21 @@ def load_secret(): # Generates the hash to be added into the cookie value def generate_hash(username, now, pwhash): secret = load_secret() - return md5crypt.md5crypt(username + now + pwhash, secret) + return md5.md5(username + now + pwhash + secret).hexdigest() def del_auth_cookie(): - if html.has_cookie('auth_secret'): - html.del_cookie('auth_secret') + name = site_cookie_name() + if html.has_cookie(name): + html.del_cookie(name) def set_auth_cookie(username, pwhash): now = str(time.time()) - html.set_cookie('auth_secret', username - + ':' + now - + ':' + generate_hash(username, now, pwhash)) + html.set_cookie(site_cookie_name(), username + + ':' + now + + ':' + generate_hash(username, now, pwhash)) -def check_auth_cookie(): - username, issue_time, cookie_hash = html.cookie('auth_secret', '').split(':', 2) +def check_auth_cookie(cookie_name): + username, issue_time, cookie_hash = html.cookie(cookie_name, '::').split(':', 2) # FIXME: Ablauf-Zeit des Cookies testen #max_cookie_age = 10 @@ -90,23 +98,36 @@ def check_auth_cookie(): users = load_htpasswd() if not username in users: - raise Exception + raise MKAuthException(_('Username is unknown')) pwhash = users[username] # Validate the hash if cookie_hash != generate_hash(username, issue_time, pwhash): - raise Exception + raise MKAuthException(_('Invalid credentials')) # Once reached this the cookie is a good one. Renew it! # Do not renew if: # a) The _ajaxid var is set # b) A logout is requested - if html.req.myfile != 'logout' or html.has_var('_ajaxid'): + if (html.req.myfile != 'logout' or html.has_var('_ajaxid')) \ + and cookie_name == site_cookie_name(): set_auth_cookie(username, pwhash) # Return the authenticated username return username +def check_auth(): + for cookie_name in html.get_cookie_names(): + if cookie_name.startswith('auth_'): + try: + return check_auth_cookie(cookie_name) + except Exception, e: + #html.write('Exception occured while checking cookie %s' % cookie_name) + #raise + pass + + return '' + def login_page(): # handle the sent login form @@ -207,17 +228,6 @@ def login_page(): html.footer() return apache.OK -def check_auth(): - try: - if not html.has_cookie('auth_secret'): - return '' - - return check_auth_cookie() - except Exception, e: - if config.debug: - raise - return '' - def logout(): # Remove eventual existing cookie del_auth_cookie()

12 years, 6 months

Check_MK Git: check_mk: WATO: hide topics with no visible attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 29fbe26b10473d279abc94a4a75caeca637e6443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29fbe26b10473d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 28 19:55:37 2011 +0100 WATO: hide topics with no visible attributes --- web/htdocs/htmllib.py | 2 +- web/htdocs/js/wato.js | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a8c9164..bbb770d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -866,7 +866,7 @@ class html: onclick += ' onmouseout="this.style.cursor=\'auto\';" ' if indent == "form": - self.write('<table class="form nomargin"><tr><td class=title>') + self.write('<table id="topic_%s" style="display: ''" class="form nomargin"><tr ><td class=title>' % id.encode("utf-8")) self.write('<img align=absbottom class="treeangle" id="treeimg.%s.%s" ' 'src="images/tree_%s.png" %s>' % (treename, id, img_num, onclick)) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index b17fec9..8d90c80 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -97,6 +97,8 @@ function wato_fix_visibility() { } } + var hide_topics = volatile_topics.slice(0); + /* Now loop over all attributes that have conditions. Those are stored in the global variable wato_depends_on, which is filled during the creation of the web page. */ @@ -114,8 +116,26 @@ function wato_fix_visibility() { break; } } - oTr = document.getElementById("attr_" + attrname); + + var oTr = document.getElementById("attr_" + attrname); oTr.style.display = display; + + // There is at least one item in this topic -> show it + var topic = oTr.parentNode.parentNode.parentNode.id.substr(21); + if( display == "" ){ + var index = hide_topics.indexOf(topic); + if( index != -1 ) + delete hide_topics[index]; + } + } + + for each (var item in volatile_topics){ + var oTr = document.getElementById("topic_" + item); + if( hide_topics.indexOf(item) > -1 ){ + oTr.style.display = "none"; + } + else + oTr.style.display = ""; } }

12 years, 6 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: 40b4e3ddeb7dcd565836432f390cc64dfa37a114 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40b4e3ddeb7dcd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 28 19:38:00 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: WATO: fix rename_host_tags_after_confirmation message

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f0afc4730b93797378f5f17f54782100cfb4570d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0afc4730b9379… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 28 19:47:14 2011 +0100 WATO: fix rename_host_tags_after_confirmation message --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 51f5aa2..92e1c8b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8283,7 +8283,7 @@ def rename_host_tags_after_confirmation(tag_id, operations): message += _("Hosts where this tag group is explicitely set and that are effected by the change") + ":<ul><li>" for nr, host in enumerate(affected_hosts): if nr > 20: - message += "... (%d more)" % len(affected_hosts - 20) + message += "... (%d more)" % (len(affected_hosts) - 20) break elif nr > 0: message += ", "

12 years, 6 months

Check_MK Git: check_mk: WATO: volatile topics now able to hande Basic Settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0279f4d098de6bbee923f4faef7c1ed8bd47d520 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0279f4d098de6b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 25 15:01:18 2011 +0100 WATO: volatile topics now able to hande Basic Settings --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c0de3d1..51f5aa2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3874,7 +3874,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute html.write("</table>") html.end_foldable_container() # end of topic if topic_is_volatile: - volatile_topics.append(topic.encode('utf-8')) + volatile_topics.append((topic or _("Basic settings")) or topic.encode('utf-8')) if topic == topics[-1]: html.write('<table class="form nomargin">')

12 years, 6 months

Check_MK Git: check_mk: Simplify custom dashboard in non-OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 679269384f43a3acc110373c47ff8c2483c690bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679269384f43a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 10:55:29 2011 +0100 Simplify custom dashboard in non-OMD --- web/plugins/dashboard/builtin.py | 132 +++++++++++++++++++------------------- 1 files changed, 65 insertions(+), 67 deletions(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 7215a84..5b11088 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -24,71 +24,69 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -builtin_dashboards = { - "main" : { - "title" : _("Main Overview"), - "dashlets" : [ -# { -# "url" : "dashlet_mk_logo.py", -# "position" : (1, 1), -# "size" : (4, 5), -# "shadow" : False, -# "background" : False, -# }, - { - "title" : _("Host Statistics"), - "url" : "dashlet_hoststats.py", - "position" : (1, 1), - "size" : (10, 6), - "shadow" : True, - "background" : True, - "refresh" : 60, - }, - { - "title" : _("Service Statistics"), - "url" : "dashlet_servicestats.py", - "position" : (11, 1), - "size" : (10, 6), - "shadow" : True, - "background" : True, - "refresh" : 60, - }, - { - "title" : _("Host Problems"), - "title_url" : "view.py?view_name=hostproblems", - "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (-1, 1), - "size" : (GROW, 6), - }, - { - "title" : _("Service Problems"), - "title_url" : "view.py?view_name=svcproblems", - "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (1, 7), - "size" : (GROW, MAX), - }, - { - "title" : _("Events of recent 4 hours"), - "title_url" : "view.py?view_name=events_dash", - "view" : "events_dash", # "view.py?view_name=events_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (-1, -1), - "size" : (GROW, GROW), - }, - # { - # "title" : "CPU load of Nagios", - # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", - # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_load&…", - # "position" : (1, -1), - # "size" : (11, 5), - # }, - # { - # "title" : "CPU utilization of Nagios", - # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", - # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_utili…", - # "position" : (12, -1), - # "size" : (11, 5), - # }, - # { - ] - } +builtin_dashboards["main"] = { + "title" : _("Main Overview"), + "dashlets" : [ +# { +# "url" : "dashlet_mk_logo.py", +# "position" : (1, 1), +# "size" : (4, 5), +# "shadow" : False, +# "background" : False, +# }, + { + "title" : _("Host Statistics"), + "url" : "dashlet_hoststats.py", + "position" : (1, 1), + "size" : (10, 6), + "shadow" : True, + "background" : True, + "refresh" : 60, + }, + { + "title" : _("Service Statistics"), + "url" : "dashlet_servicestats.py", + "position" : (11, 1), + "size" : (10, 6), + "shadow" : True, + "background" : True, + "refresh" : 60, + }, + { + "title" : _("Host Problems"), + "title_url" : "view.py?view_name=hostproblems", + "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", + "position" : (-1, 1), + "size" : (GROW, 6), + }, + { + "title" : _("Service Problems"), + "title_url" : "view.py?view_name=svcproblems", + "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", + "position" : (1, 7), + "size" : (GROW, MAX), + }, + { + "title" : _("Events of recent 4 hours"), + "title_url" : "view.py?view_name=events_dash", + "view" : "events_dash", # "view.py?view_name=events_dash&display_options=SIXHR&_body_class=dashlet", + "position" : (-1, -1), + "size" : (GROW, GROW), + }, + # { + # "title" : "CPU load of Nagios", + # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", + # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_load&…", + # "position" : (1, -1), + # "size" : (11, 5), + # }, + # { + # "title" : "CPU utilization of Nagios", + # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", + # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_utili…", + # "position" : (12, -1), + # "size" : (11, 5), + # }, + # { + ] }

12 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011