Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: Better styling of aux tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 790467fa3a5d83c3d7dd826f82e750d18fb581ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=790467fa3a5d83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 10:22:36 2012 +0200 Better styling of aux tags --- web/htdocs/check_mk.css | 18 ++++++++++++++++++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 8 ++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 225d78a..a86abc5 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -220,6 +220,7 @@ b.treeangle.title { ul.treeangle { /* border: 1px solid #4060ff; */ padding-left: 20px; + margin: 8px 0px; } ul.treeangle li { margin: 0px; @@ -389,3 +390,20 @@ table.valuespec_listof td.vlof_content { table.valuespec_listof option[selected] { font-weight: bold; } + +table.listchoice { + cell-spacing: 0px; +} +table.listchoice td span.checkbox { + height: 10px; +} +table.listchoice td { + height: 12px; + padding: 0px; + margin: 0px; +} +table.listchoice td input[type=checkbox] { + margin: 0px; + display: inline-block; + height: 12px; +} diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8d35e87..ca8fd11 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -944,7 +944,7 @@ class ListChoice(ValueSpec): def render_input(self, varprefix, value): self.load_elements() - html.write("<table>") + html.write("<table class=listchoice>") for nr, (key, title) in enumerate(self._elements): if nr % self._columns == 0: if nr > 0: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b960a53..a91f7a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8031,11 +8031,11 @@ def mode_edit_hosttag(phase): size=20), Foldable( - MultiSelect( + ListChoice( title = _("Auxiliary tags"), - help = _("These tags will implicitely added to a host if the " - "user selects this entry in the tag group. Select multiple " - "entries with the <b>Ctrl</b> key."), + # help = _("These tags will implicitely added to a host if the " + # "user selects this entry in the tag group. Select multiple " + # "entries with the <b>Ctrl</b> key."), choices = auxtags)), ],

12 years, 5 months

Check_MK Git: check_mk: Fix order problem in ListOf

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b75f056e744dfac4498f79fd05a386ce0b45a662 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b75f056e744dfa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 10:06:49 2012 +0200 Fix order problem in ListOf --- ChangeLog | 1 + web/htdocs/valuespec.py | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53c3a35..522e9de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ urls to prevent too big security issues * Rule editor: improve sorting of groups and rulesets * FIX: Escaping single quotes in strings when writing auth.php + * FIX: Fix resorting of host tags (was bug in ListOf) Multisite * Added config option default_ts_format to configure default timestamp diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4ee3078..8d35e87 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -624,15 +624,21 @@ class ListOf(ValueSpec): self._valuespec.value_to_text(v) for v in value]) def from_html_vars(self, varprefix): - value = [] - n = 0 + n = 1 + indexes = {} while True: - indexof = html.var(varprefix + "_indexof_%d" % (n+1)) + indexof = html.var(varprefix + "_indexof_%d" % n) if indexof == None: - break; - value.append(self._valuespec.from_html_vars( - varprefix + "_%d" % int(indexof))) + break + indexes[int(indexof)] = n n += 1 + + value = [] + k = indexes.keys() + k.sort() + for i in k: + val = self._valuespec.from_html_vars(varprefix + "_%d" % indexes[i]) + value.append(val) return value def validate_datatype(self, value, varprefix):

12 years, 5 months

Check_MK Git: check_mk: Better hilight selected auxtags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a5ddfc0a079ab4dca2303b1fa7660ed50b3ca6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a5ddfc0a079ab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 09:54:19 2012 +0200 Better hilight selected auxtags --- web/htdocs/check_mk.css | 3 +++ web/htdocs/valuespec.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 629e77f..225d78a 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -386,3 +386,6 @@ table.valuespec_listof td.vlof_content { background-image: url("images/form_background.png"); background-repeat: repeat; } +table.valuespec_listof option[selected] { + font-weight: bold; +} diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index dba3c36..4ee3078 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -980,7 +980,9 @@ class MultiSelect(ListChoice): def render_input(self, varprefix, value): self.load_elements() - html.write("<select multiple name='%s'>" % varprefix) + # background_css_hack = 'onChange="this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor"' + background_css_hack = "" + html.write("<select %s multiple name='%s'>" % (background_css_hack, varprefix)) for nr, (key, title) in enumerate(self._elements): if key in value: sel = " selected"

12 years, 5 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: 638531d833da7524cfb501d3c767f836820c2f75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=638531d833da75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 09:54:21 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: FIX: Escaping single quotes in strings when writing auth.php

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0778cedd9602773bb7c050c6ffbe222998aaf52b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0778cedd960277… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 18 09:42:34 2012 +0200 FIX: Escaping single quotes in strings when writing auth.php --- ChangeLog | 1 + web/plugins/wato/auth.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84d4b0a..53c3a35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * FIX: Using pickle instead of repr/eval when reading data structures from urls to prevent too big security issues * Rule editor: improve sorting of groups and rulesets + * FIX: Escaping single quotes in strings when writing auth.php Multisite * Added config option default_ts_format to configure default timestamp diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index 0290501..19e1a02 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -72,9 +72,9 @@ def parse_php(data, lvl = 1): s += ' ' * lvl + parse_php(key, lvl + 1) + ' => ' + parse_php(val, lvl + 1) + ',\n' s += ' ' * (lvl - 1) + ')' elif isinstance(data, str): - s += '\'%s\'' % data + s += '\'%s\'' % data.replace('\'', '\\\'') elif isinstance(data, unicode): - s += '\'%s\'' % data.encode('utf-8') + s += '\'%s\'' % data.encode('utf-8').replace('\'', '\\\'') elif isinstance(data, bool): s += data and 'true' or 'false' elif data is None:

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0600, #0649

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 93555107491182bd6fb51754bcbc212e30c781eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93555107491182… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 18 09:00:00 2012 +0200 Updated bug entries #0600, #0649 --- .bugs/600 | 7 +++++-- .bugs/649 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/600 b/.bugs/600 index 5512ebc..66d0b18 100644 --- a/.bugs/600 +++ b/.bugs/600 @@ -1,9 +1,9 @@ Title: Login page shown (IE) while being logged in Component: multisite -State: open +Class: bug +State: done Date: 2012-01-16 13:06:47 Targetversion: 1.2.0 -Class: bug Test on IE: We use cookie based login and are logged in. Now we enter http://192.168.56.1/walks/ in the URL field @@ -12,3 +12,6 @@ Now we can simply click "Login" without entering any data and are logged in. The login form should not be shown in the first place here! + +2012-04-18 08:52:58: changed state open -> done +The login dialog now redirects the users to the requested page when the user is already logged in. diff --git a/.bugs/649 b/.bugs/649 index b53ddce..e5a42ca 100644 --- a/.bugs/649 +++ b/.bugs/649 @@ -1,9 +1,12 @@ Title: Dashboard Zeit im header verwirrt Component: multisite -State: open +Class: nastiness +State: done Date: 2012-02-09 15:28:10 Targetversion: future -Class: nastiness Die Zeit zeigt die Render Zeit der Seite an. Die Dashlets selbst laden sich neu die Zeit wird aber nicht aktualisiert. + +2012-04-18 08:57:41: changed state open -> done +Der Zeitstempel wird nun bei der Aktualisierung jedes Dashlets neu gesetzt.

12 years, 5 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: 0f61f5fb1197590bd00913794c6c9930a66a1fda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f61f5fb119759… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 18 09:42:40 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: FIX: Updating the dashboard header time when the dashlets refresh

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa109fa8ca7680dfa7446fac4a71c73f64edb271 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa109fa8ca7680… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 18 09:00:09 2012 +0200 FIX: Updating the dashboard header time when the dashlets refresh --- ChangeLog | 1 + web/htdocs/js/dashboard.js | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27277ea..84d4b0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * FIX: fix exception when disallowing changing display options * FIX: Automatically redirect from login page to target page when already logged in + * FIX: Updating the dashboard header time when the dashlets refresh BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index b8275db..6d2fcb8 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -132,12 +132,20 @@ function dashboard_scheduler(force) { var url = refresh_dashlets[i][2]; if (force || (refresh > 0 && timestamp % refresh == 0)) { - get_url(url, updateContents, "dashlet_inner_" + nr); + get_url(url, dashboard_update_contents, "dashlet_inner_" + nr); } } setTimeout(function() { dashboard_scheduler(0); }, 1000); } +function dashboard_update_contents(id, code) { + // Update the header time + updateHeaderTime(); + + // Call the generic function to replace the dashlet inner code + updateContents(id, code); +} + function update_dashlet(id, code) { var obj = document.getElementById(id); if (obj) {

12 years, 5 months

Check_MK Git: check_mk: FIX: Automatically redirect from login page to target page when already

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 819fd6ebea180fe26e28431fcd8870d42da3b111 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=819fd6ebea180f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 18 08:43:17 2012 +0200 FIX: Automatically redirect from login page to target page when already logged in --- ChangeLog | 2 ++ web/htdocs/login.py | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e785791..27277ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ * Login page is not shown in framesets anymore (redirects framed page to full screen login page) * FIX: fix exception when disallowing changing display options + * FIX: Automatically redirect from login page to target page when already + logged in BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 30550c6..ba371f2 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -205,7 +205,7 @@ def page_login(): else: return normal_login_page() -def normal_login_page(): +def normal_login_page(called_directly = True): # Working around the problem that the auth.php file needed for multisite based # authorization of external addons might not exist when setting up a new installation # We assume: Each user must visit this login page before using the multisite based @@ -220,15 +220,20 @@ def normal_login_page(): html.set_render_headfoot(False) html.header(_("Check_MK Multisite Login"), javascripts=[], stylesheets=["pages", "login"]) + origtarget = html.var('_origtarget', '') + if not origtarget and not html.req.myfile == 'login': + origtarget = html.makeuri([]) + + # When someone calls the login page directly and is already authed redirect to main page + if html.req.myfile == 'login' and check_auth() != '': + html.immediate_browser_redirect(0.5, origtarget and origtarget or 'index.py') + return + # Never allow the login page to be opened in a frameset. Redirect top page to login page html.javascript('''if(top != self) { window.top.location.href = location; }''') - origtarget = html.var('_origtarget', '') - if not origtarget and not html.req.myfile == 'login': - origtarget = html.makeuri([]) - html.write("<div id=login>") html.write("<img id=login_window src=\"images/login_window.png\">") html.write("<div id=version>%s</div>" % defaults.check_mk_version)

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0678

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 99aae21ce596cd55bb215794a73fb1eb8a5d23f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99aae21ce596cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 09:16:03 2012 +0200 Updated bug entries #0678 --- .bugs/678 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/678 b/.bugs/678 new file mode 100644 index 0000000..eed4324 --- /dev/null +++ b/.bugs/678 @@ -0,0 +1,9 @@ +Title: Document WATO default rules/hosttags +Component: docu +State: open +Date: 2012-04-18 09:15:21 +Targetversion: 1.2.0 +Class: todo + +Describe the new WATO default configuration +with three tag groups and a few rules.

12 years, 5 months

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012