Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

Check_MK Git: check_mk: Updated bug entries #0868

by Andreas Boesl

Module: check_mk Branch: master Commit: 2af2c964e30ade9a521c8418b47617f998444178 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2af2c964e30ade… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jan 11 12:29:49 2013 +0100 Updated bug entries #0868 --- .bugs/868 | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.bugs/868 b/.bugs/868 index 2dc3f25..7ba73b4 100644 --- a/.bugs/868 +++ b/.bugs/868 @@ -1,10 +1,24 @@ Title: Distributed WATO setup - error message during setting up slaves Component: wato -State: open +Class: bug +State: works4me Date: 2012-10-26 08:38:47 Targetversion: 1.2.2 -Class: bug In current version, when setting up the local site and a slave site in the main site, the main site reports that it is not the "preferred peer" while there is no peer setup. Seems like the naming of the site is somewhat relevant here. + +2013-01-11 12:29:43: changed state open -> works4me +Just tested - works +Creating a site setup: + - add local site + Connection: connect to the local site + URL Prefix: http://localhost/heute + - add slave site + Connection: unixsocket + URL Prefix: http://localhost/sklave + + Set slave site replication method to "slave" + +-> works like a charm

11 years, 5 months

Check_MK Git: check_mk: logwatch: unknown eventlog levels from windows agent treated as warning

by Andreas Boesl

Module: check_mk Branch: master Commit: 761e5d1be60cbfb99394af98604842277c02acf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=761e5d1be60cbf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 14 09:42:32 2013 +0100 logwatch: unknown eventlog levels from windows agent treated as warning --- ChangeLog | 1 + checks/logwatch | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3af5c1c..a7ba39f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * FIX: win_dhcp_pools: removed faulty output on non-german windows 2003 servers with no dhcp server installed (Thanks to Mathias Decker) * Add: fileinfo is now supported by the solaris agent. Thanks to Daniel Roettgermann + * Logwatch: unknown eventlog level ('u') from windows agent treated as warning Multisite: * FIX: Fixed rendering of dashboard globes in opera diff --git a/checks/logwatch b/checks/logwatch index 120e437..0e8fa76 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -90,12 +90,14 @@ def logwatch_state(state): def logwatch_level_name(level): if level == 'O': return 'OK' elif level == 'W': return 'WARN' + elif level == 'u': return 'WARN' # undefined states are treated as warning elif level == 'C': return 'CRIT' else: return 'IGN' def logwatch_level_worst(worst, level): if level == 'O': return max(worst, 0) elif level == 'W': return max(worst, 1) + elif level == 'u': return max(worst, 1) elif level == 'C': return max(worst, 2) else: return worst

11 years, 5 months

Check_MK Git: check_mk: resolved merge conflict: Changelog

by Andreas Boesl

Module: check_mk Branch: master Commit: 064b592450ceb4cfd835dc77c421ea28316a12b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=064b592450ceb4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 14 09:47:22 2013 +0100 resolved merge conflict: Changelog ---

11 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b50aac7ada87a4da44ce479da153dd509affbe6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b50aac7ada87a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 14 09:07:12 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0884

by Mathias Kettner

Module: check_mk Branch: master Commit: 729b8c8e1747ad75e53468b428ab0eebb716dc40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=729b8c8e1747ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 14 09:07:09 2013 +0100 Updated bug entries #0884 --- .bugs/884 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/884 b/.bugs/884 index d32bd5d..0281a5a 100644 --- a/.bugs/884 +++ b/.bugs/884 @@ -2,7 +2,7 @@ Title: Rule editor: selection boxes must not be visible on 'ignore' Component: wato State: open Date: 2013-01-14 09:06:06 -Targetversion: 1.2.3 +Targetversion: 1.2.2 Class: bug In the rule editor in the host tag section when the first selection

11 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0884

by Mathias Kettner

Module: check_mk Branch: master Commit: 8dd4c899e9a0863f62d6d06a38cec5feebd2dd74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dd4c899e9a086… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 14 09:07:00 2013 +0100 Updated bug entries #0884 --- .bugs/884 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/884 b/.bugs/884 new file mode 100644 index 0000000..d32bd5d --- /dev/null +++ b/.bugs/884 @@ -0,0 +1,10 @@ +Title: Rule editor: selection boxes must not be visible on 'ignore' +Component: wato +State: open +Date: 2013-01-14 09:06:06 +Targetversion: 1.2.3 +Class: bug + +In the rule editor in the host tag section when the first selection +box is "ignore", then the second should be hidden, but is visible +when entering the dialog.

11 years, 5 months

Check_MK Git: check_mk: Added logo for ios

by Mathias Kettner

Module: check_mk Branch: master Commit: f6e512d55722b8bd4fe31420deb8b843cd8589c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6e512d55722b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 11 16:44:23 2013 +0100 Added logo for ios --- web/htdocs/images/ios_logo.png | Bin 0 -> 4456 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/ios_logo.png b/web/htdocs/images/ios_logo.png new file mode 100644 index 0000000..1cd952b Binary files /dev/null and b/web/htdocs/images/ios_logo.png differ

11 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: eebf70008944cc7324ef6f52e98861bcd889c65d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eebf70008944cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 11 14:51:48 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Role matrix: add back button, change icon

by Mathias Kettner

