Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Multisite: fix problem with growing list of sorters in try-out mode

by Mathias Kettner

Module: check_mk Branch: master Commit: b58a32823f26ef8dabe5571d1562165c4f3aacc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b58a32823f26ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:37:58 2013 +0200 Multisite: fix problem with growing list of sorters in try-out mode --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9f5d4c6..836f4b3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -723,7 +723,7 @@ def page_edit_view(): allowed = allowed_for_datasource(data, datasourcename) forms.header(title, isopen=False) # make sure, at least 3 selection boxes are free for new columns - while html.has_var("%s%d" % (var_prefix, maxnum - 2)): + while html.var("%s%d" % (var_prefix, maxnum - 2)): maxnum += 1 for n in range(1, maxnum + 1): forms.section(_("%d. Column") % n)

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0884

by Mathias Kettner

Module: check_mk Branch: master Commit: bb8b8eeab4442de00728d03748bbc3c799a2f8f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb8b8eeab4442d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:34:51 2013 +0200 Updated bug entries #0884 --- .bugs/884 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/884 b/.bugs/884 index 3748d1d..bca24cc 100644 --- a/.bugs/884 +++ b/.bugs/884 @@ -1,10 +1,13 @@ Title: EC view recent event history: wrong sorting Component: ec -State: open +Class: bug +State: done Date: 2013-02-12 17:53:17 Targetversion: 1.2.3i2 -Class: bug This might be a bug in Multisite: The sorting is after time and for equal time after the line in the logfile. The latter sorting is ignored - however. + +2013-10-03 11:34:48: changed state open -> done +Was a bug in Multisite that concerned all numeric sorters.

10 years, 11 months

Check_MK Git: check_mk: FIX: fix logic of some numeric sorters

by Mathias Kettner

Module: check_mk Branch: master Commit: 02f006107c4e5347da1c89ec06b029c97bfa712e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02f006107c4e53… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:33:27 2013 +0200 FIX: fix logic of some numeric sorters --- ChangeLog | 1 + web/htdocs/views.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1f5e02..5624601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -429,6 +429,7 @@ * FIX: Folder Tree Snapin: make folder filter also work for remote folders that do not exist locally * FIX: correctly display sub-minute check/retry intervals + * FIX: fix logic of some numeric sorters WATO: * FIX: fix layout of Auxiliary tags table diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5b69b1b..9f5d4c6 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2673,8 +2673,11 @@ def declare_1to1_sorter(painter_name, func, col_num = 0, reverse = False): multisite_sorters[painter_name] = { "title" : multisite_painters[painter_name]['title'], "columns" : multisite_painters[painter_name]['columns'], - "cmp" : lambda r1, r2: func(multisite_painters[painter_name]['columns'][col_num], - reverse and r1 or r2, - reverse and r2 or r1) } + if not reverse: + multisite_sorters[painter_name]["cmp"] = \ + lambda r1, r2: func(multisite_painters[painter_name]['columns'][col_num], r1, r2) + else: + multisite_sorters[painter_name]["cmp"] = \ + lambda r1, r2: func(multisite_painters[painter_name]['columns'][col_num], r2, r1) return painter_name

10 years, 11 months

