Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: Created Inventory function for blade_bx_load

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0c17370435c388d3f980c9264e366f92cdb3fb37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c17370435c388… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 16:59:59 2012 +0200 Created Inventory function for blade_bx_load --- checks/blade_bx_load | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/checks/blade_bx_load b/checks/blade_bx_load index fef32b5..4f800ee 100644 --- a/checks/blade_bx_load +++ b/checks/blade_bx_load @@ -26,6 +26,10 @@ blade_bx_cpuload_default_levels = ( 5, 20 ) +def inventory_blade_bx_load(info): + if len(info) > 0: + return [ (None, "blade_bx_cpuload_default_levels")] + def check_blade_bx_load(item, params, info): try: load = [] @@ -47,7 +51,7 @@ def check_blade_bx_load(item, params, info): check_info['blade_bx_load'] = { "check_function" : check_blade_bx_load, - "inventory_function" : lambda info: [ (None, "blade_bx_cpuload_default_levels")] , + "inventory_function" : inventory_blade_bx_load , "service_description" : "Load", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.2021.10.1", [ 1, 2, 6 ]),

11 years, 10 months

Check_MK Git: check_mk: - Modify heartbeat_crm check to check pacemaker/ corosync only clusters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee2b13cd9614ad3c413f9799a8d9d311f796590e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee2b13cd9614ad… Author: Stefan Botter <jsj(a)jsj.dyndns.org> Date: Tue Sep 25 11:29:53 2012 +0200 - Modify heartbeat_crm check to check pacemaker/corosync only clusters Signed-off-by: Stefan Botter <jsj(a)jsj.dyndns.org> --- checks/heartbeat_crm | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index f7c9c1b..00573ac 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -136,6 +136,7 @@ def heartbeat_crm_parse_resources(info): blockStart = False resources = {} resource = '' + mode = 'single' for line in info: if not blockStart and ' '.join(line) == 'Full list of resources:': blockStart = True @@ -144,9 +145,29 @@ def heartbeat_crm_parse_resources(info): # Resource group resources[line[-1]] = [] resource = line[-1] + mode = 'resourcegroup' + elif ' '.join(line[0:2]) == 'Clone Set:': + # Clone set + resources[line[-2]] = [] + resource = line[-2] + mode = 'cloneset' + elif ' '.join(line[0:2]) == 'Master/Slave Set:': + # Master/Slave set + resources[line[-2]] = [] + resource = line[-2] + mode = 'masterslaveset' elif line[0] == '_': - # Resource group member - resources[resource].append(line[1:]) + # Resource group or set member + if mode == 'resourcegroup': + resources[resource].append(line[1:]) + elif mode == 'cloneset': + if line[1] == 'Started:': + resources[resource].append([ resource, 'Clone', 'Started', line[3] ]) + elif mode == 'masterslaveset': + if line[1] == 'Masters:': + resources[resource].append([ resource, 'Master', 'Started', line[3] ]) + if line[1] == 'Slaves:': + resources[resource].append([ resource, 'Slave', 'Started', line[3] ]) else: # Single resource resources[line[0]] = [ line ] @@ -181,7 +202,7 @@ def check_heartbeat_crm_resources(item, target_node, info): if len(resource) == 3 or resource[2] != 'Started': status = 2 output += ' (CRITICAL: Resource is in state "%s")' % resource[2] - elif target_node and target_node != resource[3]: + elif target_node and target_node != resource[3] and resource[1] != 'Slave' and resource[1] != 'Clone': status = 2 output += ' (CRITICAL: Expected node: %s)' % target_node output += ', '

11 years, 10 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: 79402e4541d8d0831500fa72dffe483c0f341810 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79402e4541d8d0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 16:40:30 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 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: 5b6ac0cea25fb8419121cc2b55460187ef6df2e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b6ac0cea25fb8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 28 15:58:37 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Enable automation login with _username= and _secret =

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66d73a6e50e21c80cec16acdfa9a9ac61896756a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66d73a6e50e21c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 28 15:58:35 2012 +0200 Enable automation login with _username= and _secret= --- ChangeLog | 6 +++++- web/htdocs/js/wato.js | 2 +- web/htdocs/login.py | 14 ++++++++++++++ web/htdocs/wato.py | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb7f197..0a55ec1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 1.2.1i2: Event Console: - * Moved source of Event Console into Check_MK project + * Moved source of Event Console into Check_MK project + + Multisite: + * Enable automation login with _username= and _secret=, while + _secret is the content of var/check_mk/web/$USER/automation.secret 1.2.0p3: Mulitisite diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 4408194..76bf3be 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -506,7 +506,7 @@ function wato_replication_finish() { function wato_randomize_secret(id, len) { var secret = ""; for (var i=0; i<len; i++) { - var c = parseInt((126-33) * Math.random() + 33); + var c = parseInt(26 * Math.random() + 64); secret += String.fromCharCode(c); } var oInput = document.getElementById(id); diff --git a/web/htdocs/login.py b/web/htdocs/login.py index aff6fa1..4a48d9f 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -131,7 +131,21 @@ def check_auth_cookie(cookie_name): # Return the authenticated username return username +def check_auth_automation(): + secret = html.var("_secret").strip() + user = html.var("_username").strip() + del html.req.vars['_username'] + del html.req.vars['_secret'] + if secret and user and "/" not in user: + path = defaults.var_dir + "/web/" + user + "/automation.secret" + if os.path.isfile(path) and file(path).read().strip() == secret: + return user + raise MKAuthException(_("Invalid automation secret for user %s") % user) + def check_auth(): + if html.var("_secret"): + return check_auth_automation() + for cookie_name in html.get_cookie_names(): if cookie_name.startswith('auth_'): try: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dba1728..b8624c2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7779,7 +7779,7 @@ def mode_edit_user(phase): html.radiobutton("authmethod", "secret", is_automation, _("Automation secret for machine accounts")) html.write("<ul>") - html.text_input("secret", user.get("automation_secret", ""), size=21, + html.text_input("secret", user.get("automation_secret", ""), size=30, id="automation_secret") html.write(" ") html.write("<b style='position: relative; top: 4px;'>  ")

11 years, 10 months

Check_MK Git: check_mk: FIX: Not caching frameset page to prevent problems with login/logout code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e23b1590a631e862dfe50d9476b1cb8ec9fee6a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e23b1590a631e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 15:03:30 2012 +0200 FIX: Not caching frameset page to prevent problems with login/logout code --- ChangeLog | 1 + web/htdocs/main.py | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae1d0c1..d1911b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ information for a specific list of hosts or aggregation groups. * BI: Added new config option bi_compile_log to collect statistics about aggregation compilations + * FIX: Not caching frameset page to prevent problems with login/logout code * FIX: Fixed releasing of locks and livestatus connections when logging out 1.2.0p3: diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 4b25d9e..23e47bb 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -28,7 +28,6 @@ import defaults, config 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")) else:

11 years, 10 months

Check_MK Git: check_mk: FIX: Fixed login/ login confusions with index page caching

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f75c33af0843d8e79ba0e7e0bb4f0abb2f687c28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f75c33af0843d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 15:43:27 2012 +0200 FIX: Fixed login/login confusions with index page caching --- ChangeLog | 1 + web/htdocs/htmllib.py | 19 +++++++++++++++---- web/htdocs/login.py | 8 ++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae1d0c1..ae1da6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * BI: Added new config option bi_compile_log to collect statistics about aggregation compilations * FIX: Fixed releasing of locks and livestatus connections when logging out + * FIX: Fixed login/login confusions with index page caching 1.2.0p3: Mulitisite diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9805478..9bbc669 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -49,13 +49,17 @@ class uriinfo: # TODO: URI-Encode von Variablen! def geturi(self): uri = self.req.myfile + ".py" - if len(self.req.vars): + if self.req.vars: uri += "?" + urlencode(self.req.vars.items()) return uri # [('varname1', value1), ('varname2', value2) ] def makeuri(self, addvars): - return self.req.myfile + ".py?" + urlencode_vars(self.req.vars.items() + addvars) + v = self.req.vars.items() + addvars + if v: + return self.req.myfile + ".py?" + urlencode_vars(v) + else: + return self.req.myfile + ".py" # Liste von Hidden-Felder erzeugen aus aktueller URI def hiddenfields(self, omit=[]): @@ -330,13 +334,20 @@ class html: vars = [ (v, self.var(v)) for v in self.req.vars if v[0] != "_" ] if remove_prefix != None: vars = [ i for i in vars if not i[0].startswith(remove_prefix) ] - return self.req.myfile + ".py?" + urlencode_vars(vars + addvars) + vars = vars + addvars + if vars: + return self.req.myfile + ".py?" + urlencode_vars(vars) + else: + return self.req.myfile + ".py" def makeactionuri(self, addvars): return self.makeuri(addvars + [("_transid", self.fresh_transid())]) def makeuri_contextless(self, vars): - return self.req.myfile + ".py?" + urlencode_vars(vars) + if vars: + return self.req.myfile + ".py?" + urlencode_vars(vars) + else: + return self.req.myfile + ".py" def image_button(self, varname, title, cssclass = ''): if not self.mobile: diff --git a/web/htdocs/login.py b/web/htdocs/login.py index aff6fa1..07303b0 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -158,7 +158,7 @@ def do_login(): raise MKUserError('_password', _('No password given.')) origtarget = html.var('_origtarget') - if not origtarget or origtarget.endswith("/logout.py"): + if not origtarget or "logout.py" in origtarget: origtarget = defaults.url_prefix + 'check_mk/' users = load_htpasswd() @@ -220,14 +220,14 @@ def normal_login_page(called_directly = True): html.header(_("Check_MK Multisite Login"), javascripts=[], stylesheets=["pages", "login"]) origtarget = html.var('_origtarget', '') - if not origtarget and not html.req.myfile == 'login': + if not origtarget and not html.req.myfile in [ 'login', 'logout' ]: origtarget = html.makeuri([]) # When e.g. the password of a user is changed and the first frame that recognizes the # non matching cookies is the sidebar it redirects the user to side.py while removing # the frameset. This is not good. Instead of this redirect the user to the index page. if html.req.myfile == 'side': - html.immediate_browser_redirect(0.1, 'index.py') + html.immediate_browser_redirect(0.1, 'login.py') return apache.OK # Never allow the login page to be opened in a frameset. Redirect top page to login page. @@ -281,7 +281,7 @@ def page_logout(): del_auth_cookie() if config.auth_type == 'cookie': - html.set_http_header('Location', defaults.url_prefix + 'check_mk/') + html.set_http_header('Location', defaults.url_prefix + 'check_mk/login.py') raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY else: # Implement HTTP logout with cookie hack

11 years, 10 months

Check_MK Git: check_mk: Revert "FIX: Not caching frameset page to prevent problems with login/logout code"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d2be3761d9120a71ab197588edd7417f2c672988 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2be3761d9120a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 15:13:56 2012 +0200 Revert "FIX: Not caching frameset page to prevent problems with login/logout code" This reverts commit e23b1590a631e862dfe50d9476b1cb8ec9fee6a3. --- ChangeLog | 1 - web/htdocs/main.py | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1911b4..ae1d0c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,6 @@ information for a specific list of hosts or aggregation groups. * BI: Added new config option bi_compile_log to collect statistics about aggregation compilations - * FIX: Not caching frameset page to prevent problems with login/logout code * FIX: Fixed releasing of locks and livestatus connections when logging out 1.2.0p3: diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 23e47bb..4b25d9e 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -28,6 +28,7 @@ import defaults, config 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")) else:

11 years, 10 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: 84994b146a07020516f34d96994c4f7883b8ace2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84994b146a0702… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 15:43:34 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: FIX: Fixed releasing of locks and livestatus connections when logging out

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c50e37c08d376a92c5d836ef3f60b22e12cd4aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c50e37c08d376… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 14:30:38 2012 +0200 FIX: Fixed releasing of locks and livestatus connections when logging out --- ChangeLog | 1 + web/htdocs/index.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f4f376..ae1d0c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ information for a specific list of hosts or aggregation groups. * BI: Added new config option bi_compile_log to collect statistics about aggregation compilations + * FIX: Fixed releasing of locks and livestatus connections when logging out 1.2.0p3: Mulitisite diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 63c6b87..f7e8ebd 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -386,7 +386,9 @@ def handler(req, profiling = True): else: response_code = apache.HTTP_BAD_GATEWAY - except apache.SERVER_RETURN: + except (apache.SERVER_RETURN, + (apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED), + (apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY)): release_all_locks() html.live = None raise

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012