Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: Removed old code

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 49fff6f6ae916302ffe19ff54ad2a195ecbba2db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49fff6f6ae9163… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 16:45:36 2011 +0200 Removed old code --- web/htdocs/js/dashboard.js | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 7d461fd..6b4e79f 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -108,13 +108,6 @@ function dashboard_scheduler(force) { get_url(url, updateContents, "dashlet_inner_" + nr); } } - // Detect page changes and re-register the mousemove event handler - // in the content frame. another bad hack ... narf - // LARS: Braucht man das Zeug hier auch? - // if (contentFrameAccessible() && contentLocation != parent.frames[1].document.location) { - // registerEdgeListeners(parent.frames[1]); - // contentLocation = parent.frames[1].document.location; - // } setTimeout(function() { dashboard_scheduler(0); }, 1000); }

12 years, 9 months

Check_MK Git: check_mk: Added missing sorters for " service nth service perfdata" painters

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 87c492b3ba29381030c473dfd4a0206154cf97bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87c492b3ba2938… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 13:37:05 2011 +0200 Added missing sorters for "service nth service perfdata" painters --- .bugs/198 | 9 +++++++++ .bugs/199 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/sorters.py | 10 ++++++++++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/.bugs/198 b/.bugs/198 new file mode 100644 index 0000000..2f87d06 --- /dev/null +++ b/.bugs/198 @@ -0,0 +1,9 @@ +Title: "Try" in view editor zeigt Action Formular +Component: multisite +Benefit: 3 +State: open +Cost: 2 +Date: 2011-08-31 12:55:15 +Class: cleanup + +Dort sollte kein Formular angezeigt werden. diff --git a/.bugs/199 b/.bugs/199 new file mode 100644 index 0000000..6b3d660 --- /dev/null +++ b/.bugs/199 @@ -0,0 +1,11 @@ +Title: <ENTER> im view editor sollte Formular abschicken +Component: multisite +Benefit: 4 +State: open +Cost: 1 +Date: 2011-08-31 12:56:00 +Class: cleanup + +Wenn man viel mit Tastaturkürzeln arbeitet, nervt es, dass man im View Editor +beim Druck auf <ENTER> immer das Formular nur im "Try" Modus abschickt. Man +sollte da das Formular eher ganz abschicken. diff --git a/ChangeLog b/ChangeLog index 5d8fa20..ece2457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Open tabs in views do not prevent reloading the displayed data anymore * Added display_option "L" to enable/disable column title sortings * Sorting by joined columns is now possible + * Added missing sorters for "service nth service perfdata" painters 1.1.11i3: Core, Setup, etc.: diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 951f770..16482f3 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -155,6 +155,16 @@ declare_1to1_sorter("svc_notifications_enabled", cmp_simple_number) declare_1to1_sorter("svc_is_active", cmp_simple_number) declare_1to1_sorter("svc_group_memberlist", cmp_string_list) declare_1to1_sorter("svc_acknowledged", cmp_simple_number) +declare_1to1_sorter("svc_perf_val01", cmp_simple_number) +declare_1to1_sorter("svc_perf_val02", cmp_simple_number) +declare_1to1_sorter("svc_perf_val03", cmp_simple_number) +declare_1to1_sorter("svc_perf_val04", cmp_simple_number) +declare_1to1_sorter("svc_perf_val05", cmp_simple_number) +declare_1to1_sorter("svc_perf_val06", cmp_simple_number) +declare_1to1_sorter("svc_perf_val07", cmp_simple_number) +declare_1to1_sorter("svc_perf_val08", cmp_simple_number) +declare_1to1_sorter("svc_perf_val09", cmp_simple_number) +declare_1to1_sorter("svc_perf_val10", cmp_simple_number) # Host declare_1to1_sorter("alias", cmp_simple_string)

