Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 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: 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

Check_MK Git: check_mk: Added Check: fileinfo.groups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b314634e3fedbc59d7d8689af681e49e53deb185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b314634e3fedbc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 17 17:50:04 2012 +0200 Added Check: fileinfo.groups --- checkman/fileinfo.groups | 84 +++++++++++++++++++++ checks/fileinfo | 135 +++++++++++++++++++++++++++------- web/plugins/perfometer/check_mk.py | 15 ++++- web/plugins/views/perfometer.py | 2 +- web/plugins/wato/check_parameters.py | 116 +++++++++++++++++++++++++++++- 5 files changed, 322 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b314634e3f…

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: 5e70b477c6d6d9eef1106a3c894b79eebb0243f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e70b477c6d6d9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 17 17:50:14 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0674, #0651

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e7ad9ab429069d26eb7379922524344cf22d958 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e7ad9ab429069… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 17:08:48 2012 +0200 Updated bug entries #0674, #0651 --- .bugs/651 | 7 +++++-- .bugs/674 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/651 b/.bugs/651 index e640a22..4a69acb 100644 --- a/.bugs/651 +++ b/.bugs/651 @@ -1,8 +1,11 @@ Title: WAT tag management needs input fields for secondary tags Component: wato -State: open +Class: nastiness +State: done Date: 2012-02-14 11:22:42 Targetversion: future -Class: nastiness Is an important feature to be able to manage the tags in wATo. + +2012-04-17 16:58:43: changed state open -> done +Has already been implemented. diff --git a/.bugs/674 b/.bugs/674 index ad24b0f..0514d16 100644 --- a/.bugs/674 +++ b/.bugs/674 @@ -1,11 +1,14 @@ Title: No login form in frame Component: multisite -State: open +Class: nastiness +State: done Date: 2012-04-10 09:08:07 Targetversion: 1.2.0 -Class: nastiness When the login dialog detects that it is running in a frame and not as the main page (or the frame's name is "main" or "side"), then it should redirect to index.py and remove the frame set. This can be done by Javascript. + +2012-04-17 17:07:41: changed state open -> done +Has just been implemented. Never allowing login.py in a frame.

12 years, 5 months

Check_MK Git: check_mk: Login page is not shown in framesets anymore ( redirects framed page to

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4187363ab28704406963ec926eb9fbe2b6dbea8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4187363ab2870… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 17:08:50 2012 +0200 Login page is not shown in framesets anymore (redirects framed page to full screen login page) --- ChangeLog | 2 ++ web/htdocs/login.py | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96d897c..b52ae4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,8 @@ * FIX: Fix problem where snapins where invisible * FIX: Fixed multisite timeout errors when nagios not running * Sidebar: some new layout improvements + * Login page is not shown in framesets anymore (redirects framed page to + full screen login page) BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/login.py b/web/htdocs/login.py index fcbb1f4..30550c6 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -220,6 +220,11 @@ def normal_login_page(): html.set_render_headfoot(False) html.header(_("Check_MK Multisite Login"), javascripts=[], stylesheets=["pages", "login"]) + # 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([])

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: 5182343479aaec4bcca5e517a418a332a64ce2cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5182343479aaec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 17:19:20 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 5 months

Check_MK Git: check_mk: FIX: fix exception when disallowing changing display options

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9e21643107e6503b1b1b6d5cbabdf4243f647b06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e21643107e650… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 17:08:01 2012 +0200 FIX: fix exception when disallowing changing display options --- .bugs/707 | 7 +++++-- ChangeLog | 1 + web/htdocs/views.py | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bugs/707 b/.bugs/707 index eca28fe..09b672a 100644 --- a/.bugs/707 +++ b/.bugs/707 @@ -1,9 +1,9 @@ Title: WATO dashlets Service problems and Events of rec. 4 hours can die if view is missing Component: multisite -State: open +Class: nastiness +State: done Date: 2012-04-16 17:10:07 Targetversion: 1.2.0 -Class: nastiness The dashlets will print the following error Internal error:: 'aggr_onlyproblems' @@ -24,3 +24,6 @@ Change column display options Since this is user-modifyable we need to catch it and i.e. disable the dashlets. + +2012-04-17 17:07:35: changed state open -> done +Fixed. diff --git a/ChangeLog b/ChangeLog index 96d897c..15326a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * FIX: Fix problem where snapins where invisible * FIX: Fixed multisite timeout errors when nagios not running * Sidebar: some new layout improvements + * FIX: fix exception when disallowing changing display options BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0eeeae8..c897f36 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1561,7 +1561,8 @@ def view_options(viewname): else: for on, opt in multisite_painter_options.items(): - del v[on] + if on in v: + del v[on] opt["value"] = None if must_save:

12 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
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