Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: Fixed IE8 javascript errors

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b7a3169067ae2e9dc68dcf344c14ecafa5a9a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b7a3169067ae2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 16:18:01 2011 +0200 Fixed IE8 javascript errors --- web/htdocs/check_mk.css | 20 ++++++++++---------- web/htdocs/js/check_mk.js | 9 ++++++--- web/htdocs/js/dashboard.js | 14 ++++++++------ web/htdocs/js/search.js | 4 ++-- web/htdocs/js/sidebar.js | 14 ++++++++------ 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 11f60b7..96bf4ed 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1696,7 +1696,7 @@ div.dashlet div.title { position: absolute; left: 0px; width: 150px; /* will be changed by javascript later */ - color: white; + color: #fff; text-align: center; padding: 0px; margin: 0px; @@ -1794,7 +1794,7 @@ div.dashlet table.hoststats td.color { div.dashlet table.hoststats th, table.hoststats td { padding-top: 3px; padding-bottom: 3px; - border-color: white; + border-color: #fff; border-style: solid none; border-width: 1px; vertical-align: middle; @@ -1907,7 +1907,7 @@ table.add_snapin i { padding-top: 7px; vertical-align: top; text-align: right; - border: 1px solid white; + border: 1px solid #fff; border-left-style: none; } @@ -1975,7 +1975,7 @@ table.add_snapin i { -moz-border-radius: 3px; background-color: #8ab; padding: 2px 9px; - color: white; + color: #fff; font-weight: normal; } .wato div.folderpath a { @@ -1983,7 +1983,7 @@ table.add_snapin i { text-decoration: none; } .wato div.folderpath a:hover { - color: white; + color: #fff; background-color: #9bc; /* text-decoration: underline; */ } @@ -2018,11 +2018,11 @@ table.add_snapin i { background-image: url("images/form_background.png"); background-repeat: repeat; width: 50%; - border: 1px solid black; + border: 1px solid #000; } .wato table.progress th { - background-color: white; + background-color: #fff; padding: 3px 0px; } @@ -2030,7 +2030,7 @@ table.add_snapin i { .wato table.progress td.log div { background-image: url("images/form_background.png"); background-repeat: repeat; - border: 1px solid white; + border: 1px solid #fff; padding: 5px; height: 250px; overflow: auto; @@ -2101,7 +2101,7 @@ table.add_snapin i { .wato table.progress td.stats table { border-collapse: collapse; border-spacing: 0px; - border: 1px solid white; + border: 1px solid #fff; } .wato table.progress td.stats th { text-align: left; @@ -2110,7 +2110,7 @@ table.add_snapin i { padding-left: 6px; } .wato table.progress td.stats th, .wato table.progress td.stats td { - border-bottom: 1px solid white; + border-bottom: 1px solid #fff; padding-top: 3px; padding-bottom: 3px; } diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 91cd044..c1b0321 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -154,7 +154,7 @@ function executeJS(objId) { // if (!isFirefox()) { var obj = document.getElementById(objId); var aScripts = obj.getElementsByTagName('script'); - for(var i in aScripts) { + for(var i = 0; i < aScripts.length; i++) { if (aScripts[i].src && aScripts[i].src !== '') { var oScr = document.createElement('script'); oScr.src = aScripts[i].src; @@ -322,7 +322,7 @@ function pnp_response_handler(data, code) { var response = null; try { response = eval(code); - for(var i in response) { + for(var i = 0; i < response.length; i++) { var graph = response[i]; var view = data['view'] == '' ? '0' : data['view']; create_graph(data, '&' + graph['image_url'].replace('&view='+view, '')); @@ -338,7 +338,7 @@ function pnp_response_handler(data, code) { // Fallback bei doofer/keiner Antwort function fallback_graphs(data) { - for(var i in [0, 1, 2, 3, 4, 5, 6, 7]) { + for(var i = 0; i < 8; i++) { create_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + i); } } @@ -878,6 +878,9 @@ function lightenColor(color, rD, gD, bD) { var r = parseInt(color.substring(1, 2) + color.substring(1, 2), 16); var g = parseInt(color.substring(2, 3) + color.substring(2, 3), 16); var b = parseInt(color.substring(3, 4) + color.substring(3, 4), 16); + } else { + alert('Invalid color definition: ' + color); + return color; } var brightness = (r*299 + g*587 + b*114) / 1000; diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 6b4e79f..72d18bc 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -40,11 +40,13 @@ function resize_dashlets(id, code) // resize outer div oDash = document.getElementById("dashlet_" + dashlet[0]); - oDash.style.position = 'absolute'; - oDash.style.left = dashlet[1] + "px"; - oDash.style.top = dashlet[2] + "px"; - oDash.style.width = dashlet[3] + "px"; - oDash.style.height = dashlet[4] + "px"; + if(oDash) { + oDash.style.position = 'absolute'; + oDash.style.left = dashlet[1] + "px"; + oDash.style.top = dashlet[2] + "px"; + oDash.style.width = dashlet[3] + "px"; + oDash.style.height = dashlet[4] + "px"; + } // resize shadow images oDash = document.getElementById("dashadow_w_" + dashlet[0]); @@ -99,7 +101,7 @@ function set_dashboard_size() function dashboard_scheduler(force) { var timestamp = Date.parse(new Date()) / 1000; var newcontent = ""; - for (var i in refresh_dashlets) { + for(var i = 0; i < refresh_dashlets.length; i++) { var nr = refresh_dashlets[i][0]; var refresh = refresh_dashlets[i][1]; var url = refresh_dashlets[i][2]; diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index c4e8690..0809ffa 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -222,7 +222,7 @@ function mkSearchMoveElement(step) { oResults = oResults.childNodes; var a = 0; - for(var i in oResults) { + for(var i = 0; i < oResults.length; i++) { if(oResults[i].nodeName == 'A') { if(a == iCurrent) { oResults[i].setAttribute('class', 'active'); @@ -345,7 +345,7 @@ function mkSearchAddSearchResults(aSearchObjects, objType, val) { var objName, objSite; aSearchContents = ''; var numHits = 0; - for(var i in aSearchObjects){ + for(var i = 0; i < aSearchObjects.length; i++) { objSite = aSearchObjects[i][0]; objName = aSearchObjects[i][1]; diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 884af57..c337f2d 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -77,7 +77,7 @@ function registerEdgeListeners(obj) { else edges = [ obj ]; - for(var i in edges) { + for(var i = 0; i < edges.length; i++) { // It is possible to open other domains in the content frame - don't register // the event in that case. It is not permitted by most browsers! if(!contentFrameAccessible()) @@ -265,9 +265,11 @@ function snapinStopDrag(event) { function getDivChildNodes(node) { var children = []; - for(var i in node.childNodes) - if(node.childNodes[i].tagName === 'DIV') - children.push(node.childNodes[i]); + var childNodes = node.childNodes; + for(var i = 0; i < childNodes.length; i++) + if(childNodes[i].tagName === 'DIV') + children.push(childNodes[i]); + childNodes = null; return children; } @@ -277,7 +279,7 @@ function getSnapinList() { var l = []; var childs = getDivChildNodes(snapinDragging.parentNode); - for(var i in childs) { + for(var i = 0; i < childs.length; i++) { var child = childs[i]; // Skip // - non snapin objects @@ -318,7 +320,7 @@ function getSnapinTargetPos() { // Find the nearest snapin to current left/top corner of // the currently dragged snapin - for(var i in childs) { + for(var i = 0; i < childs.length; i++) { var child = childs[i]; if (!child.id || child.id.substr(0, 7) != 'snapin_' || child.id == snapinDragging.id)

13 years

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); }

13 years

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)

13 years

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

13 years

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

13 years

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.

13 years

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.

13 years

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,

13 years

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

13 years

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 ---

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits