Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: FIX: "bulk move to" at the top of wato hostlists works again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 846a8b8b4f2f9c0ac59492a8ba59ab6bff204dd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=846a8b8b4f2f9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 09:26:01 2011 +0200 FIX: "bulk move to" at the top of wato hostlists works again --- ChangeLog | 3 +++ web/htdocs/htmllib.py | 8 ++++++-- web/htdocs/js/wato.js | 8 ++++++++ web/htdocs/wato.py | 19 +++++++++++++------ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4192dfb..97eda78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * Added display_option "w" to disable limit messages and livestatus errors in views * Service Perfdata Sorters are sorting correctly now + WATO: + * FIX: "bulk move to" at the top of wato hostlists works again + 1.1.11i4: Core, Setup, etc.: * FIX: use hostgroups instead of host_groups in Nagios configuration. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 70601a0..db65988 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -362,10 +362,14 @@ class html: sorted.sort(lambda a,b: cmp(a[1].lower(), b[1].lower())) html.select(self, varname, sorted, deflt, onchange) - def select(self, varname, options, deflt="", onchange=None): + def select(self, varname, options, deflt="", onchange=None, attrs = {}): current = self.var(varname, deflt) onchange_code = onchange and " onchange=\"%s\"" % (onchange) or "" - self.write("<select%s name=\"%s\" id=\"%s\" size=\"1\">\n" % (onchange_code, varname, varname)) + + attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) + + self.write("<select%s name=\"%s\" id=\"%s\" size=\"1\"%s>\n" % + (onchange_code, varname, varname, attributes)) for value, text in options: if value == None: value = "" sel = value == current and " selected" or "" diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 68e7e40..649c50c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -290,3 +290,11 @@ function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_s setTimeout(function() { progress_scheduler(mode, url_prefix, timeout, [], "", ""); }, timeout); } +function update_bulk_moveto(val) { + var fields = getElementsByClass('bulk_moveto'); + for(var i = 0; i < fields.length; i++) + for(var a = 0; a < fields[i].options.length; a++) + if(fields[i].options[a].value == val) + fields[i].options[a].selected = true; + fields = null; +} diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9815934..f14a742 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -640,7 +640,7 @@ def mode_file(phase): html.write("</tr>\n") odd = "odd" - def bulk_actions(at_least_one_imported): + def bulk_actions(at_least_one_imported, top = False): # bulk actions html.write('<tr class="data %s0">' % odd) html.write("<td colspan=%d>" % colspan) @@ -650,7 +650,7 @@ def mode_file(phase): html.button("_bulk_edit", _("Edit")) html.button("_bulk_cleanup", _("Cleanup")) html.button("_bulk_inventory", _("Inventory")) - host_move_combo(None) + host_move_combo(None, top) if at_least_one_imported: html.button("_bulk_movetotarget", _("Move to Target Folders")) html.write("</td></tr>\n") @@ -678,7 +678,7 @@ def mode_file(phase): # Add the bulk action buttons also to the top of the table when this # list shows more than 10 rows if more_than_ten_items: - bulk_actions(at_least_one_imported) + bulk_actions(at_least_one_imported, top = True) for hostname in hostnames: if search_text and (search_text.lower() not in hostname.lower()): @@ -2527,7 +2527,7 @@ def wato_html_head(title): html.header(title) html.write("<div class=wato>\n") -def host_move_combo(host = None): +def host_move_combo(host = None, top = False): other_files = [] for path, afile in g_files.items(): if config.role in afile["roles"] and afile != g_file: @@ -2535,10 +2535,17 @@ def host_move_combo(host = None): other_files.append((os_path, "%s (%s)" % (afile["title"], os_path))) if len(other_files) > 0: - selections = [("", _("(select file)"))] + other_files + selections = [("", _("(select file)"))] + other_files if host == None: html.button("_bulk_move", _("Move To:")) - html.select("bulk_moveto", selections, "") + field_name = 'bulk_moveto' + if top: + field_name = '_top_bulk_moveto' + if html.has_var('bulk_moveto'): + html.javascript('update_bulk_moveto("%s")' % html.var('bulk_moveto', '')) + html.select(field_name, selections, "", + onchange = "update_bulk_moveto(this.value)", + attrs = {'class': 'bulk_moveto'}) else: html.hidden_field("host", host) uri = html.makeuri([("host", host), ("_transid", html.current_transid() )])

12 years, 12 months

Check_MK Git: check_mk: Now really fixed the dashboard display options

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 94dbc1e2f133acee8d374149ea148b445986a74b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94dbc1e2f133ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 09:02:15 2011 +0200 Now really fixed the dashboard display options --- web/htdocs/dashboard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 8394b75..dbf649c 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -182,7 +182,7 @@ def render_dashlet(nr, dashlet, filename): # The method "view" is a shortcut for "iframe" with a certain url if "view" in dashlet: - dashlet["iframe"] = "view.py?view_name=%s&display_options=HtbfceozRSIXdmLw&_body_class=dashlet" % dashlet["view"] + dashlet["iframe"] = "view.py?view_name=%s&display_options=HRSIXL&_body_class=dashlet" % dashlet["view"] # The content is rendered only if it is fixed. In the # other cases the initial (re)-size will paint the content.

12 years, 12 months

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: 1787d17594c20c9925924553eebad6a68efd5f64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1787d17594c20c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 09:26:09 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 12 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: 328800ddacf799c1ea172c0af2022a4c095e403e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=328800ddacf799… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 9 09:17:49 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 12 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7fbb5496e22f5511a671915274a4b88d581da650 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fbb5496e22f55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 9 09:17:46 2011 +0200 Updated bug entries --- .bugs/20 | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/.bugs/20 b/.bugs/20 index 0fea042..40e0af2 100644 --- a/.bugs/20 +++ b/.bugs/20 @@ -4,9 +4,12 @@ Benefit: 2 State: open Cost: 1 Date: 2010-12-21 16:22:55 -Class: feature +Class: bug Ein eigenes Logfile für Livestatus anlegen, sofern das konfiguriert wird (über Modul-Parameter). Dorthin sollen Debugmeldungen und alle Meldungen aus den Threads kommen. Die Startmeldungen sollen trotzdem (zusätlich) ins Nagios-Log. + +Problem ist, dass Nagios und vor allem Icinga abnippeln, wenn ein +Thread die Logfunktion aufruft.

12 years, 12 months

Check_MK Git: check_mk: Fixed dashboard display options

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd59076d46bb4f34d417b79de00f5b34dbe6def0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd59076d46bb4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 08:24:13 2011 +0200 Fixed dashboard display options --- web/htdocs/dashboard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index e155829..8394b75 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -182,7 +182,7 @@ def render_dashlet(nr, dashlet, filename): # The method "view" is a shortcut for "iframe" with a certain url if "view" in dashlet: - dashlet["iframe"] = "view.py?view_name=%s&display_options=SIXHRLw&_body_class=dashlet" % dashlet["view"] + dashlet["iframe"] = "view.py?view_name=%s&display_options=HtbfceozRSIXdmLw&_body_class=dashlet" % dashlet["view"] # The content is rendered only if it is fixed. In the # other cases the initial (re)-size will paint the content.

12 years, 12 months

Check_MK Git: check_mk: Service Perfdata Sorters are sorting correctly now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b807740ecb9d91cb6168b269c411287e12f3148c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b807740ecb9d91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 17:15:06 2011 +0200 Service Perfdata Sorters are sorting correctly now --- ChangeLog | 1 + web/plugins/views/painters.py | 21 +++++++++++++-------- web/plugins/views/sorters.py | 20 ++++++++++---------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7c6aa5..4192dfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * FIX: fix rescheduling of host check * Added some missing i18n strings in general HTML functions * Added display_option "w" to disable limit messages and livestatus errors in views + * Service Perfdata Sorters are sorting correctly now 1.1.11i4: Core, Setup, etc.: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index f2df0b8..d1a1e52 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -314,21 +314,26 @@ multisite_painters["svc_perf_data"] = { "paint" : lambda row: (None, row["service_perf_data"]) } -def paint_perfdata_nth_value(row, n): - perfdata = row["service_perf_data"] +def get_perfdata_nth_value(row, n, remove_unit = False): + perfdata = row.get("service_perf_data") + if not perfdata: + return '' try: parts = perfdata.split() if len(parts) <= n: - return "", "" # too few values in perfdata + return "" # too few values in perfdata varname, rest = parts[n].split("=") number = rest.split(';')[0] - # Remove unit. Why should we? - # while len(number) > 0 and not number[-1].isdigit(): - # number = number[:-1] - return "", number + # Remove unit. Why should we? In case of sorter (numeric) + if remove_unit: + while len(number) > 0 and not number[-1].isdigit(): + number = number[:-1] + return number except Exception, e: - return "", str(e) + return str(e) +def paint_perfdata_nth_value(row, n): + return "", get_perfdata_nth_value(row, n) multisite_painters["svc_perf_val01"] = { "title" : _("Service performance data - value number 1"), diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 16482f3..b8cfae5 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -155,16 +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) + +def cmp_perfdata_nth_value(r1, r2, n): + return cmp(get_perfdata_nth_value(r1, n), get_perfdata_nth_value(r2, n)) + +for n in range(1, 10): + multisite_sorters['svc_perf_val%02d' % n] = { + "title" : _("Service performance data - value number %02d" % n), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp(get_perfdata_nth_value(r1, n - 1), get_perfdata_nth_value(r2, n - 1)) + } # Host declare_1to1_sorter("alias", cmp_simple_string)

12 years, 12 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 06a01ae842893445b2a3d46fbdaf8da28c7411de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a01ae8428934… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 15:00:28 2011 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32af37d..26edad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.12b1: Multisite: * FIX: fix rescheduling of host check + * Added some missing i18n strings in general HTML functions 1.1.11i4: Core, Setup, etc.:

12 years, 12 months

Check_MK Git: check_mk: Added display_option "w" to disable limit messages and livestatus errors in views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7780c66c65fc5212cbb7ba6259e9f1268965ac95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7780c66c65fc52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 15:07:18 2011 +0200 Added display_option "w" to disable limit messages and livestatus errors in views --- ChangeLog | 1 + web/htdocs/dashboard.py | 4 ++-- web/htdocs/views.py | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26edad9..f7c6aa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Multisite: * FIX: fix rescheduling of host check * Added some missing i18n strings in general HTML functions + * Added display_option "w" to disable limit messages and livestatus errors in views 1.1.11i4: Core, Setup, etc.: diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ba91148..e155829 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -182,8 +182,8 @@ def render_dashlet(nr, dashlet, filename): # The method "view" is a shortcut for "iframe" with a certain url if "view" in dashlet: - dashlet["iframe"] = "view.py?view_name=%s&display_options=SIXHRL&_body_class=dashlet" % dashlet["view"] - + dashlet["iframe"] = "view.py?view_name=%s&display_options=SIXHRLw&_body_class=dashlet" % dashlet["view"] + # The content is rendered only if it is fixed. In the # other cases the initial (re)-size will paint the content. if "content" in dashlet: # fixed content diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f7ca622..abf7518 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1067,7 +1067,7 @@ def get_needed_columns(painters): # Display view with real data. This is *the* function everying # is about. def show_view(view, show_heading = False, show_buttons = True, show_footer = True): - all_display_options = "HTBFCEOZRSIXDML" + all_display_options = "HTBFCEOZRSIXDMLW" # Parse display options and if html.output_format == "html": @@ -1390,8 +1390,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if not has_done_actions: # Limit exceeded? Show warning - html.check_limit(rows, get_limit()) - layout["render"](rows, view, group_painters, painters, num_columns, + if 'W' in display_options: + html.check_limit(rows, get_limit()) + layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes and not html.do_actions()) # Play alarm sounds, if critical events have been displayed @@ -1401,7 +1402,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # In multi site setups error messages of single sites do not block the # output and raise now exception. We simply print error messages here. # In case of the web service we show errors only on single site installations. - if config.show_livestatus_errors and (html.output_format == "html" or not config.is_multisite()): + if config.show_livestatus_errors \ + and 'W' in display_options \ + and (html.output_format == "html" or not config.is_multisite()): for sitename, info in html.live.deadsites.items(): html.show_error("<b>%s - Livestatus error</b><br>%s" % (info["site"]["alias"], info["exception"]))

12 years, 12 months

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: 209ab022729ba65c250ae484a4f4e7a16b31d6a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=209ab022729ba6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 15:00:06 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 12 months

← Newer
1
2
3
4
5
6
7
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011