Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: FIX: fixed umlaut problem in host aliases created by WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8e589367b571d90f78f4dea6b29643f92fd177ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e589367b571d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 09:00:59 2012 +0200 FIX: fixed umlaut problem in host aliases created by WATO --- ChangeLog | 3 +++ web/htdocs/wato.py | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ca4f45..a7306b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ up in rare cases Multisite: + * Logwatch: Colorizing OK state blocks correctly * FIX: allow web plugins to be byte compiled (*.pyc). Those are preferred over *.py if existing * View Editor: Fixed jump to top of the page after moving painters during @@ -16,7 +17,9 @@ WATO: * Reimplemented folder listing in host/folders module + * Redesigned the breadcrumb navigation * FIX: fix page header after confirmation dialogs + * FIX: fixed umlaut problem in host aliases created by WATO 1.2.0b2: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fe2801f..936b071 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3710,7 +3710,7 @@ class NagiosTextAttribute(TextAttribute): def to_nagios(self, value): if value: - return value.encode("utf-8") + return value else: return None

12 years, 5 months

Check_MK Git: check_mk: Logwatch block summary states in OK state are now shown green

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cbd4a90273ed72fb7920159f48272ebbe622cbb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbd4a90273ed72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:32:23 2012 +0200 Logwatch block summary states in OK state are now shown green --- web/htdocs/logwatch.css | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/htdocs/logwatch.css b/web/htdocs/logwatch.css index f3c2020..78831e5 100644 --- a/web/htdocs/logwatch.css +++ b/web/htdocs/logwatch.css @@ -88,24 +88,31 @@ Boston, MA 02110-1301 USA. border-bottom: 1px solid #c00; } -#logwatch td.WARN, td.CRIT { +#logwatch td.WARN, td.CRIT, td.OK { width: 5em; text-align: center; padding: 0em 0.5ex; margin: 0; - border: 1px solid #000; font-weight: bold; } #logwatch td.WARN { + border: 1px solid #000; background-color: #ff0; } #logwatch td.CRIT { + border: 1px solid #000; background-color: #f00; color: #fff; } +#logwatch td.OK { + background-color: #0b3; + border: 1px solid #000; + color: #fff; +} + #logwatch table.section { margin: 0ex 0ex 0.8ex 0ex; width: 100%

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: f4a163d3c6f3bcf7a39e656ccc9b3d769b50b2d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4a163d3c6f3bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:39:55 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0680

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea6c9757c9a395cc97a25905d098cc794a24a20a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea6c9757c9a395… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:33:49 2012 +0200 Updated bug entries #0680 --- .bugs/680 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/680 b/.bugs/680 index bf43aa0..738bdf7 100644 --- a/.bugs/680 +++ b/.bugs/680 @@ -1,9 +1,12 @@ Title: Logwatch page: hilit OK blockes Component: checks -State: open +Class: todo +State: done Date: 2012-04-24 12:13:52 Targetversion: 1.2.0 -Class: todo Due to logwatch reclassification, blocks can now have OK state. This should be hilited green. + +2012-04-24 16:32:34: changed state open -> done +Has just been fixed.

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: 643f4e9bbdc04f7a00825e2f1400684cec1294b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=643f4e9bbdc04f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 16:31:28 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Allow has_perfdata to be missing in check_info

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e2282622d5664023302dd0c422ee062d29548ef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2282622d56640… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 16:31:27 2012 +0200 Allow has_perfdata to be missing in check_info Default is False. --- modules/check_mk.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 3f03bd2..20e654e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -423,7 +423,7 @@ def output_check_info(): checks_sorted.sort() for check_type, check in checks_sorted: try: - if check["has_perfdata"]: + if check.get("has_perfdata", False): p = tty_green + tty_bold + "yes" + tty_normal else: p = "no" @@ -1604,7 +1604,7 @@ def create_nagios_servicedefs(outfile, hostname): else: used_descriptions[description] = ( checkname, item ) - if check_info[checkname]["has_perfdata"]: + if check_info[checkname].get("has_perfdata", False): template = passive_service_template_perf else: template = passive_service_template

12 years, 5 months

