Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: Updated bug entries #0599

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2bc1dcdce97c9eca6a6fb01289e8ccb80268cc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2bc1dcdce97c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 13 11:03:08 2012 +0100 Updated bug entries #0599 --- .bugs/599 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/599 b/.bugs/599 new file mode 100644 index 0000000..4c14d5c --- /dev/null +++ b/.bugs/599 @@ -0,0 +1,11 @@ +Title: Multisite should wait a couple of secs when live is missing +Component: multisite +State: open +Date: 2012-01-13 11:02:04 +Targetversion: 1.2.0 +Class: todo + +When one users restarts the core and another user is in +Multisite, he gets an error message that live is missing. +The Livestatus API should wait up to "connect_timeout" +seconds and retry to find the socket instead.

12 years, 8 months

Check_MK Git: check_mk: Fixed encoding problem in wato auth export hook

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: aed3ce9144b391943bfed7440a77f265c0a9919e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aed3ce9144b391… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 10:23:42 2012 +0100 Fixed encoding problem in wato auth export hook --- web/plugins/wato/auth.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index 05ca513..f850df2 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -71,8 +71,10 @@ def parse_php(data, lvl = 1): for key, val in data.iteritems(): s += ' ' * lvl + parse_php(key, lvl + 1) + ' => ' + parse_php(val, lvl + 1) + ',\n' s += ' ' * (lvl - 1) + ')' - elif isinstance(data, str) or isinstance(data, unicode): + elif isinstance(data, str): s += '\'%s\'' % data + elif isinstance(data, unicode): + s += '\'%s\'' % data.encode('utf-8') elif isinstance(data, bool): s += data and 'true' or 'false' elif data is None:

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0592

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f8866cc80d35e49d63f47cede6e0e80e2cd39e56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8866cc80d35e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 10:13:22 2012 +0100 Updated bug entries #0592 --- .bugs/592 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/592 b/.bugs/592 new file mode 100644 index 0000000..1f6cfd7 --- /dev/null +++ b/.bugs/592 @@ -0,0 +1,8 @@ +Title: Multisite Debug Parameter an check_mk automation commands übergeben (z.b. wato restart) +Component: wato +State: open +Date: 2012-01-13 10:01:05 +Targetversion: 1.2.0 +Class: feature + +Aktuell muss man den Befehl dann manuell aufrufen um die Exception zu bekommen

12 years, 8 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: 5798c9bada2db86724129baaac730d916bea8d42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5798c9bada2db8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 10:13:25 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 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: cc5dec5a136e9ab7b22abb1e6a75439e33159af7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc5dec5a136e9a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 13 10:11:00 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: WATO: Fix problem with Umlaut in contact alias

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb22f416e7076b857de87849fa73707d69326fe3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb22f416e7076b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 13 10:10:58 2012 +0100 WATO: Fix problem with Umlaut in contact alias --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44bd823..4737916 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * Site filter shows "(local)" in case of non multi-site setup * FIX: Fixed auth problem when following logwatch icon links while using the form based auth + * FIX: Fix problem with Umlaut in contact alias Mobile: * Improved sorting of views in main page diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d7f6122..a8f5d08 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6502,7 +6502,7 @@ def mode_edit_user(phase): new_user = users[id] # Full name - alias = html.var("alias").strip() + alias = html.var_utf8("alias").strip() if not alias: raise MKUserError("alias", _("Please specify a full name or descriptive alias for the user."))

12 years, 8 months

Check_MK Git: check_mk: Reverted style phase

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: db6d06534b89b1b13ffefb6c55d75299d11ba387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db6d06534b89b1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 09:17:24 2012 +0100 Reverted style phase --- web/htdocs/wato.py | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d31c2ca..d7f6122 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -280,12 +280,8 @@ def page_handler(): action_message = e.reason html.add_user_error(None, e.reason) - styles = modefunc("styles") - if not styles: - styles = [] - # Title - html.header(modefunc("title"), stylesheets = wato_styles + styles) + html.header(modefunc("title"), stylesheets = wato_styles) html.write("<script type='text/javascript' src='js/wato.js'></script>") html.write("<div class=wato>\n")

12 years, 8 months