Check_MK Git: check_mk: Fix sorting of several EC history views

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a49d5f0a66c14a854b579f139e997eb7f6206d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a49d5f0a66c14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:32:44 2013 +0200 Fix sorting of several EC history views --- mkeventd/web/plugins/views/mkeventd.py | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 465a324..046c62d 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -755,29 +755,29 @@ if mkeventd_enabled: return cmp(a, b) - declare_1to1_sorter("event_id", cmp_simple_number) - declare_1to1_sorter("event_count", cmp_simple_number) - declare_1to1_sorter("event_text", cmp_simple_string) - declare_1to1_sorter("event_first", cmp_simple_number) - declare_1to1_sorter("event_last", cmp_simple_number) - declare_1to1_sorter("event_comment", cmp_simple_string) - declare_1to1_sorter("event_sl", cmp_simple_number) - declare_1to1_sorter("event_host", cmp_simple_string) - declare_1to1_sorter("event_contact", cmp_simple_string) + declare_1to1_sorter("event_id", cmp_simple_number) + declare_1to1_sorter("event_count", cmp_simple_number) + declare_1to1_sorter("event_text", cmp_simple_string) + declare_1to1_sorter("event_first", cmp_simple_number) + declare_1to1_sorter("event_last", cmp_simple_number) + declare_1to1_sorter("event_comment", cmp_simple_string) + declare_1to1_sorter("event_sl", cmp_simple_number) + declare_1to1_sorter("event_host", cmp_simple_string) + declare_1to1_sorter("event_contact", cmp_simple_string) declare_1to1_sorter("event_application", cmp_simple_string) - declare_1to1_sorter("event_pid", cmp_simple_number) - declare_1to1_sorter("event_priority", cmp_simple_number) - declare_1to1_sorter("event_facility", cmp_simple_number) # maybe convert to text - declare_1to1_sorter("event_rule_id", cmp_simple_string) - declare_1to1_sorter("event_state", cmp_simple_state) - declare_1to1_sorter("event_phase", cmp_simple_string) - declare_1to1_sorter("event_owner", cmp_simple_string) - - declare_1to1_sorter("history_line", cmp_simple_number) - declare_1to1_sorter("history_time", cmp_simple_number) - declare_1to1_sorter("history_what", cmp_simple_string) - declare_1to1_sorter("history_who", cmp_simple_string) - declare_1to1_sorter("history_addinfo", cmp_simple_string) + declare_1to1_sorter("event_pid", cmp_simple_number) + declare_1to1_sorter("event_priority", cmp_simple_number) + declare_1to1_sorter("event_facility", cmp_simple_number) # maybe convert to text + declare_1to1_sorter("event_rule_id", cmp_simple_string) + declare_1to1_sorter("event_state", cmp_simple_state) + declare_1to1_sorter("event_phase", cmp_simple_string) + declare_1to1_sorter("event_owner", cmp_simple_string) + + declare_1to1_sorter("history_line", cmp_simple_number) + declare_1to1_sorter("history_time", cmp_simple_number) + declare_1to1_sorter("history_what", cmp_simple_string) + declare_1to1_sorter("history_who", cmp_simple_string) + declare_1to1_sorter("history_addinfo", cmp_simple_string) #. # .--Views---------------------------------------------------------------. @@ -1024,7 +1024,7 @@ if mkeventd_enabled: ('history_time_from_range', '86400'), ], 'sorters': [ - ('history_time', False), + ('history_time', True), ('history_line', True), ], }) @@ -1098,7 +1098,7 @@ if mkeventd_enabled: ('event_count', None, ''), ], 'sorters': [ - ('history_time', False), + ('history_time', True), ('history_line', True), ], }) @@ -1153,7 +1153,7 @@ if mkeventd_enabled: ('event_count', None, ''), ], 'sorters': [ - ('history_time', False), + ('history_time', True), ('history_line', True), ], })

10 years, 11 months

Check_MK Git: check_mk: View editor: hide table of views during deletion confirmation

by Mathias Kettner

Module: check_mk Branch: master Commit: 40fced44929f8b70ba3f31f01e6ebe95433f9621 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40fced44929f8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:10:34 2013 +0200 View editor: hide table of views during deletion confirmation --- web/htdocs/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index dacbdd2..5b69b1b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -361,10 +361,13 @@ def page_edit_views(msg=None): delname = html.var("_delete") if delname: deltitle = html.multisite_views[(config.user_id, delname)]['title'] - if html.confirm(_("Please confirm the deletion of the view \"%s\".") % deltitle): + c = html.confirm(_("Please confirm the deletion of the view \"%s\".") % deltitle) + if c: del html.multisite_views[(config.user_id, delname)] save_views(config.user_id) html.reload_sidebar() + elif c == False: + return if html.var('mode') == 'create': datasource = html.var('datasource')

10 years, 11 months

Check_MK Git: check_mk: Multisite view editor: enlarge input field with view name

by Mathias Kettner

