Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

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

by Mathias Kettner

Module: check_mk Branch: master Commit: cab2ee56fd32c93a25f720155cfdec673b8b8bf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cab2ee56fd32c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 11:44:37 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a00948e1943637a0c5db3495673eff10bedccc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a00948e194363… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 11:27:04 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Custom user attributes can now be managed using WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 64d5f8d798e5a7c7016fd379778759708cbeaa28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d5f8d798e5a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 11:26:45 2013 +0200 Custom user attributes can now be managed using WATO --- ChangeLog | 5 +- web/htdocs/images/icon_custom_attr.png | Bin 0 -> 3395 bytes web/htdocs/wato.py | 245 +++++++++++++++++++++++++++++++- web/plugins/config/wato.py | 1 + 4 files changed, 245 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=64d5f8d798…

11 years, 3 months

Check_MK Git: check_mk: Change notify --keepalive protocol

by Mathias Kettner

Module: check_mk Branch: master Commit: 6fc59ed1c26e77dff6ca07954b879a152a940c25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fc59ed1c26e77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 10:08:40 2013 +0200 Change notify --keepalive protocol --- modules/notify.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 848c1c4..9102a46 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -349,8 +349,13 @@ def notify_keepalive(): g_notify_readahead_buffer = "" config_timestamp = notify_config_timestamp() + # Send signal that we are ready to receive the next notification + sys.stdout.write("*") + sys.stdout.flush() + while True: try: + # If the configuration has changed, we do a restart. But we do # this check just before the next notification arrives. We must # *not* read data from stdin, just peek! On the other hand we @@ -375,7 +380,15 @@ def notify_keepalive(): if g_notify_readahead_buffer.startswith('\n\n'): sys.exit(0) while '\n\n' in g_notify_readahead_buffer: - notify_notify() + try: + notify_notify() + except Exception, e: + if opt_debug: + raise + notify_log("ERROR %s\n%s" % (e, format_exception())) + sys.stdout.write("*") + sys.stdout.flush() + except Exception, e: if opt_debug: raise

11 years, 3 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e72b53399da7463aae29adc79dc866d5bb98364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e72b53399da74… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 09:38:58 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: fixed error in tablesearch

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ef6050dbb1bbae2444a013db582283537a1e79c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef6050dbb1bba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 08:45:39 2013 +0200 fixed error in tablesearch --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 9c27e23..5682918 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -140,7 +140,7 @@ def end(): del table_opts['search'] # persist # Search is always lower case -> case insensitive - search_term = html.var('_%s_search' % table_id, table_opts.get('search')).lower() + search_term = html.var('_%s_search' % table_id, table_opts.get('search', '')).lower() if search_term: html.set_var('_%s_search' % table_id, search_term) table_opts['search'] = search_term # persist

11 years, 3 months

Check_MK Git: check_mk: FIX: avoid exception when called first time and first page ist host tags

by Mathias Kettner

Module: check_mk Branch: master Commit: 437e6c72d6e12e9efc2d4a3093c4a12be34f1531 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=437e6c72d6e12e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 09:36:50 2013 +0200 FIX: avoid exception when called first time and first page ist host tags --- ChangeLog | 1 + web/htdocs/wato.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 48a2781..b41fc78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -244,6 +244,7 @@ WATO: * FIX: fix layout of Auxiliary tags table + * FIX: avoid exception when called first time and first page ist host tags 1.2.2p2: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d67f695..0cd5838 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11733,6 +11733,10 @@ def create_sample_config(): save_rulesets(g_root_folder, rulesets) + # Make sure the host tag attributes are immediately declared! + config.wato_host_tags = wato_host_tags + config.wato_aux_tags = wato_aux_tags + #. # .-Pattern Editor-------------------------------------------------------. # | ____ _ _ _____ _ _ _ |

11 years, 3 months

Check_MK Git: check_mk: Fixed *completely* broken Multisite after restructuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 9f58dddc3e6f2a2b0e02df78b7f7a2bfa78c2b94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f58dddc3e6f2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 09:26:28 2013 +0200 Fixed *completely* broken Multisite after restructuration --- web/htdocs/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 97e6c4b..710f620 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -272,10 +272,10 @@ def handler(req, profiling = True): # Redirect to the login-dialog with the current url as original target # Never render the login form directly when accessing urls like "index.py" # or "dashboard.py". This results in strange problems. - if req.myfile != 'login': + if html.myfile != 'login': html.set_http_header('Location', defaults.url_prefix + 'check_mk/login.py?_origtarget=%s' % - htmllib.urlencode(html.makeuri([]))) + html.urlencode(html.makeuri([]))) raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY # Initialize the i18n for the login dialog. This might be overridden

11 years, 3 months

Check_MK Git: check_mk: table search: Fixed focusing the search field on rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a6f5315dd94bbbe32c8648545dd2e05e53036a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a6f5315dd94bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 08:39:06 2013 +0200 table search: Fixed focusing the search field on rendering --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 07793ef..9c27e23 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -199,7 +199,7 @@ def end(): html.text_input("_%s_search" % table_id) html.button("_%s_submit" % table_id, _("Search")) html.button("_%s_reset" % table_id, _("Reset")) - html.set_focus("search") + html.set_focus("_%s_search" % table_id) html.write("</div>\n") html.hidden_fields()

11 years, 3 months

Check_MK Git: check_mk: Made table search case insensitive

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d59e9fa5d255a8c9176bdafaaed955bec81091f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d59e9fa5d255a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 08:37:39 2013 +0200 Made table search case insensitive --- web/htdocs/table.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 2fc9cea..07793ef 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -139,14 +139,15 @@ def end(): if 'search' in table_opts: del table_opts['search'] # persist - search_term = html.var('_%s_search' % table_id, table_opts.get('search')) + # Search is always lower case -> case insensitive + search_term = html.var('_%s_search' % table_id, table_opts.get('search')).lower() if search_term: html.set_var('_%s_search' % table_id, search_term) table_opts['search'] = search_term # persist filtered_rows = [] for row, css in rows: for cell_content, css_classes in row: - if search_term in cell_content: + if search_term in cell_content.lower(): filtered_rows.append((row, css)) break # skip other cells when matched rows = filtered_rows

11 years, 3 months

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013