Check_MK Git: check_mk: Revert " Added empty custom styles to all wato builtin modes"

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7f51fb69f9e6dad20a30bab68abf2d73ac906dcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f51fb69f9e6da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 09:16:13 2012 +0100 Revert "Added empty custom styles to all wato builtin modes" This reverts commit 8dce7034ef0ad42ed2c40881a4a8c21d46ab8b44. --- web/htdocs/wato.py | 91 ---------------------------------------------------- 1 files changed, 0 insertions(+), 91 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 571c67e..d31c2ca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -730,9 +730,6 @@ def mode_folder(phase): if phase == "title": return g_folder["title"] - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() if config.may("wato.rulesets") or config.may("wato.seeall"): @@ -1417,9 +1414,6 @@ def mode_editfolder(phase, new): if phase == "title": return page_title - elif phase == 'styles': - return [] - elif phase == "buttons": linkvars = [("mode", "folder")] if html.has_var("backfolder"): @@ -1648,9 +1642,6 @@ def mode_edithost(phase, new): if phase == "title": return title - elif phase == 'styles': - return [] - elif phase == "buttons": if not new: host_status_button(hostname, "hoststatus") @@ -1804,9 +1795,6 @@ def mode_inventory(phase, firsttime): title += _(" (cached data)") return title - elif phase == 'styles': - return [] - elif phase == "buttons": host_status_button(hostname, "host") html.context_button(_("Folder"), @@ -1971,9 +1959,6 @@ def mode_search(phase): if phase == "title": return _("Search for hosts in %s and below" % (g_folder["title"])) - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") @@ -2207,9 +2192,6 @@ def mode_bulk_inventory(phase): if phase == "title": return _("Bulk service detection (inventory)") - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2307,9 +2289,6 @@ def mode_bulk_edit(phase): if phase == "title": return _("Bulk edit hosts") - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2366,9 +2345,6 @@ def mode_bulk_cleanup(phase): if phase == "title": return _("Bulk removal of explicit attributes") - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2491,9 +2467,6 @@ def mode_random_hosts(phase): if phase == "title": return _("Random Hosts") - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return @@ -2589,9 +2562,6 @@ def mode_auditlog(phase): if phase == "title": return _("Audit logfile") - elif phase == 'styles': - return [] - elif phase == "buttons": home_button() changelog_button() @@ -2643,9 +2613,6 @@ def mode_changelog(phase): if phase == "title": return _("Pending changes to activate") - elif phase == 'styles': - return [] - elif phase == "buttons": home_button() # Commit pending log right here, if all sites are up-to-date @@ -4101,10 +4068,6 @@ def effective_attributes(host, folder): def mode_snapshot(phase): if phase == "title": return _("Backup/Restore") - - elif phase == 'styles': - return [] - elif phase == "buttons": home_button() changelog_button() @@ -4354,9 +4317,6 @@ def mode_main(phase): if phase == "title": return _("WATO - Check_MK's Web Administration Tool") - elif phase == 'styles': - return [] - elif phase == "buttons": changelog_button() return @@ -4399,9 +4359,6 @@ def mode_globalvars(phase): if phase == "title": return _("Global configuration settings for Check_MK") - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() return @@ -4483,9 +4440,6 @@ def mode_edit_configvar(phase): if phase == "title": return "Global configuration settings for Check_MK" - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("Abort"), make_link([("mode", "globalvars")]), "abort") return @@ -4614,9 +4568,6 @@ def mode_groups(phase, what): if phase == "title": return what_name.title() - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() html.context_button(_("New group"), make_link([("mode", "edit_%s_group" % what)]), "new") @@ -4721,9 +4672,6 @@ def mode_edit_group(phase, what): elif what == "contact": return _("Edit contact group") - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("All groups"), make_link([("mode", "%s_groups" % what)]), "back") return @@ -4856,9 +4804,6 @@ def mode_timeperiods(phase): if phase == "title": return _("Timeperiod definitions") - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() html.context_button(_("New Timeperiod"), make_link([("mode", "edit_timeperiod")]), "new") @@ -5016,9 +4961,6 @@ def mode_edit_timeperiod(phase): else: return _("Edit time period") - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("All Timeperiods"), make_link([("mode", "timeperiods")]), "back") return @@ -5218,9 +5160,6 @@ def mode_sites(phase): if phase == "title": return _("Manage Multisite connections") - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() html.context_button(_("New connection"), make_link([("mode", "edit_site")]), "new") @@ -5444,9 +5383,6 @@ def mode_edit_site(phase): else: return _("Edit site connection %s" % siteid) - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("All Sites"), make_link([("mode", "sites")]), "back") return @@ -6395,9 +6331,6 @@ def mode_users(phase): if phase == "title": return _("Manage Users & Contacts") - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() html.context_button(_("New user"), make_link([("mode", "edit_user")]), "new") @@ -6538,9 +6471,6 @@ def mode_edit_user(phase): else: return _("Edit user %s" % userid) - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("All Users"), make_link([("mode", "users")]), "back") return @@ -7058,9 +6988,6 @@ def mode_roles(phase): if phase == "title": return _("Manage Roles & Permissions") - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() return @@ -7171,9 +7098,6 @@ def mode_edit_role(phase): if phase == "title": return _("Edit user role %s" % id) - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("All Roles"), make_link([("mode", "roles")]), "back") return @@ -7378,9 +7302,6 @@ def mode_hosttags(phase): if phase == "title": return _("Manage host tag groups") - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() html.context_button(_("New Tag group"), make_link([("mode", "edit_hosttag")]), "new") @@ -7497,9 +7418,6 @@ def mode_edit_hosttag(phase): else: return _("Edit tag group") - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("All Hosttags"), make_link([("mode", "hosttags")]), "back") return @@ -7989,9 +7907,6 @@ def mode_rulesets(phase): else: return _("Rulesets for hosts and services") - elif phase == 'styles': - return [] - elif phase == "buttons": if only_host: home_button() @@ -8134,9 +8049,6 @@ def mode_edit_ruleset(phase): title += _(" and %s '%s'") % (rulespec["itemname"], item) return title - elif phase == 'styles': - return [] - elif phase == "buttons": global_buttons() html.context_button(_("All rulesets"), @@ -8692,9 +8604,6 @@ def mode_edit_rule(phase): if phase == "title": return _("Edit rule %s") % rulespec["title"] - elif phase == 'styles': - return [] - elif phase == "buttons": html.context_button(_("Abort"), make_link([("mode", "edit_ruleset"),

12 years, 8 months

Check_MK Git: check_mk: Made "wato folder" columns sortable

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5504aa64d1c457ff6875db6c56139e0765d8c19a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5504aa64d1c457… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 13 09:08:57 2012 +0100 Made "wato folder" columns sortable --- ChangeLog | 1 + web/plugins/views/wato.py | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44bd823..e05673f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * Added filter for log state (UP,DOWN,OK,CRIT...) to all log views * New painter for normal and retry check interval (added to detail views) * Site filter shows "(local)" in case of non multi-site setup + * Made "wato folder" columns sortable * FIX: Fixed auth problem when following logwatch icon links while using the form based auth diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 2ff0116..9993b9e 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -103,48 +103,72 @@ multisite_painters["host_filename"] = { "paint" : lambda row: ("tt", row["host_filename"]), } -def paint_wato_folder(row, how): +def get_wato_folder(row, how, with_links = True): filename = row["host_filename"] if not filename.startswith("/wato/") or not filename.endswith("/hosts.mk"): - return "", "" + return "" wato_path = filename[6:-9] - title_path = wato.api.get_folder_title_path(wato_path, True) + title_path = wato.api.get_folder_title_path(wato_path, with_links) if how == "plain": return "", title_path[-1] elif how == "abs": - return "", " / ".join(title_path) + return " / ".join(title_path) else: # We assume that only hosts are show, that are below the # current WATO path. If not then better output absolute # path then wrong path. current_path = html.var("wato_folder") if not current_path or not wato_path.startswith(current_path): - return "", " / ".join(title_path) + return " / ".join(title_path) depth = current_path.count('/') + 1 - return "", " / ".join(title_path[depth:]) + return " / ".join(title_path[depth:]) +def paint_wato_folder(row, how): + return "", get_wato_folder(row, how) multisite_painters["wato_folder_abs"] = { "title" : _("WATO folder - complete path"), "short" : _("WATO folder"), "columns" : ["host_filename"], - "paint" : lambda row: paint_wato_folder(row, "abs") + "paint" : lambda row: paint_wato_folder(row, "abs"), + "sorter" : 'wato_folder_abs', } multisite_painters["wato_folder_rel"] = { "title" : _("WATO folder - relative path"), "short" : _("WATO folder"), "columns" : ["host_filename"], - "paint" : lambda row: paint_wato_folder(row, "rel") + "paint" : lambda row: paint_wato_folder(row, "rel"), + "sorter" : 'wato_folder_rel', } multisite_painters["wato_folder_plain"] = { "title" : _("WATO folder - just folder name"), "short" : _("WATO folder"), "columns" : ["host_filename"], - "paint" : lambda row: paint_wato_folder(row, "plain") + "paint" : lambda row: paint_wato_folder(row, "plain"), + "sorter" : 'wato_folder_plain', +} + +def cmp_wato_folder(r1, r2, how): + return cmp(get_wato_folder(r1, how, False), get_wato_folder(r2, how, False)) + +multisite_sorters["wato_folder_abs"] = { + "title" : _("WATO folder - complete path"), + "columns" : [ "host_filename" ], + "cmp" : lambda r1, r2: cmp_wato_folder(r1, r2, 'abs'), } +multisite_sorters["wato_folder_rel"] = { + "title" : _("WATO folder - relative path"), + "columns" : [ "host_filename" ], + "cmp" : lambda r1, r2: cmp_wato_folder(r1, r2, 'rel'), +} +multisite_sorters["wato_folder_plain"] = { + "title" : _("WATO folder - just folder name"), + "columns" : [ "host_filename" ], + "cmp" : lambda r1, r2: cmp_wato_folder(r1, r2, 'plain'), +}

12 years, 8 months

Check_MK Git: check_mk: WATO: Stylesheets to use are now configurable by each mode

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 99c3f96c515ff55379da629d216455b7b5fdb83c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99c3f96c515ff5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 12 15:11:10 2012 +0100 WATO: Stylesheets to use are now configurable by each mode --- .bugs/588 | 9 +++++++++ .bugs/589 | 10 ++++++++++ .bugs/590 | 8 ++++++++ web/htdocs/wato.py | 6 +++++- 4 files changed, 32 insertions(+), 1 deletions(-) diff --git a/.bugs/588 b/.bugs/588 new file mode 100644 index 0000000..58e52b7 --- /dev/null +++ b/.bugs/588 @@ -0,0 +1,9 @@ +Title: Mandatory Attribut in wato nicht ersichtlich +Component: wato +State: open +Date: 2012-01-12 10:42:27 +Targetversion: 1.2.0 +Class: nastiness + +Man kann in den Masken von WATO nicht erkennen, welche Felder unbedingt ausgefüllt +werden müssen. Eine Markierung ist auf jeden Fall sinnvoll. diff --git a/.bugs/589 b/.bugs/589 new file mode 100644 index 0000000..b22ee0a --- /dev/null +++ b/.bugs/589 @@ -0,0 +1,10 @@ +Title: Wato Configuration: cloneable flag fuer Attribute +Component: wato +State: open +Date: 2012-01-12 10:44:03 +Targetversion: 1.2.0 +Class: feature + +Wenn derzeit ein Host in Wato mit der Clone Funktion dupliziert wird +werden teilweise auch unsinnige Attribute uebernommen, die +fuer den Klon keine Bedeutung haben/schlichtweg falsch sind. Bsp. ssh key, mac addresse. diff --git a/.bugs/590 b/.bugs/590 new file mode 100644 index 0000000..4152af7 --- /dev/null +++ b/.bugs/590 @@ -0,0 +1,8 @@ +Title: WATO: factory reset nicht erreichbar bei defekter hosts.mk +Component: wato +State: open +Date: 2012-01-12 12:20:44 +Targetversion: 1.2.0 +Class: bug + +Man kommt nicht ins Backup/Restore, wenn beim Einlesen der hosts.mk ein Fehler auftritt diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8b7f75c..1fc1890 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -280,8 +280,12 @@ def page_handler(): action_message = e.reason html.add_user_error(None, e.reason) + styles = modefunc("styles") + if not styles: + styles = [] + # Title - html.header(modefunc("title"), stylesheets = wato_styles) + html.header(modefunc("title"), stylesheets = wato_styles + styles) html.write("<script type='text/javascript' src='js/wato.js'></script>") html.write("<div class=wato>\n")

12 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012