Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64242 discussions

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

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: bd956d2996e391609c761c62899707cce042d62c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd956d2996e391… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 09:16:05 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Repair make mrproper on older git versions

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2c5693b4a7a6c1d020e7c39858f9031eeaf9a83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2c5693b4a7a6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 08:51:58 2012 +0200 Repair make mrproper on older git versions --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 5d4f62b..20385f1 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ clean: find -name "*~" | xargs rm -f mrproper: - git clean -xfd -e .bugs + git clean -xfd .bugs check: @set -e ; for checkfile in *.HS ; do \

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: 5ec4710de21d640e65c22f298dce474bf7ef92a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ec4710de21d64… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 18:16:03 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Redesign of view filter forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 64e03b4a555093310fb5f831a0cde03ad38f38e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64e03b4a555093… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 18:16:01 2012 +0200 Redesign of view filter forms --- web/htdocs/htmllib.py | 7 +++-- web/htdocs/views.css | 54 ++++++++++++++++++++++++++++++++++++++++- web/htdocs/views.py | 36 +++++++++++++++++----------- web/plugins/views/filters.py | 28 ++++++++++++++------- 4 files changed, 97 insertions(+), 28 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index df141c6..4163ec0 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -436,8 +436,8 @@ class html: self.write(r'''onmouseover='this.style.backgroundImage="url(\"images/contextlink%s_hi.png\")";' ''' % what) self.write(r'''onmouseout='this.style.backgroundImage="url(\"images/contextlink%s.png\")";' ''' % what) - def number_input(self, varname, deflt = "", size=8): - self.text_input(varname, str(deflt), "number", size=size) + def number_input(self, varname, deflt = "", size=8, style=""): + self.text_input(varname, str(deflt), "number", size=size, style=style) def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, **args): if default_value == None: @@ -451,7 +451,8 @@ class html: mytype = "text" if "autocomplete" in args: addprops += " autocomplete=\"%s\"" % args["autocomplete"] - + if args.get("style"): + addprops += " style=\"%s\"" % args["style"] value = self.req.vars.get(varname, default_value) error = self.user_errors.get(varname) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 92c0af5..e29eb1a 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -124,13 +124,63 @@ table.navi tr.form td.whiteborder { border-bottom: 1px solid #fff; } -table.navi tr.form div.whiteborder, table.navi tr.form table.whiteborder { +table.navi tr.form div.whiteborder, +table.navi tr.form table.whiteborder { border-left: 1px solid #fff; border-right: 1px solid #fff; margin: 0; padding: 0; border-bottom: 1px solid #fff; - width: 100%; + /* width: 100%; */ +} + +table.navi tr.form div.whiteborder { + padding: 5px; +} + +div.whiteborder table.form { + margin: 0px; + background-image: none; +} + +table.navi tr.form { + /* background-image: url("images/form_background.png"); + background-repeat: repeat; */ +} +table.navi div.whiteborder table.form { + background-image: url("images/form_background.png"); + background-repeat: repeat; +} + +div.floatfilter { + margin: 0px 3px 3px 0px; + width: 320px; + height: 45px; + /* display: inline-block; */ + float: left; + border: 1px solid #458; + box-shadow: 0.5px 0.5px 1px #444; + background-image: url("images/form_background.png"); + background-repeat: repeat; +} + +div.floatfilter input[type=text] { + width: 307px; +} + +div.floatfilter .legend { + color: white; + margin-bottom: 2px; + width: 310px; + height: 15px; + background-image: url("images/form_background.png"); + background-repeat: repeat; + padding: 1px 5px; +} + +div.floatfilter .content { + margin-top: 3px; + margin-left: 3px; } /*-------------------------------------------------------------------------. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c897f36..d4f48af 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -100,8 +100,9 @@ def show_filter_form(is_open, filters): html.write("<td>") html.begin_form("filter") html.write("<div class=whiteborder>\n") + html.write("<table><tr><td>") - html.write("<table class=\"form\">\n") + ### HIRN html.write("<table class=\"form\">\n") # sort filters according to title s = [(f.sort_index, f.title, f) for f in filters if f.available()] @@ -113,21 +114,28 @@ def show_filter_form(is_open, filters): f.display() html.write('</div>') else: - if col == 0: - html.write("<tr>") - html.write("<td class=legend>%s</td>" % title) - html.write("<td class=content>") + html.write('<div class=floatfilter>') + ### if col == 0: + ### html.write("<tr>") + html.write('<div class=legend>%s</div>' % title) + ### html.write("<td class=legend>%s</td>" % title) + ### html.write("<td class=content>") + html.write('<div class=content>') f.display() - html.write("</td>") - if col == config.filter_columns - 1: - html.write("</tr>\n") - col = (col + 1) % config.filter_columns - if col == 1: - html.write("<td class=legend></td>\n<td class=content></td></tr>\n") - html.write('<tr><td class="legend button" colspan=%d>' % (config.filter_columns * 2)) + ### html.write("</td>") + html.write("</div>") + ### if col == config.filter_columns - 1: + ### html.write("</tr>\n") + ### col = (col + 1) % config.filter_columns + html.write("</div>") + ### if col == 1: + ### html.write("<td class=legend></td>\n<td class=content></td></tr>\n") + ### html.write('<tr><td class="legend button" colspan=%d>' % (config.filter_columns * 2)) + html.write("</td></tr><tr><td>") html.button("search", _("Search"), "submit") - html.write("</td></tr>\n") - html.write("</table>\n") + html.write("</td></tr></table>") + ### html.write("</td></tr>\n") + ### html.write("</table>\n") html.hidden_fields() html.end_form() diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index b0318c8..9ecf71b 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -191,7 +191,7 @@ class FilterServiceState(Filter): html.begin_checkbox_group() for var, text in [(self.prefix + "st0", "OK"), (self.prefix + "st1", "WARN"), \ (self.prefix + "st2", "CRIT"), (self.prefix + "st3", "UNKNOWN"), - (self.prefix + "stp", "PENDING")]: + (self.prefix + "stp", "PEND.")]: #if html.mobile: #text = text[:1] html.checkbox(var, True, label=text) @@ -367,21 +367,31 @@ class FilterTime(Filter): def __init__(self, info, name, title, column): self.column = column self.name = name - self.ranges = [ (1, _("sec")), (60, _("min")), (3600, _("hours")), (86400, _("days")) ] + self.ranges = [ + (86400, _("days")), + (3600, _("hours")), + (60, _("min")), + (1, _("sec")), + ] Filter.__init__(self, name, title, info, [ name ] + [ name + "_" + n for (s, n) in self.ranges], [column]) def display(self): + html.select(self.name, [("since",_("since")),("before", _("before"))], "since") + html.write(" ") for s, n in self.ranges: htmlvar = self.name + "_" + n html.write("<nobr>") - html.number_input(htmlvar, 0, 2) + html.number_input(htmlvar, 0, 2, style="width: 22px; text-align: right;") html.write(" %s</nobr> " % n) - if config.filter_columns > 1: - html.write("<br>\n") - current = html.var(self.name, "since") - for t in [ "before", "since" ]: - html.radiobutton(self.name, t, current == t, t + "   ") - html.write(" ") + # if config.filter_columns > 1: + # html.write("<br>\n") + + # current = html.var(self.name, "since") + # for t, title in [ + # ("before", _("before")), + # ("since", _("since")) ]: + # html.radiobutton(self.name, t, current == t, title + "   ") + # html.write(" ") def filter(self, infoname): range = self.get_time_range()

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits