Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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: 9bf60a0b748abc5d1887d10f825426c33a6829bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf60a0b748abc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 6 15:25:57 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO host edit: Prevent javascript error when no wato_host_tags defined

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1cc8381607efefdec2ec13afb8e9f181746eab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1cc8381607efe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 14:59:54 2011 +0100 WATO host edit: Prevent javascript error when no wato_host_tags defined --- web/htdocs/js/wato.js | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 8d90c80..c27da5c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -72,7 +72,14 @@ function wato_fix_visibility() { /* First collect the current selection of all host attributes. They are in the same table as we are */ var currentTags = []; - var oTable = document.getElementById("wato_host_tags").childNodes[0]; /* tbody */ + + var oHostTags = document.getElementById("wato_host_tags"); + // Skip this function when no tags defined + if(!oHostTags) + return; + + var oTable = oHostTags.childNodes[0]; /* tbody */ + oHostTags = null; for (var i in oTable.childNodes) { var oTr = oTable.childNodes[i]; if (oTr.nodeName == 'TR') { @@ -129,7 +136,7 @@ function wato_fix_visibility() { } } - for each (var item in volatile_topics){ + for (var item in volatile_topics){ var oTr = document.getElementById("topic_" + item); if( hide_topics.indexOf(item) > -1 ){ oTr.style.display = "none";

12 years, 9 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: 44dcddfcc67d4712a785890b4568ebf464d1e087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44dcddfcc67d47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 10:37:23 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Fix ping_levels computation of rta

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 993ed1418a5bbf641e1f871ddf69c92ab1b51abb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=993ed1418a5bbf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 10:37:16 2011 +0100 Fix ping_levels computation of rta rta was without any effect --- .bugs/476 | 13 +++++++++++++ .bugs/477 | 11 +++++++++++ modules/check_mk.py | 2 +- 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/.bugs/476 b/.bugs/476 new file mode 100644 index 0000000..1e88e12 --- /dev/null +++ b/.bugs/476 @@ -0,0 +1,13 @@ +Title: mounts Checks should only check ro flag +Component: checks +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-06 08:52:27 +Targetversion: 1.2.0 +Class: bug + +Currently on my laptop the mounts check is flapping around because +the kernel seems to add a mount option with "commit" and change +it all the time. Basically we'd need to just monitor the ro +status. diff --git a/.bugs/477 b/.bugs/477 new file mode 100644 index 0000000..ecfe2c4 --- /dev/null +++ b/.bugs/477 @@ -0,0 +1,11 @@ +Title: main.mk Variables in Man-Page +Component: docu +Benefit: 2 +State: open +Cost: 2 +Date: 2011-12-06 09:41:11 +Targetversion: future +Class: feature + +We could generate a man-Page from the nowiki-page about +the configuration variables for main.mk and for multisite.mk diff --git a/modules/check_mk.py b/modules/check_mk.py index f884537..609b1e5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1187,7 +1187,7 @@ def check_icmp_arguments(hostname): elif key == "packets": args.append("-n %d" % value) elif key == "rta": - rtas = value + rta = value elif key == "loss": loss = value args.append("-w %.2f,%.2f%%" % (rta[0], loss[0]))

12 years, 9 months

Check_MK Git: check_mk: Implemented NagVis Authorisation management using WATO users/permissions

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82e6b4d632964510fa440387184f23a7d518a254 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82e6b4d6329645… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 10:04:28 2011 +0100 Implemented NagVis Authorisation management using WATO users/permissions --- ChangeLog | 1 + web/htdocs/wato.py | 26 ++++++++--- web/plugins/views/nagvis.py | 76 ------------------------------- web/plugins/wato/nagvis_auth.py | 93 ++++++++++++++++++++++++++++++++++++--- 4 files changed, 106 insertions(+), 90 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=82e6b4d632…

12 years, 9 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: d60455e86d23c55abf8af51e05ba33a74ea4f753 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d60455e86d23c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 10:04:35 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: login dialog: Preventing multiple login dialogs in open framesets by reloading the page

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: df41d699e27642e0bd61f6fe7b161c88b5f62426 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df41d699e27642… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 10:31:00 2011 +0100 login dialog: Preventing multiple login dialogs in open framesets by reloading the page --- web/htdocs/index.py | 11 +++++++++++ web/htdocs/js/check_mk.js | 10 ++++++++++ web/htdocs/lib.py | 3 +++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 4e2e2f3..9e67d4f 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -252,6 +252,10 @@ def handler(req, profiling = True): # When not authed tell the browser to ask for the password req.user = login.check_auth() if req.user == '': + if fail_silently: + # While api call don't show the login dialog + raise MKUnauthenticatedException(_('You are not authenticated.')) + # After auth check the regular page can be shown result = login.page_login() if type(result) == tuple: @@ -311,6 +315,13 @@ def handler(req, profiling = True): html.show_error(str(e)) html.footer() + except MKUnauthenticatedException, e: + if not fail_silently: + html.header(_("Not authenticated")) + html.show_error(str(e)) + html.footer() + response_code = apache.HTTP_UNAUTHORIZED + except MKConfigError, e: if not fail_silently: html.header(_("Configuration Error")) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 4688b88..605d7dd 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -110,6 +110,16 @@ function get_url(url, handler, data, errorHandler) { if (AJAX.status == 200) { handler(data, AJAX.responseText); } + else if (AJAX.status == 401) { + // This is reached when someone is not authenticated anymore + // but has some webservices running which are still fetching + // infos via AJAX. Reload the whole frameset or only the + // single page in that case. + if(top) + top.location.reload(); + else + document.location.reload(); + } else { if (typeof errorHandler !== 'undefined') errorHandler(data, AJAX.status); diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 92bd4e9..837426b 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -42,6 +42,9 @@ class MKAuthException(Exception): def __str__(self): return str(self.reason) +class MKUnauthenticatedException(MKGeneralException): + pass + class MKConfigError(Exception): def __init__(self, msg): Exception.__init__(self, msg)

12 years, 9 months

Check_MK Git: check_mk: login dialog: Showing user errors in the login area

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c3e54e055245facfa8df0f5bab26dccb0a2078b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c3e54e055245f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 10:32:52 2011 +0100 login dialog: Showing user errors in the login area --- web/htdocs/login.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index d6d6ee4..cdca506 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -192,9 +192,6 @@ def normal_login_page(): html.set_render_headfoot(False) html.header(_("Check_MK Multisite Login"), javascripts=[], stylesheets=["pages", "login"]) - if html.has_user_errors(): - html.show_user_errors() - origtarget = html.var('_origtarget', '') if not origtarget and not html.req.myfile == 'login': origtarget = html.req.uri @@ -204,6 +201,10 @@ def normal_login_page(): html.write("<h1>Check_MK Multisite</h2>") html.write('<div id=form>') + + if html.has_user_errors(): + html.show_user_errors() + html.begin_form("login", method = 'POST', add_transid = False) html.hidden_field('_origtarget', htmllib.attrencode(origtarget)) html.write('<p>')

12 years, 9 months

Check_MK Git: check_mk: Fixed missing modules

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e1707e66edc4398fff6feb3000c7a132963d2f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e1707e66edc43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 6 08:40:12 2011 +0100 Fixed missing modules --- web/htdocs/login.py | 2 +- web/htdocs/wato.py | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 629dbc5..d6d6ee4 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import defaults, htmllib, config +import defaults, htmllib, config, wato from lib import * from mod_python import apache import os, md5, md5crypt, crypt, time diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 933ab78..a4d5ae2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6883,6 +6883,7 @@ def get_login_secret(create_on_demand = False): return secret def encrypt_password(password, salt = None): + import md5crypt if not salt: salt = "%06d" % (1000000 * (time.time() % 1.0)) return md5crypt.md5crypt(password, salt, '$1$')

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0475

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2dca3729f3a7c608ddb528420caa6b182cf42c78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dca3729f3a7c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 6 08:49:00 2011 +0100 Updated bug entries #0475 --- .bugs/475 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/475 b/.bugs/475 new file mode 100644 index 0000000..3f6385f --- /dev/null +++ b/.bugs/475 @@ -0,0 +1,13 @@ +Title: lnx_if fails if ethtool is not working +Component: checks +Benefit: 1 +State: open +Cost: 2 +Date: 2011-12-06 08:47:42 +Targetversion: 1.1.12 +Class: bug + +The check should work, if information from ethtool is missing. +That way also virtual network cards (e.g. from VMWare) will +work. We must make shure, however, that we do not inventorize +lo, sit and other dummy devices.

12 years, 9 months

← Newer
1
...
27
28
29
30
31
32
33
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011