Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: FIX: Now really fixed the folding animation in all used places

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9f3e180e576eadfc94c7866e564281d24b1f3d97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f3e180e576ead… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 19:20:41 2011 +0200 FIX: Now really fixed the folding animation in all used places --- web/htdocs/js/check_mk.js | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index c6d9dc6..26a5469 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -573,10 +573,10 @@ function toggle_folding(oImg, state) { // state // 0: is currently opened and should be closed now // 1: is currently closed and should be opened now - setTimeout("folding_step('" + oImg.id + "', " + state + ");", 0); + setTimeout(function() { folding_step(oImg, state); }, 0); } -function folding_step(objId, state, step) { +function folding_step(oImg, state, step) { // Initialize unset step if(typeof step === 'undefined') if(state == 1) @@ -584,19 +584,23 @@ function folding_step(objId, state, step) { else step = 8; - document.getElementById(objId).src = "images/tree_" + step + "0.png"; + oImg.src = "images/tree_" + step + "0.png"; if(state == 1) { - if(step == 9) + if(step == 9) { + oImg = null; return; + } step += 1; } else { - if(step == 0) + if(step == 0) { + oImg = null; return; + } step -= 1; } - setTimeout("folding_step('" + objId + "', " + state + ", " + step + ");", fold_steps[step]); + setTimeout(function() { folding_step(oImg, state, step); }, fold_steps[step]); } function toggle_tree_state(tree, name, oContainer) {

13 years, 1 month

Check_MK Git: check_mk: FIX: Fixed initial folding state on page loading on pages with multiple foldings opened

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 629e70ac9ba7aa4651664a1f82ad0ce680d58393 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=629e70ac9ba7aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 19:11:53 2011 +0200 FIX: Fixed initial folding state on page loading on pages with multiple foldings opened --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 57 ++++++++++++++++++++++----------------------- web/htdocs/views.py | 7 +++-- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92a39ab..7f2acd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * FIX: "view_name" variable missing error message when opening view.py while using the "BI Aggregation Groups" and "Hosts" snapins in sidebar * FIX: Fixed styling of form input elements in IE + styling improvements + * FIX: Fixed initial folding state on page loading on pages with multiple foldings opened * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' snapin foldable * Replace old main view by dashboard diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 75f330d..c6d9dc6 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -566,33 +566,37 @@ function handleReload(url) { // -------------------------------------------------------------------------- // BI // -------------------------------------------------------------------------- -var tree_anim_o = null; +// +var fold_steps = [ 0, 10, 10, 15, 20, 30, 40, 55, 80 ]; function toggle_folding(oImg, state) { - tree_anim_o = oImg; - if (state) { - oImg.src = "images/tree_10.png"; - setTimeout("set_tree_animation_step('20');", 10); - setTimeout("set_tree_animation_step('30');", 20); - setTimeout("set_tree_animation_step('40');", 35); - setTimeout("set_tree_animation_step('50');", 55); - setTimeout("set_tree_animation_step('60');", 85); - setTimeout("set_tree_animation_step('70');", 125); - setTimeout("set_tree_animation_step('80');", 180); - setTimeout("set_tree_animation_step('90');", 260); - - } - else { - oImg.src = "images/tree_80.png"; - setTimeout("set_tree_animation_step('70');", 10); - setTimeout("set_tree_animation_step('60');", 20); - setTimeout("set_tree_animation_step('50');", 35); - setTimeout("set_tree_animation_step('40');", 55); - setTimeout("set_tree_animation_step('30');", 85); - setTimeout("set_tree_animation_step('20');", 125); - setTimeout("set_tree_animation_step('10');", 180); - setTimeout("set_tree_animation_step('00');", 260); + // state + // 0: is currently opened and should be closed now + // 1: is currently closed and should be opened now + setTimeout("folding_step('" + oImg.id + "', " + state + ");", 0); +} + +function folding_step(objId, state, step) { + // Initialize unset step + if(typeof step === 'undefined') + if(state == 1) + step = 1; + else + step = 8; + + document.getElementById(objId).src = "images/tree_" + step + "0.png"; + + if(state == 1) { + if(step == 9) + return; + step += 1; + } else { + if(step == 0) + return; + step -= 1; } + + setTimeout("folding_step('" + objId + "', " + state + ", " + step + ");", fold_steps[step]); } function toggle_tree_state(tree, name, oContainer) { @@ -627,11 +631,6 @@ function toggle_subtree(oImg) get_url(url); } -function set_tree_animation_step(num) -{ - tree_anim_o.src = "images/tree_" + num + ".png"; -} - function toggle_foldable_container(treename, id) { var oImg = document.getElementById('treeimg.' + treename + '.' + id); var oBox = document.getElementById('tree.' + treename + '.' + id); diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6fa53db..164e657 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -539,9 +539,9 @@ function toggle_section(nr, oImg) { var oContent = document.getElementById("ed_" + nr); toggle_tree_state('vieweditor', nr, oContent); if (oContent.style.display == "none") - toggle_folding(oImg, 1); - else toggle_folding(oImg, 0); + else + toggle_folding(oImg, 1); oContent = null; } """) @@ -558,9 +558,10 @@ function toggle_section(nr, oImg) { def section_footer(sid): html.write("</div></td></tr>\n") + # Open the section when the user had it open last time states = weblib.get_tree_states('vieweditor') if states.get(str(sid), 'off') == 'on': - html.javascript('toggle_section("%d", this)' % sid) + html.javascript('toggle_section("%d", document.getElementById("img_%s"))' % (sid, sid)) # Properties sid = 2

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5139187c6eb265044ce4da95428caa7f3da556c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5139187c6eb265… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 18:22:40 2011 +0200 Updated bug entries --- .bugs/206 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bugs/206 b/.bugs/206 index 3bd3094..d6d5922 100644 --- a/.bugs/206 +++ b/.bugs/206 @@ -1,12 +1,17 @@ Title: View editor has layout problems in IE 8 Component: multisite +State: done +Class: bug +Date: 2011-03-07 16:08:31 Benefit: 1 -State: open Cost: 1 -Date: 2011-03-07 16:08:31 -Class: bug +Fun: 0 For example the column editor: the input box is far too small. Also the input boxes of title, etc. are too long. Could someone try, if this is still the case? + +2011-08-17 18:22:33: changed state open -> done +Added stylings for more equal layout in different browsers. +Don't see any big styling differences now.

13 years, 1 month

Check_MK Git: check_mk: Added notification log views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6bcdcb7a899705cde37f4e4f647dbdc05ab6fd48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bcdcb7a899705… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 17:43:42 2011 +0200 Added notification log views * Added filter and painter for the contact_name in log table * Added several views to display the notification logs of Nagios --- ChangeLog | 2 + web/plugins/views/builtin.py | 236 +++++++++++++++++++++++++++++++++++++++++ web/plugins/views/filters.py | 2 + web/plugins/views/painters.py | 6 + 4 files changed, 246 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6bcdcb7a89…

13 years, 1 month

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: 6b67ea21837ac6ff3b6141c43632d9c6e4ff665f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b67ea21837ac6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 17:41:59 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: Added notification icon

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f58cfb125b84ebc91ef042b86cbe0f5e9b4a336d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f58cfb125b84eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 17:41:57 2011 +0200 Added notification icon --- web/htdocs/images/icon_notification.png | Bin 0 -> 1173 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_notification.png b/web/htdocs/images/icon_notification.png new file mode 100644 index 0000000..a8fdebd Binary files /dev/null and b/web/htdocs/images/icon_notification.png differ

13 years, 1 month

Check_MK Git: check_mk: FIX: Fixed styling of form input elements in IE + styling improvements

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d7db2f00f2bc6778b4ee614b3155881b52b3831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d7db2f00f2bc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 18:16:08 2011 +0200 FIX: Fixed styling of form input elements in IE + styling improvements --- ChangeLog | 1 + web/htdocs/check_mk.css | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3c37eb..92a39ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * FIX: BI - fixed wrong variable in running_on aggregation function * FIX: "view_name" variable missing error message when opening view.py while using the "BI Aggregation Groups" and "Hosts" snapins in sidebar + * FIX: Fixed styling of form input elements in IE + styling improvements * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' snapin foldable * Replace old main view by dashboard diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 5a656af..a5f38a7 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -24,6 +24,18 @@ button, input, td, th, select { font-size: 9pt; } +input, select, textarea { + padding: 3px; + border: 1px #73767A solid; + outline: invert none medium; + -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + background-color: #fff; +} + +input:hover, select:hover, textarea:hover { + background-color: #EDECEB; +} + img { border-style: none; } @@ -67,7 +79,7 @@ ul.treeangle li { } input.buttonlink { - padding: 0; + padding: 1px; font-size: 8pt; } /* @@ -1101,7 +1113,6 @@ table.form img.toggleheader.hover { table.form td.legend, table.form td.title { color: #274750; border: 1px solid #fff; - height: 32px; padding-top: 10px; } @@ -1109,7 +1120,6 @@ table.form td.legend, table.form td.title { table.form td.buttons { color: #274750; border: 1px solid #fff; - height: 32px; padding-top: 10px; text-align: right; }

13 years, 1 month

Check_MK Git: check_mk: Fixed changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e276b354495053d52ea19a45c0705c46a47fe927 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e276b354495053… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 17:41:35 2011 +0200 Fixed changelog --- ChangeLog | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b4e501..f8260b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,28 +61,32 @@ * Windows: inventory_services now allowes regexes, depends and state/start type and also allows host tags. - Multisite: * FIX: make non-Ascii characters in services names work again * FIX: Avoid - exceptions in sidebar on Nagios restart * FIX: printer_supply perfometer: Using white font - for black toners * FIX: ipmi: Skipping items with invalid data (0.000 val, "unspecified" - unit) in summary mode - * FIX: ipmi: Improved output formating in summary mode * FIX: BI - fixed wrong variable - in running_on aggregation function * FIX: "view_name" variable missing error message when - opening view.py + Multisite: + * FIX: make non-Ascii characters in services names work again + * FIX: Avoid exceptions in sidebar on Nagios restart + * FIX: printer_supply perfometer: Using white font for black toners + * FIX: ipmi: Skipping items with invalid data (0.000 val, "unspecified" unit) in summary mode + * FIX: ipmi: Improved output formating in summary mode + * FIX: BI - fixed wrong variable in running_on aggregation function + * FIX: "view_name" variable missing error message when opening view.py while using the "BI Aggregation Groups" and "Hosts" snapins in sidebar - * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' - snapin foldable * Replace old main view by dashboard. * Sidebar: Snapins can register for - a triggered reload after a nagios + * Introduced basic infrastructure for multilanguage support in Multisite + * Make 'Views' snapin foldable + * Replace old main view by dashboard + * Sidebar: Snapins can register for a triggered reload after a nagios restart has been detected. Check interval is 30 seconds for now. - * Quicksearch snapin: Reloads host lists after a detected nagios restart. * New config - directory multisite.d/ - similar to conf.d/ * great speed up of HTML rendering * support - for Python profiling (set profile = True in multisite.mk, profile + * Quicksearch snapin: Reloads host lists after a detected nagios restart. + * New config directory multisite.d/ - similar to conf.d/ + * great speed up of HTML rendering + * support for Python profiling (set profile = True in multisite.mk, profile will be in var/check_mk/web) * WATO: Added new hook "active-changes" which calls the registered hosts with a dict of "dirty" hosts - * Added column painter for host contacts * Added column painters for contact groups, added - those to detail views * Added filters for host and service contact groups * Detail views - of host/service now show contacts * Fix playing of sounds: All problem views now have - play_sounds activated, + * Added column painter for host contacts + * Added column painters for contact groups, added those to detail views + * Added filters for host and service contact groups + * Detail views of host/service now show contacts + * Fix playing of sounds: All problem views now have play_sounds activated, all other deactivated. * Rescheduling of Check_MK: introduce a short sleep of 0.7 sec. This increases the chance of the passive services being updated before the repaint.

13 years, 1 month

Check_MK Git: check_mk: Remove leading/ trailing spaces from service description

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9d89383e6d5998e291ab18e65e7d17271a715ec6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d89383e6d5998… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 17 14:25:28 2011 +0200 Remove leading/trailing spaces from service description --- ChangeLog | 2 ++ modules/check_mk.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b4e501..6973784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically + * FIX: automatically remove leading and trailing space from service names + (this fixes a problem with printer_pages and an empty item) * Great speed up of cmk -N/-C/-U/-R, especially when number of hosts is large. * new main.mk option delay_precompile: if True, check_mk will skip Python diff --git a/modules/check_mk.py b/modules/check_mk.py index cacaede..b0af17b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1012,18 +1012,23 @@ def service_description(checkname, item): if not descr_format: descr_format = check_info[checkname][1] + # Note: we strip the service description (remove spaces). + # One check defines "Pages %s" as a desription, but the item + # can by empty in some cases. Nagios silently drops leading + # and trailing spaces in the configuration file. + if type(item) == str: # Remove characters from item name that are banned by Nagios item_safe = "".join([ c for c in item if c not in nagios_illegal_chars ]) if "%s" not in descr_format: descr_format += " %s" - return descr_format % (item_safe,) + return (descr_format % (item_safe,)).strip() if type(item) == int or type(item) == long: if "%s" not in descr_format: descr_format += " %s" - return descr_format % (item,) + return (descr_format % (item,)).strip() else: - return descr_format + return descr_format.strip() # +----------------------------------------------------------------------+ # | ____ __ _ _ _ |

13 years, 1 month

Check_MK Git: check_mk: Livestatus: Negation of filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 413cfa4ff2b22d3a3d83a869b5b56303cdb348d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413cfa4ff2b22d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 17 14:06:38 2011 +0200 Livestatus: Negation of filters --- ChangeLog | 38 ++++++++--------- livestatus/src/AndingFilter.cc | 12 +++++ livestatus/src/AndingFilter.h | 2 + livestatus/src/CustomVarsExplicitColumn.h | 2 +- livestatus/src/NegatingFilter.h | 42 +++++++++++++++++++ livestatus/src/Query.cc | 64 +++++++++++++++++++++++++++++ livestatus/src/Query.h | 7 ++- 7 files changed, 143 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=413cfa4ff2…

13 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011