12 years, 9 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3ea185584fcc0f38384a0a46bcb92cd3fbe7b3ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea185584fcc0f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 12:40:09 2011 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0d18d6..5d8fa20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * FIX: Made bulk inventory work in IE * FIX: Fixed js errors in IE when having not enough space on dashboard * FIX: fix error when using non-Ascii characters in view title + * FIX: fix error on comment page caused by missing sorter * Views are not reloaded completely anymore. The data tables are reloaded on their own. * Open tabs in views do not prevent reloading the displayed data anymore

12 years, 9 months

Check_MK Git: check_mk: Adding missing sorter for comment types (host/ service)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e232fabfd13698fb65bb6e157c973c10ec17044b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e232fabfd13698… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 12:33:31 2011 +0200 Adding missing sorter for comment types (host/service) --- web/htdocs/views.py | 3 ++- web/plugins/views/sorters.py | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 356e59d..4c139f5 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2262,7 +2262,8 @@ def get_primary_sorter_order(view, painter): def get_separated_sorters(view): group_sort = [ (get_sorter_name_of_painter(multisite_painters[p[0]]), False) for p in view['group_painters'] - if p[0] in multisite_painters ] + if p[0] in multisite_painters + and get_sorter_name_of_painter(multisite_painters[p[0]]) is not None ] view_sort = [ s for s in view['sorters'] if not s[0] in group_sort ] # Get current url individual sorters. Parse the "sort" url parameter, diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 9e6f87a..951f770 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -229,6 +229,7 @@ declare_1to1_sorter("comment_author", cmp_simple_string) declare_1to1_sorter("comment_comment", cmp_simple_string) declare_1to1_sorter("comment_time", cmp_simple_number) declare_1to1_sorter("comment_expires", cmp_simple_number, reverse = True) +declare_1to1_sorter("comment_what", cmp_simple_number) declare_simple_sorter("comment_type", _("Comment type"), "comment_type", cmp_simple_number) # Downtimes

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b01894cdb048f813dfb04fc396dc8c0771d4929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b01894cdb048f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 27 14:24:07 2011 +0200 Updated bug entries --- .bugs/362 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/362 b/.bugs/362 new file mode 100644 index 0000000..bbc6e9f --- /dev/null +++ b/.bugs/362 @@ -0,0 +1,12 @@ +Title: WATO-Path context gets lost when clicking view in snapin +Component: multisite +Benefit: 1 +State: open +Cost: 2 +Date: 2011-08-27 14:21:47 +Class: bug + +When one has a WATO path context (by clicking on the Hosts-Snapin with +the WATO tree) and then clicks on a new view in the Views-Snapin, then +that context gets lost. I think it would be better if that context +would be preserved.

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b0c23227f324fa03503c38abd5e596867324846 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b0c23227f324f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 27 14:18:27 2011 +0200 Updated bug entries --- .bugs/361 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/361 b/.bugs/361 new file mode 100644 index 0000000..c6ebe38 --- /dev/null +++ b/.bugs/361 @@ -0,0 +1,11 @@ +Title: setup.sh does not setup permissions for WATO correctly +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-08-27 14:04:23 +Class: cleanup + +The setup.sh should try to setup permissions for WATO. We might +need a SGID bit and 775 permissions for the Webserver. +Also check if OMD share mode is working correctly.

12 years, 10 months

