Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: f3baadf49483dbee6a08c663d23cd2d1f1b9d76d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3baadf49483db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 08:44:26 2016 +0100 Fixed invalid exception call --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 036959a..2813d0d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -949,7 +949,7 @@ def ajax_popup_move_to_folder(): return if not back_url or not back_url.startswith("wato.py"): - raise MKUserError(_("Invalid back URL provided.")) + raise MKUserError("back_url", _("Invalid back URL provided.")) html.write('<span>%s</span>' % _('Move this %s to:') % what_title)

8 years, 6 months

Fixed wrong named default method of WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 22c8eb4971899eb4d9533dbe28ace1ceae50216e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22c8eb4971899e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 08:34:06 2016 +0100 Fixed wrong named default method of WatoMode --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b96c522..036959a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -328,7 +328,7 @@ class WatoMode(object): global_buttons() - def actions(self): + def action(self): pass

8 years, 6 months

Fixed duplicate functio name in views module

by Lars Michelsen

Module: check_mk Branch: master Commit: 2bf7aad801133b7b012464f429203ae3c8ddb4de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bf7aad801133b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 17:59:06 2016 +0100 Fixed duplicate functio name in views module --- web/plugins/icons/builtin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 0a7ca8e..3e3db24 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -542,7 +542,7 @@ multisite_icons_and_actions['status_downtimes'] = { # | | # '----------------------------------------------------------------------' -def paint_comments(what, row, tags, host_custom_vars): +def paint_comment_icon(what, row, tags, host_custom_vars): comments = row[what + "_comments_with_extra_info"] if len(comments) > 0: text = "" @@ -554,7 +554,7 @@ def paint_comments(what, row, tags, host_custom_vars): multisite_icons_and_actions['status_comments'] = { 'columns': [ 'comments_with_extra_info' ], - 'paint': paint_comments, + 'paint': paint_comment_icon, 'toplevel': True, } @@ -621,7 +621,7 @@ multisite_icons_and_actions['status_flapping'] = { # | | # +----------------------------------------------------------------------+ -def paint_is_stale(what, row, tags, host_custom_vars): +def paint_is_stale_icon(what, row, tags, host_custom_vars): if is_stale(row): if what == "host": title = _("This host is stale") @@ -632,7 +632,7 @@ def paint_is_stale(what, row, tags, host_custom_vars): multisite_icons_and_actions['status_stale'] = { 'columns': [ 'staleness' ], - 'paint': paint_is_stale, + 'paint': paint_is_stale_icon, 'toplevel': True, }

8 years, 6 months

Fixed broken function call

by Lars Michelsen

Module: check_mk Branch: master Commit: 5073318801e6639f69ab5098a105bbec15012a77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5073318801e663… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 18:05:06 2016 +0100 Fixed broken function call --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b6ee5a5..ed7da65 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2128,7 +2128,7 @@ def mode_object_parameters(phase): checkgroup = serviceinfo["checkgroup"] checktype = serviceinfo["checktype"] if not group: - htmlwrite(_("This check is not configurable via WATO")) + html.write(_("This check is not configurable via WATO")) else: rulespec = g_rulespecs["static_checks:" + checkgroup] itemspec = rulespec["itemspec"]

8 years, 6 months

Invalid exception handling when trying to edit a non existing custom user attribute

by Lars Michelsen

Module: check_mk Branch: master Commit: 880dda03365cb1fbd5f5c09be706debbb8fca8cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=880dda03365cb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 18:08:37 2016 +0100 Invalid exception handling when trying to edit a non existing custom user attribute --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ed7da65..b96c522 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14259,7 +14259,7 @@ def mode_edit_custom_attr(phase, what): if not new: attr = [ a for a in attrs if a['name'] == name ] if not attr: - raise MKUserError(_('The attribute does not exist.')) + raise MKUserError(None, _('The attribute does not exist.')) else: attr = attr[0] else:

8 years, 6 months

3096 check_mailboxes: new active check to monitor age and count of mails in imap mailboxes

by Sebastian Herbord

Module: check_mk Branch: master Commit: ca6cd4e4f35eab0a14227c7d4c7fb0b93edd00b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca6cd4e4f35eab… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Mar 10 14:34:24 2016 +0100 3096 check_mailboxes: new active check to monitor age and count of mails in imap mailboxes --- .werks/3096 | 10 + ChangeLog | 1 + checkman/check_mailboxes | 15 ++ checks/check_mailboxes | 78 +++++++ doc/treasures/active_checks/check_mailboxes | 295 +++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 241 +++++++++++++--------- 6 files changed, 544 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ca6cd4e4f3…

8 years, 6 months

Added option to stop the graph update pause timer

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a656b52fffb6db1536250a3017052321e13c2b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a656b52fffb6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 14:13:51 2016 +0100 Added option to stop the graph update pause timer --- web/htdocs/js/checkmk.js | 20 +++++++++++++++++++- web/htdocs/pages.css | 11 ++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d4471ac..e6c914b 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1161,6 +1161,21 @@ function update_reload_pause_timer(seconds_left) } } + +function stop_reload_pause_timer() +{ + if (!g_reload_pause_timer) + return; + + clearTimeout(g_reload_pause_timer); + g_reload_pause_timer = null; + + var counter = document.getElementById("reload_pause_counter"); + if (counter) + counter.style.display = "none"; +} + + function draw_reload_pause_overlay(seconds) { var container = document.getElementById("reload_pause"); @@ -1185,8 +1200,11 @@ function draw_reload_pause_overlay(seconds) p2.className = "pause_bar p2"; container.appendChild(p2); - var counter = document.createElement("div"); + var counter = document.createElement("a"); counter.setAttribute("id", "reload_pause_counter"); + // FIXME: Localize + counter.title = "Click to stop the countdown." + counter.href = "javascript:stop_reload_pause_timer()"; container.appendChild(counter); document.body.appendChild(container); diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 8eab2ed..7799ccb 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -208,6 +208,7 @@ div#foot_refresh, div#foot_refresh_time { padding: 10px; text-decoration: none; z-index: 40; + text-align: center; } .pause_bar { @@ -223,21 +224,25 @@ div#foot_refresh, div#foot_refresh_time { } .pause_bar.p1 { - margin-left: 20px; + margin-left: 15px; margin-right: 5px; } .pause_bar.p2 { margin-left: 5px; - margin-right: 10px; + margin-right: 15px; } #reload_pause_counter { font-weight: bold; color: #fff; - width: 100%; text-align: center; font-size: 120%; + text-decoration: none; +} + +#reload_pause_counter:hover { + text-decoration: underline; }

8 years, 6 months

Fixed missing import of MKLivestatusNotFoundError exception

by Lars Michelsen

Module: check_mk Branch: master Commit: b0d3aab0c0c612a7cb536610fbf90c483e16295f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d3aab0c0c612… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 9 18:05:32 2016 +0100 Fixed missing import of MKLivestatusNotFoundError exception --- web/htdocs/metrics.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 00df856..42bcc2b 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -39,6 +39,7 @@ import config, defaults, pagetypes, table import sites from lib import * from valuespec import * +from livestatus import MKLivestatusNotFoundError try: import simplejson as json @@ -1440,7 +1441,7 @@ def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_opti graph_definition = graph_definitions[0] else: raise MKGeneralException(_("Failed to calculate a graph definition.")) - except livestatus.MKLivestatusNotFoundError: + except MKLivestatusNotFoundError: html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot reander graphs: cannot fetch data via Livestatus"))) return

8 years, 6 months

Added missing import of json module

by Lars Michelsen

Module: check_mk Branch: master Commit: a546a57427ac68139d1138ed60a73f5254ef2769 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a546a57427ac68… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 9 18:04:13 2016 +0100 Added missing import of json module --- web/htdocs/metrics.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 941d243..00df856 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -40,6 +40,10 @@ import sites from lib import * from valuespec import * +try: + import simplejson as json +except ImportError: + import json # .--Plugins-------------------------------------------------------------. # | ____ _ _ |

8 years, 6 months

3285 FIX Fixed exception when editing large bookmark lists

by Lars Michelsen

Module: check_mk Branch: master Commit: cfbc234964665b6cd8f9357698f3eb77b14cae21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfbc234964665b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 13:52:23 2016 +0100 3285 FIX Fixed exception when editing large bookmark lists --- .werks/3285 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/pagetypes.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3285 b/.werks/3285 new file mode 100644 index 0000000..013724d --- /dev/null +++ b/.werks/3285 @@ -0,0 +1,10 @@ +Title: Fixed exception when editing large bookmark lists +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457614325 + + diff --git a/ChangeLog b/ChangeLog index 8c752fb..da52703 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 3090 FIX: fixed perf-o-meter link leading to old graph page even when new graphs are being used * 3260 FIX: Availability: ignores completely unmonitored objects in summary calculation * 3279 FIX: LDAP: Fixed default values of attribute selections... + * 3285 FIX: Fixed exception when editing large bookmark lists WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 9a2040a..3045a53 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -907,7 +907,7 @@ class Overridable: if page: raise MKUserError("_p_name", _("You already have an element with the ID <b>%s</b>") % page_dict["name"]) - new_page_dict = forms.edit_valuespec(vs, page_dict, validate=validate, focus="_p_title") + new_page_dict = forms.edit_valuespec(vs, page_dict, validate=validate, focus="_p_title", method="POST") if new_page_dict != None: # Take over keys from previous value that are specific to the page type # and not edited here.

8 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016