Module: check_mk Branch: master Commit: 51a0a06da07fd0791543ac62784801b579d18890 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51a0a06da07fd0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:04:49 2013 +0200 Multisite view editor: enlarge input field with view name --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6f9bfc3..dacbdd2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -590,7 +590,7 @@ def page_edit_view(): forms.header(_("Basic Settings")) forms.section(_("View Name")) - html.text_input("view_name", size=12) + html.text_input("view_name", size=24) html.help(_("The view name will be used in URLs that point to a view, e.g. " "<tt>view.py?view_name=<b>myview</b></tt>. It will also be used " "internally for identifying a view. You can create several views "

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1050

by Mathias Kettner

Module: check_mk Branch: master Commit: 90beff2f16b99ad3e31080b86cdaad0edf188c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90beff2f16b99a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:01:40 2013 +0200 Updated bug entries #1050 --- .bugs/1050 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1050 b/.bugs/1050 index 8967bb2..8a30bf0 100644 --- a/.bugs/1050 +++ b/.bugs/1050 @@ -1,11 +1,14 @@ Title: Event Console check does not find events anymore when matching is done by hostname Component: checks -State: open +Class: bug +State: done Date: 2013-09-13 11:09:44 Targetversion: 1.2.3i2 -Class: bug version is 2013.09.09 Event Console check does not find events anymore when matching is done by hostname if matching via IP is configured, everything works root problem seems to be: eventconsole displays hostname in all lower case, uses internally mixed Upper/lower case instead + +2013-10-03 11:01:38: changed state open -> done +check_mkevents no always uses case insensitive host name matching.

10 years, 11 months

Check_MK Git: check_mk: FIX: check_mkevents now uses case insensitive host name matching

by Mathias Kettner

Module: check_mk Branch: master Commit: 2fd3d927737af7078294d270d9e0ac8e85e63ec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fd3d927737af7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 11:00:45 2013 +0200 FIX: check_mkevents now uses case insensitive host name matching --- ChangeLog | 1 + mkeventd/lib/check_mkevents | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e62fb4..c1f5e02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -444,6 +444,7 @@ Event Console: * FIX: apply rewriting of application/hostname also when cancelling events + * FIX: check_mkevents now uses case insensitive host name matching 1.2.2p2: Core: diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 7bf0ee4..0863273 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -71,7 +71,7 @@ except: sys.exit(3) q = "GET events\n" \ - "Filter: event_host = %s\n" % host_name + "Filter: event_host =~ %s\n" % host_name if application: q += "Filter: event_application ~~ %s\n" % application

10 years, 11 months

Check_MK Git: check_mk: Fixed .f12 helper

by Mathias Kettner

Module: check_mk Branch: master Commit: 57ca11f8c830522fdcaded5192e41a2e399aa2ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57ca11f8c83052… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 10:58:39 2013 +0200 Fixed .f12 helper --- mkeventd/web/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/.f12 b/mkeventd/web/.f12 index 65cd700..35b4bf1 100644 --- a/mkeventd/web/.f12 +++ b/mkeventd/web/.f12 @@ -1,5 +1,5 @@ #!/bin/bash -SITE=${SITE:-$(cat ../../.site)} +SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} C=$(sudo cp --preserve=mode -rv * /omd/sites/$SITE/share/check_mk/web/ | wc -l) #C=$(sudo cp --preserve=mode -rv htdocs/*.{css,py} /omd/versions/default/share/check_mk/web/htdocs/ | wc -l)

10 years, 11 months

Check_MK Git: check_mk: Better error message when check_mkevents called out of OMD site

by Mathias Kettner

Module: check_mk Branch: master Commit: 4974ede0b0161966039bd3ce7ff40fc8d78e7bfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4974ede0b01619… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 3 10:50:35 2013 +0200 Better error message when check_mkevents called out of OMD site --- mkeventd/lib/check_mkevents | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 1ffa8e1..7bf0ee4 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -2,7 +2,11 @@ import os, socket, sys -socket_path = os.getenv("OMD_ROOT") + "/tmp/run/mkeventd/status" +try: + socket_path = os.getenv("OMD_ROOT") + "/tmp/run/mkeventd/status" +except: + sys.stdout.write("UNKNOWN - OMD_ROOT is not set, no socket path is defined.\n") + sys.exit(3) def query(query, remote_host): try:

10 years, 11 months

← Newer
1
...
32
33
34
35
36
37
38
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013