Module: check_mk Branch: master Commit: d652baed82576f8a4b99b2e6b9f551b9ac75a5fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d652baed82576f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 11 14:51:46 2013 +0100 Role matrix: add back button, change icon --- web/htdocs/images/icon_matrix.png | Bin 4708 -> 2372 bytes web/htdocs/wato.py | 1 + 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_matrix.png b/web/htdocs/images/icon_matrix.png index 40f1169..c0f2b0f 100644 Binary files a/web/htdocs/images/icon_matrix.png and b/web/htdocs/images/icon_matrix.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7e823c3..5813f9b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8547,6 +8547,7 @@ def mode_role_matrix(phase): elif phase == "buttons": global_buttons() + html.context_button(_("Back"), make_link([("mode", "roles")]), "back") return elif phase == "action":

11 years, 5 months

Check_MK Git: check_mk: Fixed some permission and page reload related handling

by Lars Michelsen

Module: check_mk Branch: master Commit: c326aa4efbe31461dcc4a0a84e8d9b887a0b2594 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c326aa4efbe314… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 11 13:47:07 2013 +0100 Fixed some permission and page reload related handling --- web/htdocs/views.py | 59 +++++++++++++---------------------------- web/plugins/views/layouts.py | 5 ++- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e14ad40..c4b7774 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1139,7 +1139,8 @@ def prepare_display_options(): display_options = html.var("_display_options", "") display_options = apply_display_option_defaults(display_options) html.display_options = display_options - html.title_display_options = display_options + # Dont do this!! This garbles up the title links after a reload. + #html.title_display_options = display_options # But there is one special case: The sorter links! These links need to know # about the provided display_option parameter. The links could use @@ -1355,9 +1356,16 @@ def render_view(view, rows, datasource, group_painters, painters, # permissions or datasources without commands, the form is not rendered command_form = should_show_command_form(display_options, datasource) + # Is the layout able to display checkboxes? + can_display_checkboxes = layout.get('checkboxes', False) + if show_buttons: show_context_links(view, hide_filters, show_filters, display_options, - painter_options, row_count > 0 and command_form, layout.get('checkboxes', False)) + painter_options, + # Take into account: permissions, display_options + row_count > 0 and command_form, + # Take into account: layout capabilities + can_display_checkboxes) # User errors in filters html.show_user_errors() @@ -1387,7 +1395,7 @@ def render_view(view, rows, datasource, group_painters, painters, elif 'C' in display_options: # (*not* display open, if checkboxes are currently shown) show_command_form(False, datasource) - + # Also execute commands in cases without command form (needed for Python- # web service e.g. for NagStaMon) elif row_count > 0 and config.may("general.act") \ @@ -1420,7 +1428,11 @@ def render_view(view, rows, datasource, group_painters, painters, # The number of rows might have changed to enable/disable actions and checkboxes if show_buttons: - update_context_links(row_count > 0, layout.get('checkboxes', False)) + update_context_links( + # don't take display_options into account here ('c' is set during reload) + row_count > 0 and should_show_command_form('C', datasource), + can_display_checkboxes + ) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): @@ -1460,39 +1472,6 @@ def view_options(viewname): v = vo.get(viewname, {}) must_save = False - # NEW IMPLEMENTION: Options for columns, refresh and - # checkboxes are switched via JS/AJAX, no longer via - # the URL. - # # Refresh rate - # if config.may("general.view_option_refresh"): - # if html.has_var("refresh"): - # try: - # v["refresh"] = int(html.var("refresh")) - # except: - # v["refresh"] = None - # must_save = True - # elif "refresh" in v: - # del v["refresh"] - - # # Number of columns in layout - # if config.may("general.view_option_columns"): - # if html.has_var("num_columns"): - # try: - # v["num_columns"] = max(1, int(html.var("num_columns"))) - # except: - # v["num_columns"] = 1 - # must_save = True - # elif "num_columns" in v: - # del v["num_columns"] - - # # Show checkboxes for commands - # if config.may("general.act"): - # if html.has_var("show_checkboxes"): - # v["show_checkboxes"] = html.var("show_checkboxes", "") != "" - # must_save = True - # elif "show_checkboxes" in v: - # del v["show_checkboxes"] - if config.may("general.painter_options"): for on, opt in multisite_painter_options.items(): if html.has_var(on): @@ -1754,9 +1733,9 @@ def show_context_links(thisview, active_filters, show_filters, display_options, html.end_context_buttons() -def update_context_links(enable_commands, show_checkboxes): - html.javascript("update_togglebutton('commands', %d);" % enable_commands) - html.javascript("update_togglebutton('checkbox', %d);" % (enable_commands and show_checkboxes, )) +def update_context_links(enable_command_toggle, enable_checkbox_toggle): + html.javascript("update_togglebutton('commands', %d);" % enable_command_toggle) + html.javascript("update_togglebutton('checkbox', %d);" % (enable_command_toggle and enable_checkbox_toggle, )) # Collect all views that share a context with thisview. For example # if a view has an active filter variable specifying a host, then diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index ff397fb..0345739 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -34,8 +34,9 @@ def init_rowselect(view): # In views do not use the persisted selection on initial rendering # But use it when: # a) rendering views for page reloads - # b) some form has been submitted - if 'U' in html.display_options and not html.form_submitted(): + # b) the view is being sorted + # c) some form has been submitted + if 'U' in html.display_options and not html.has_var('sort') and not html.form_submitted(): weblib.set_rowselection('view-' + view['name'], []) selected = [] # initial rendering else:

11 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013