Check_MK Git: check_mk: Fixed some firefox styling issues

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e75011dfabd9406e588a7bbe403760c464f38230 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75011dfabd940… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:23:45 2012 +0200 Fixed some firefox styling issues --- web/htdocs/wato.css | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 12f5d06..fb8422b 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -306,12 +306,17 @@ table.validationerror img { padding-top: 1px; padding-bottom: 1px; background-color: #6da1b8; + color: #000; } .wato div.folderpath li:hover select { background-color: #7fb0c6; } +.wato div.folderpath li select option { + background-color: #6da1b8; +} + .wato div.folderpath li div.left, .wato div.folderpath li div.right { position: absolute;

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: c3a33abc2a3b3c744e5af7618c7dde63fc9a2985 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3a33abc2a3b3c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:23:52 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: WATO: Implemented new layout for the breadcrumb navigation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 731ccee2f18a9bc979d472655e7a9c5c74dec7c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=731ccee2f18a9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:18:44 2012 +0200 WATO: Implemented new layout for the breadcrumb navigation --- web/htdocs/images/breadcrumb_c_hi.png | Bin 0 -> 178 bytes web/htdocs/images/breadcrumb_c_lo.png | Bin 0 -> 178 bytes web/htdocs/images/breadcrumb_l_hi.png | Bin 0 -> 446 bytes web/htdocs/images/breadcrumb_l_lo.png | Bin 0 -> 458 bytes web/htdocs/images/breadcrumb_lm_hi.png | Bin 0 -> 866 bytes web/htdocs/images/breadcrumb_lm_lo.png | Bin 0 -> 866 bytes web/htdocs/images/breadcrumb_r_hi.png | Bin 0 -> 481 bytes web/htdocs/images/breadcrumb_r_lo.png | Bin 0 -> 483 bytes web/htdocs/images/breadcrumb_rm_hi.png | Bin 0 -> 847 bytes web/htdocs/images/breadcrumb_rm_lo.png | Bin 0 -> 887 bytes web/htdocs/wato.css | 99 ++++++++++++++++++++++++++++++- web/htdocs/wato.py | 41 +++++++++++--- 12 files changed, 128 insertions(+), 12 deletions(-) diff --git a/web/htdocs/images/breadcrumb_c_hi.png b/web/htdocs/images/breadcrumb_c_hi.png new file mode 100644 index 0000000..00a02f1 Binary files /dev/null and b/web/htdocs/images/breadcrumb_c_hi.png differ diff --git a/web/htdocs/images/breadcrumb_c_lo.png b/web/htdocs/images/breadcrumb_c_lo.png new file mode 100644 index 0000000..f92e6a2 Binary files /dev/null and b/web/htdocs/images/breadcrumb_c_lo.png differ diff --git a/web/htdocs/images/breadcrumb_l_hi.png b/web/htdocs/images/breadcrumb_l_hi.png new file mode 100644 index 0000000..dc9eaa3 Binary files /dev/null and b/web/htdocs/images/breadcrumb_l_hi.png differ diff --git a/web/htdocs/images/breadcrumb_l_lo.png b/web/htdocs/images/breadcrumb_l_lo.png new file mode 100644 index 0000000..34fc2e8 Binary files /dev/null and b/web/htdocs/images/breadcrumb_l_lo.png differ diff --git a/web/htdocs/images/breadcrumb_lm_hi.png b/web/htdocs/images/breadcrumb_lm_hi.png new file mode 100644 index 0000000..4a29324 Binary files /dev/null and b/web/htdocs/images/breadcrumb_lm_hi.png differ diff --git a/web/htdocs/images/breadcrumb_lm_lo.png b/web/htdocs/images/breadcrumb_lm_lo.png new file mode 100644 index 0000000..4b83a06 Binary files /dev/null and b/web/htdocs/images/breadcrumb_lm_lo.png differ diff --git a/web/htdocs/images/breadcrumb_r_hi.png b/web/htdocs/images/breadcrumb_r_hi.png new file mode 100644 index 0000000..be6b4a4 Binary files /dev/null and b/web/htdocs/images/breadcrumb_r_hi.png differ diff --git a/web/htdocs/images/breadcrumb_r_lo.png b/web/htdocs/images/breadcrumb_r_lo.png new file mode 100644 index 0000000..e9aa000 Binary files /dev/null and b/web/htdocs/images/breadcrumb_r_lo.png differ diff --git a/web/htdocs/images/breadcrumb_rm_hi.png b/web/htdocs/images/breadcrumb_rm_hi.png new file mode 100644 index 0000000..2fb11e8 Binary files /dev/null and b/web/htdocs/images/breadcrumb_rm_hi.png differ diff --git a/web/htdocs/images/breadcrumb_rm_lo.png b/web/htdocs/images/breadcrumb_rm_lo.png new file mode 100644 index 0000000..50e5dfe Binary files /dev/null and b/web/htdocs/images/breadcrumb_rm_lo.png differ diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index fe20dc6..12f5d06 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -260,9 +260,102 @@ table.validationerror img { /* Path to current folder at top of screen */ .wato div.folderpath { margin-bottom: 10px; + height: 30px; } -.wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i { +.wato div.folderpath ul { + list-style-type:none; + padding-left:0; +} + +.wato div.folderpath li { + float:left; + display:block; + height:26px; + + position:relative; + + /* spacing for the image divs left/right */ + padding-left: 20px; + padding-right: 20px; + + /* move left border of all items 22px left to make the items overlap */ + margin-left: -13px; + + color: #fff; +} + +.wato div.folderpath li a { + color: #fff; + text-decoration: none; +} + +.wato div.folderpath li div.content { + height: 18px; + background-image: url('images/breadcrumb_c_lo.png'); + + padding:4px 2px; + line-height:18px; +} + +.wato div.folderpath li:hover div.content { + background-image: url('images/breadcrumb_c_hi.png'); +} + +.wato div.folderpath li select { + padding-top: 1px; + padding-bottom: 1px; + background-color: #6da1b8; +} + +.wato div.folderpath li:hover select { + background-color: #7fb0c6; +} + +.wato div.folderpath li div.left, +.wato div.folderpath li div.right { + position: absolute; + width: 20px; + height: 100%; +} + +.wato div.folderpath li div.left { + top: 0; + left: 0; + background-image: url('images/breadcrumb_lm_lo.png'); +} + +.wato div.folderpath li:hover div.left { + background-image: url('images/breadcrumb_lm_hi.png'); +} + +.wato div.folderpath li div.left.end { + background-image: url('images/breadcrumb_l_lo.png'); +} + +.wato div.folderpath li:hover div.left.end { + background-image: url('images/breadcrumb_l_hi.png'); +} + +.wato div.folderpath li div.right { + top: 0; + right: 0; + background-image: url('images/breadcrumb_rm_lo.png'); +} + +.wato div.folderpath li:hover div.right { + background-image: url('images/breadcrumb_rm_hi.png'); +} + +.wato div.folderpath li div.right.end { + background-image: url('images/breadcrumb_r_lo.png'); +} + +.wato div.folderpath li:hover div.right.end { + background-image: url('images/breadcrumb_r_hi.png'); +} + +/*.wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i { float: left; } @@ -281,14 +374,12 @@ table.validationerror img { font-weight: normal; } .wato div.folderpath a { -/* color: #46c; */ text-decoration: none; } .wato div.folderpath a:hover { color: #fff; background-color: #9bc; - /* text-decoration: underline; */ -} +}*/ .wato select.folderpath { background-color: #8ab; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 680210e..fe2801f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10656,11 +10656,18 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo the_folder = g_folder keepvars = [ (name, html.var(name)) for name in keepvarnames ] + def render_component(folder): return '<a href="%s">%s</a>' % ( html.makeuri_contextless([ ("folder", folder[".path"])] + keepvars), folder["title"]) + def bc_el_start(end = '', z_index = 0): + html.write('<li style="z-index:%d;"><div class="left %s"></div>' % (z_index, end)) + + def bc_el_end(end = ''): + html.write('<div class="right %s"></div></li>' % end) + folders = [] folder = the_folder.get(".parent") while folder: @@ -10670,24 +10677,42 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo parts = [] for folder in folders[::-1]: parts.append(render_component(folder)) + + # The current folder (with link or without link) if link_to_last: parts.append(render_component(the_folder)) else: - parts.append("<b>" + the_folder["title"] + "</b>") + parts.append(the_folder["title"]) - html.write("<div class=folderpath>%s\n" % "<i> / </i>".join(parts)) + # Render the folder path + html.write("<div class=folderpath><ul>\n") + num = 0 + for part in parts: + if num == 0: + bc_el_start('end', z_index = 100 + num) + else: + bc_el_start(z_index = 100 + num) + html.write('<div class=content>%s</div>\n' % part) + bc_el_end() + num += 1 + # Render the current folder when having subfolders subfolders = the_folder[".folders"] if len(subfolders) > 0 and not link_to_last: - html.write("<i> / </i>") - html.write("<form method=GET name=folderpath>") + bc_el_start(z_index = 100 + num) + html.write("<div class=content><form method=GET name=folderpath>") options = [ (sf[".path"], sf["title"]) for sf in subfolders.values() ] - html.sorted_select("folder", [ ("", "") ] + options, onchange="folderpath.submit();", attrs={"class" : "folderpath"}) + html.sorted_select( + "folder", [ ("", "") ] + options, + onchange = "folderpath.submit();", + attrs = {"class" : "folderpath"} + ) for var in keepvarnames: html.hidden_field(var, html.var(var)) - html.write("</form>") - html.write("<div style='clear: both;'></div>") - html.write("</div>") + html.write("</form></div>") + bc_el_end('end') + + html.write("</ul></div>\n") def may_see_hosts(): return config.may("wato.use") and \

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0680, #0679

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3bb79bea96b792b9f6d1a3ae283fe27ec1b044f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3bb79bea96b79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 12:34:04 2012 +0200 Updated bug entries #0680, #0679 --- .bugs/679 | 2 ++ .bugs/680 | 9 +++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/679 b/.bugs/679 index 5cdd39f..eb27992 100644 --- a/.bugs/679 +++ b/.bugs/679 @@ -26,3 +26,5 @@ Traceback (most recent call last): File "/usr/share/check_mk/web/htdocs/valuespec.py", line 633, in from_html_vars indexes[int(indexof)] = n ValueError: invalid literal for int() with base 10: '' + +It also looks that the pickling does not work on this browser. diff --git a/.bugs/680 b/.bugs/680 new file mode 100644 index 0000000..bf43aa0 --- /dev/null +++ b/.bugs/680 @@ -0,0 +1,9 @@ +Title: Logwatch page: hilit OK blockes +Component: checks +State: open +Date: 2012-04-24 12:13:52 +Targetversion: 1.2.0 +Class: todo + +Due to logwatch reclassification, blocks can now have OK state. +This should be hilited green.

12 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
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