Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Revert change in Makefile.am, that broke compilation of livecheck

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 58355a7ba0828d8abcc812fcec2f33509649de0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58355a7ba0828d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 5 10:11:29 2012 +0200 Revert change in Makefile.am, that broke compilation of livecheck --- livestatus/src/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index d062570..710c605 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -28,7 +28,9 @@ unixcat_LDADD = -lpthread livecheck_SOURCES = livecheck.c strutil.cc check_icmp.c -pkglib_LIBRARIES = livestatus.so livecheck +pkglib_LIBRARIES = livestatus.so +pkglib_PROGRAMS = livecheck + livestatus_so_SOURCES = \ AndingFilter.cc ClientQueue.cc Column.cc ColumnsColumn.cc CustomVarsExplicitColumn.cc \ ContactsColumn.cc CustomVarsColumn.cc CustomVarsFilter.cc DoubleColumn.cc \

11 years, 11 months

Check_MK Git: check_mk: WATO: WATO folder filter no longer available on single host views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f09991ba54e2cb715c386fb2aca33167525a9a87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f09991ba54e2cb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 17:40:08 2012 +0200 WATO: WATO folder filter no longer available on single host views Fixed: Wato filter no longer available when config.wato_enabled == False --- ChangeLog | 2 ++ web/htdocs/views.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 124aa05..ff32f6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ * FIX: Speed-o-meter: Fixed calculation of Check_MK passive check invervals * Removed focus of "Full name" attribute on editing a contact * Quicksearch: Convert search text to regex when accessing livestatus + * FIX: WATO Folder filter not available when WATO disabled + * WATO Folder Filter no longer available in single host views BI: * Added missing localizations diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 92a73ca..7e7c505 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1182,8 +1182,8 @@ def show_view(view, show_heading = False, show_buttons = True, # add ubiquitary_filters that are possible for this datasource for fn in ubiquitary_filters: - # Disable 'filename' filter, if WATO is disabled - if fn == "filename" and not config.wato_enabled: + # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view + if fn == "wato_folder" and (not config.wato_enabled or "host" in view["hide_filters"]): continue filter = multisite_filters[fn] if not filter.info or filter.info in datasource["infos"]: @@ -1577,8 +1577,8 @@ def view_title(view): title = view["title"] + " " + ", ".join(extra_titles) for fn in ubiquitary_filters: - # Disable 'filename' filter, if WATO is disabled - if fn == "filename" and not config.wato_enabled: + # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view + if fn == "wato_folder" and (not config.wato_enabled or "host" in view["hide_filters"]): continue filt = multisite_filters[fn] heading = filt.heading_info(tablename)

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0624

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ef610e0a29c9c4eca4f6336712bd6637dcb6bf3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ef610e0a29c9c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 17:41:42 2012 +0200 Updated bug entries #0624 --- .bugs/624 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/624 b/.bugs/624 index 6ee7ab9..af5c285 100644 --- a/.bugs/624 +++ b/.bugs/624 @@ -1,8 +1,13 @@ Title: WATO Folder Filter wird auch bei single host views angezeigt Component: multisite -State: open +Class: nastiness +State: done Date: 2012-01-20 15:54:20 Targetversion: future -Class: nastiness Der Filter ist in solchen Ansichten eigentlich sinnlos. + +2012-10-04 17:41:39: changed state open -> done +Fixed Bug: Filter no longer available when WATO is deactivated +Filter no longer available on single host views +( "host" in view["hide_filters"] )

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0742

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f36ef349ebdc68bcc4bcd142c1f1537555d2bf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f36ef349ebdc6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 16:35:02 2012 +0200 Updated bug entries #0742 --- .bugs/742 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/742 b/.bugs/742 index 2185147..e2af635 100644 --- a/.bugs/742 +++ b/.bugs/742 @@ -1,9 +1,12 @@ Title: Livestatus Error when searching with wildcards in multisite Component: multisite -State: open +Class: nastiness +State: done Date: 2012-09-24 10:51:47 Targetversion: future -Class: nastiness A Search with wildcards in the quicksearch, leads to: Livestatus problem: Unhandled exception: 400: error in Filter header: invalid regular expression '*omd*' + +2012-10-04 16:34:59: changed state open -> done +The quicksearch text is converted to regex ( * -> .* ) when using livestatus

11 years, 11 months

Check_MK Git: check_mk: Multisite: Convert qicksearch text to regex when accessing livestatus

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fb93e7138d05f017455e569aaa5b8cadbbb5f91b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb93e7138d05f0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 16:33:36 2012 +0200 Multisite: Convert qicksearch text to regex when accessing livestatus --- ChangeLog | 1 + web/htdocs/js/search.js | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7f0fbd..124aa05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * FIX: Fixed login/login confusions with index page caching * FIX: Speed-o-meter: Fixed calculation of Check_MK passive check invervals * Removed focus of "Full name" attribute on editing a contact + * Quicksearch: Convert search text to regex when accessing livestatus BI: * Added missing localizations diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index eca8609..d01ef6a 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -303,6 +303,7 @@ function mkSearchGetSearchObjects(objType) { } function mkSearchGetUrl(objType, objName, objSite, numMatches) { + objName = objName.replace(/\*/g,"\.\*"); if (numMatches == null) numMatches = 0;

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0574

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1d9c42968da640bb0b5edd5506d932801072223 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1d9c42968da64… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 16:26:53 2012 +0200 Updated bug entries #0574 --- .bugs/574 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/574 b/.bugs/574 index 8485fed..3e0fe8e 100644 --- a/.bugs/574 +++ b/.bugs/574 @@ -1,10 +1,13 @@ Title: Usability: Focus handling in User & Contacts: Edit User Component: wato -State: open +Class: feature +State: done Date: 2012-01-09 15:32:35 Targetversion: 1.2.0 -Class: feature If you call the edit dialog it will put the focus on the user name field and highlight the whole text. This is great when initially adding the user but causes unwanted overwriting of the user name when you're just updating it. If called in edit mode, don't set focus. + +2012-10-04 16:26:44: changed state open -> done +Full name is no longer focused when editing user

11 years, 11 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b44894ef2a5fa28553a39c0e1d641560ff672044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b44894ef2a5fa2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 4 16:25:42 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0145, #0090, #0365

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 94d12f3eb04842f2612102ab618bd939108706b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94d12f3eb04842… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 4 16:25:32 2012 +0200 Updated bug entries #0145, #0090, #0365 --- .bugs/145 | 8 ++++++-- .bugs/365 | 8 ++++++-- .bugs/90 | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.bugs/145 b/.bugs/145 index e0b6f0e..20960e2 100644 --- a/.bugs/145 +++ b/.bugs/145 @@ -1,8 +1,12 @@ Title: import files in conf.d/*.mk in sorted order Component: core -State: open -Date: 2011-02-16 17:12:01 Class: feature +State: done +Date: 2011-02-16 17:12:01 +Targetversion: future Simple do a sort() of the globbed files. That way users have a way to force a certain order of execution. And write that into the documentation. + +2012-10-04 16:25:08: changed state open -> done +Has been implemented a long time ago... diff --git a/.bugs/365 b/.bugs/365 index 2dbb5db..010710e 100644 --- a/.bugs/365 +++ b/.bugs/365 @@ -1,8 +1,12 @@ Title: Windows agent: make sections disableable by config Component: checks -State: open -Date: 2011-09-07 17:35:51 Class: feature +State: done +Date: 2011-09-07 17:35:51 +Targetversion: future It would be nice if the configuration of the windows agent would allow to disable certain sections, e.g. logwatch. + +2012-10-04 16:23:50: changed state open -> done +Has already been implemented. diff --git a/.bugs/90 b/.bugs/90 index a410248..04b26ba 100644 --- a/.bugs/90 +++ b/.bugs/90 @@ -1,8 +1,12 @@ Title: Make topics in views snapin foldable Component: multisite -State: open -Date: 2011-01-08 16:50:52 Class: feature +State: done +Date: 2011-01-08 16:50:52 +Targetversion: future Make the topics foldable like in the custom links snapin. The folding state should be persistet on a per user basis. + +2012-10-04 16:11:33: changed state open -> done +Is already implemented

11 years, 11 months

Check_MK Git: check_mk: BI: processing of (!!), (!) markers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b2652c797d37bf0e6a9221553abb2266833881e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2652c797d37bf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 15:01:06 2012 +0200 BI: processing of (!!), (!) markers --- web/plugins/views/bi.py | 2 +- web/plugins/views/painters.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 65565b2..7d2128b 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -262,7 +262,7 @@ def aggr_render_node(tree, title, mousecode, show_host): else: h += title - output = effective_state["output"] + output = format_plugin_output(effective_state["output"]) if output: output = "&diams;" + output else: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 25ab292..93038d7 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -321,11 +321,11 @@ warn_marker = 'WARN' crit_marker = 'CRIT' unknown_marker = 'UNKN' -def format_plugin_output(row, output): +def format_plugin_output(output, row = None): output = output.replace("(!)", warn_marker) \ .replace("(!!)", crit_marker) \ .replace("(?)", unknown_marker) - if "[running on" in output: + if row and "[running on" in output: a = output.index("[running on") e = output.index("]", a) hosts = output[a+12:e].replace(" ","").split(",") @@ -339,7 +339,7 @@ multisite_painters["svc_plugin_output"] = { "title" : _("Output of check plugin"), "short" : _("Status detail"), "columns" : ["service_plugin_output"], - "paint" : lambda row: ("", format_plugin_output(row, row["service_plugin_output"])), + "paint" : lambda row: ("", format_plugin_output(row["service_plugin_output"], row)), "sorter" : 'svcoutput', } multisite_painters["svc_long_plugin_output"] = { @@ -1573,7 +1573,7 @@ multisite_painters["log_message"] = { def paint_log_plugin_output(row): output = row["log_plugin_output"] if output: - return "", format_plugin_output(row, output) + return "", format_plugin_output(output, row) else: log_type = row["log_type"] lst = row["log_state_type"]

11 years, 11 months

Check_MK Git: check_mk: WATO: Users & Contacts:

by git＠mathias-kettner.de

Case-insensitive sorting of 'Full name' column User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 34d89c9c1a829f664d110062464aa743fae7d572 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34d89c9c1a829f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 15:41:40 2012 +0200 WATO: Users & Contacts: Case-insensitive sorting of 'Full name' column --- web/htdocs/wato.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aeff888..3539aaf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7525,7 +7525,7 @@ def mode_users(phase): odd = "even" entries = users.items() - entries.sort(cmp = lambda a, b: cmp(a[1].get("alias"), b[1].get("alias"))) + entries.sort(cmp = lambda a, b: cmp(a[1].get("alias").lower(), b[1].get("alias").lower())) for id, user in entries: odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) @@ -8035,12 +8035,14 @@ def load_users(): if id in result: result[id]["password"] = password result[id]["locked"] = locked + result[id]["alias"] = "" else: # Create entry if this is an admin user new_user = { "roles" : config.roles_of_user(id), "password" : password, - "locked" : False + "locked" : False, + "alias" : "" } result[id] = new_user # Other unknown entries will silently be dropped. Sorry...

11 years, 11 months

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012