Check_MK Git: check_mk: FIX: allow Umlauts in view title+description

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba4aceeb2dfe1d3bda506f465add76ee8582947f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba4aceeb2dfe1d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 27 14:18:40 2011 +0200 FIX: allow Umlauts in view title+description --- ChangeLog | 1 + web/htdocs/views.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9810bdf..c0d18d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * FIX: Removed new python syntax which is incompatible with old python versions * FIX: Made bulk inventory work in IE * FIX: Fixed js errors in IE when having not enough space on dashboard + * FIX: fix error when using non-Ascii characters in view title * Views are not reloaded completely anymore. The data tables are reloaded on their own. * Open tabs in views do not prevent reloading the displayed data anymore diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 862a8ab..356e59d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -874,7 +874,7 @@ def create_view(): raise MKUserError("view_name", _("Please supply a unique name for the view, this will be used to specify that view in HTTP links.")) if not re.match("^[a-zA-Z0-9_]+$", name): raise MKUserError("view_name", _("The name of the view may only contain letters, digits and underscores.")) - title = html.var("view_title").strip() + title = html.var_utf8("view_title").strip() if title == "": raise MKUserError("view_title", _("Please specify a title for your view")) linktitle = html.var("view_linktitle").strip() @@ -884,7 +884,7 @@ def create_view(): if not icon: icon = None - topic = html.var("view_topic") + topic = html.var_utf8("view_topic") if not topic: topic = _("Other") datasourcename = html.var("datasource") @@ -988,7 +988,7 @@ def create_view(): "topic" : topic, "linktitle" : linktitle, "icon" : icon, - "description" : html.var("view_description", ""), + "description" : html.var_utf8("view_description", ""), "datasource" : datasourcename, "public" : public, "hidden" : hidden,

12 years, 10 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c44fd2b5862e82afaef6591a04d1f888625a5f99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44fd2b5862e82… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 27 14:04:10 2011 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 35329ed..67bf40f 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -361 +371

12 years, 10 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: ad814a12e57f83661c553de1fb9e60ac6792dae3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad814a12e57f83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 27 14:04:15 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 10 months

Check_MK Git: check_mk: FIX: Made bulk inventory work in IE

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 682a661c5df6a75f56997bd531cd774669dde3e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=682a661c5df6a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 14:36:24 2011 +0200 FIX: Made bulk inventory work in IE --- .bugs/197 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/check_mk.css | 1 + web/htdocs/js/wato.js | 6 ++++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.bugs/197 b/.bugs/197 new file mode 100644 index 0000000..9c73aee --- /dev/null +++ b/.bugs/197 @@ -0,0 +1,15 @@ +Title: Dashlet iframe Hintergrund weiß +Component: multisite +Benefit: 3 +State: open +Cost: 2 +Date: 2011-08-26 14:24:58 +Class: nastiness + +Momentan ist der Dashlet Hintergrund bei iframes immer weiß. Das sieht nicht gut aus. +Die Idee scheint mir zu sein, dass jede eingebettete Seite einen Eigenen Hintergrund +definieren können soll. Ist grundsätzlich sicher auch sinnvoll. Allerdings sollte man +den Default Hintergrund der Multisite Seite immer als Fallback drin haben. + +Interessanterweise funktioniert es im Firefox ordentlich. Da muss man noch mal drüber +schauen. Eventuell irgendwas im CSS schief. diff --git a/ChangeLog b/ChangeLog index abe1d18..9860aee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * FIX: WATO filtered status GUIs did not update the title after changing the title of the file/folder in WATO * FIX: Removed new python syntax which is incompatible with old python versions + * FIX: Made bulk inventory work in IE * Views are not reloaded completely anymore. The data tables are reloaded on their own. * Open tabs in views do not prevent reloading the displayed data anymore diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index c5ac76d..11f60b7 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -2034,6 +2034,7 @@ table.add_snapin i { padding: 5px; height: 250px; overflow: auto; + text-align: left; } .wato table.progress td.log { diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 7e3d447..68e7e40 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -212,8 +212,10 @@ function update_progress_stats(header) { for(var i = 1; i < header.length; i++) { var o = document.getElementById('progress_stat' + (i - 1)); if (o) { - if(progress_success_stats.indexOf(i) !== -1) - progress_found += parseInt(header[i]); + for(var a = 0; a < progress_success_stats.length; a++) + if(progress_success_stats[a] == i) + progress_found += parseInt(header[i]); + o.innerHTML = parseInt(o.innerHTML) + parseInt(header[i]); o = null; }

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011