Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: Fixed invalid CSS definitions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa96f31f769fc61116377b41d6da6a41ca4ea067 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa96f31f769fc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 10:51:45 2012 +0200 Fixed invalid CSS definitions --- web/htdocs/dashboard.py | 2 +- web/plugins/sidebar/wato.py | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 1582ce1..fa97d32 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -526,7 +526,7 @@ def render_statistics(pie_id, what, table, filter): len(pies) > 1 and " narrow" or "")) table_entries = pies while len(table_entries) < 6: - table_entries = table_entries + [ (("", "fff", "", ""), " ") ] + table_entries = table_entries + [ (("", "#fff", "", ""), " ") ] table_entries.append(((_("Total"), "", "all%s" % what, ""), total)) for (name, color, viewurl, query), count in table_entries: url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&wato_folder=" \ diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 1c1b773..7cc162f 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -236,7 +236,6 @@ sidebar_snapins['wato_foldertree'] = { background-color: #6da1b8; } #snapin_wato_foldertree span { - text-align: middle; margin-top: 1px; display: block; color: #ffffff;

12 years, 3 months

Check_MK Git: check_mk: FIX: Disabling notifications for users does work now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9cc115a3b9b84342ef86195129353804e9941580 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cc115a3b9b843… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 09:17:35 2012 +0200 FIX: Disabling notifications for users does work now --- ChangeLog | 1 + web/htdocs/wato.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40a95d1..51d510c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * Also write out contact definitions for users without contactgroups to have the mail addresses and other notification options persisted * FIX: deletion of automation accounts now works + * FIX: Disabling notifications for users does work now Multisite * Added config option default_ts_format to configure default timestamp diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 090e090..90c2677 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7239,9 +7239,22 @@ def save_users(profiles): custom_values = [ name for (name, vs) in user_attributes ] # Keys not to put into contact definitions for Check_MK - non_contact_keys = [ "roles", "notifications_enabled", "password", "locked", "automation_secret", "language" ] + custom_values + non_contact_keys = [ + "roles", + "password", + "locked", + "automation_secret", + "language", + ] + custom_values + # Keys to put into multisite configuration - multisite_keys = [ "roles", "notifications_enabled", "locked", "automation_secret", "alias", "language", ] + custom_values + multisite_keys = [ + "roles", + "locked", + "automation_secret", + "alias", + "language", + ] + custom_values # Remove multisite keys in contacts. contacts = dict(

12 years, 3 months

Check_MK Git: check_mk: WATO: Also write out contact definitions for users without contactgroups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5d6e15d0ca8c3d0cef3bf5fbbd374629de345ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d6e15d0ca8c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 08:56:37 2012 +0200 WATO: Also write out contact definitions for users without contactgroups to have the mail addresses and other notification options persisted --- ChangeLog | 2 ++ web/htdocs/wato.py | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index acd35db..40a95d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.2.0b2: WATO: * Added new permission "move hosts" to allow/deny moving of hosts in WATO + * Also write out contact definitions for users without contactgroups to + have the mail addresses and other notification options persisted * FIX: deletion of automation accounts now works Multisite diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ff8da13..090e090 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7243,14 +7243,12 @@ def save_users(profiles): # Keys to put into multisite configuration multisite_keys = [ "roles", "notifications_enabled", "locked", "automation_secret", "alias", "language", ] + custom_values - # Remove multisite keys in contacts. And use only such entries - # that have any contact groups assigned to. + # Remove multisite keys in contacts. contacts = dict( e for e in [ (id, split_dict(user, non_contact_keys, False)) for (id, user) - in profiles.items() ] - if e[1].get("contactgroups")) + in profiles.items() ]) # Only allow explicitely defined attributes to be written to multisite config users = {}

12 years, 3 months

Check_MK Git: check_mk: Fixed image button align with text lines

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9483268239fae4475b465840030b271546373efc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9483268239fae4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 08:46:42 2012 +0200 Fixed image button align with text lines --- web/htdocs/check_mk.css | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index ff3ed7e..79b5d33 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -72,6 +72,7 @@ input, select, textarea { border-radius: 3px; background-color: #fff; font-family: arial, helvetica, sans-serif; + vertical-align: middle; } select { @@ -129,7 +130,7 @@ label.image_button { padding: 0 0 0 8px; height: 22px; margin-right: 5px; - + vertical-align: middle; } label.image_button:hover { background-position: -0px -65px;

12 years, 3 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: 6c3cbf730c6c4a0ba93739573c260834c5de3be9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c3cbf730c6c4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 08:45:56 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 992acfad9848aa3f8317d69e739088eb973644e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=992acfad9848aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 28 09:35:00 2012 +0200 Merge branch 'master' of http://git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 3 months

Check_MK Git: check_mk: Added new permission "move hosts" to allow/ deny moving of hosts in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a7906942764b51b9fa6f2a1c1be61440a0fc5200 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7906942764b51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 27 09:16:53 2012 +0200 Added new permission "move hosts" to allow/deny moving of hosts in WATO --- ChangeLog | 1 + web/htdocs/wato.py | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38b79f4..25022ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.0b2: WATO: + * Added new permission "move hosts" to allow/deny moving of hosts in WATO * FIX: deletion of automation accounts now works Multisite diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c13a521..4426e54 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -831,6 +831,7 @@ def mode_folder(phase): # Move single hosts to other folders if html.has_var("_move_host_to"): config.need_permission("wato.edit_hosts") + config.need_permission("wato.move_hosts") hostname = html.var("host") check_folder_permissions(g_folder, "write") if hostname: @@ -858,6 +859,7 @@ def mode_folder(phase): # Move elif html.var("_bulk_move"): config.need_permission("wato.edit_hosts") + config.need_permission("wato.move_hosts") target_folder_name = html.var("bulk_moveto") if target_folder_name == "@": raise MKUserError("bulk_moveto", _("Please select the destination folder")) @@ -868,6 +870,7 @@ def mode_folder(phase): # Move to target folder (from import) elif html.var("_bulk_movetotarget"): config.need_permission("wato.edit_hosts") + config.need_permission("wato.move_hosts") return move_to_imported_folders(selected_hosts) elif html.var("_bulk_edit"): @@ -1129,7 +1132,7 @@ def show_hosts(folder): hostnames.sort() # Show table of hosts in this folder - colspan = 6 + colspan = 5 html.begin_form("hosts", None, "POST", onsubmit = 'add_row_selections(this);') html.write("<table class=data>\n") html.write("<tr><th class=left></th><th></th><th>" @@ -1142,7 +1145,9 @@ def show_hosts(folder): html.write("<th>%s</th>" % attr.title()) colspan += 1 - html.write("<th class=right>" + _("Move To") + "</th>") + if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): + html.write("<th class=right>" + _("Move To") + "</th>") + colspan += 1 html.write("</tr>\n") odd = "odd" @@ -1159,7 +1164,7 @@ def show_hosts(folder): html.button("_bulk_cleanup", _("Cleanup")) if config.may("wato.services"): html.button("_bulk_inventory", _("Inventory")) - if config.may("wato.edit_hosts"): + if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): move_to_folder_combo("host", None, top) if at_least_one_imported: html.button("_bulk_movetotarget", _("Move to Target Folders")) @@ -1273,10 +1278,10 @@ def show_hosts(folder): html.write("</td>\n") # Move to - html.write("<td>") - if config.may("wato.edit_hosts"): + if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): + html.write("<td>") move_to_folder_combo("host", hostname) - html.write("</td>\n") + html.write("</td>\n") html.write("</tr>\n") if config.may("wato.edit_hosts") or config.may("wato.manage_hosts"): @@ -10412,10 +10417,16 @@ def load_plugins(): "a separate permission (see below)"), [ "admin", "user" ]) + config.declare_permission("wato.move_hosts", + _("Move existing hosts"), + _("Move existing hosts to other folders. Please also add the permission " + "<i>Modify existing hosts</i>."), + [ "admin", "user" ]) + config.declare_permission("wato.manage_hosts", _("Add & remove hosts"), _("Add hosts to the monitoring and remove hosts " - "from the monitoring. Please also add the permissions " + "from the monitoring. Please also add the permission " "<i>Modify existing hosts</i>."), [ "admin", "user" ])

12 years, 3 months

Check_MK Git: check_mk: BI: Added new painter "affected hosts (

by git＠mathias-kettner.de

link to host page)" to show all 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: d2a945da5416c46b2e457569da3a3950407106ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2a945da5416c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 27 09:52:52 2012 +0200 BI: Added new painter "affected hosts (link to host page)" to show all host names with links to the "hosts" view --- ChangeLog | 2 ++ web/plugins/views/bi.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25022ac..2f98daa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Multisite * Added config option default_ts_format to configure default timestamp output format in multisite + * BI: Added new painter "affected hosts (link to host page)" to show all + host names with links to the "hosts" view * FIX: Fixed encoding problem in "custom notification" message Checks & Agents: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 8190e6f..5c8c09f 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -117,10 +117,10 @@ multisite_painters["aggr_output"] = { "paint" : lambda row: ("", row["aggr_output"]) } -def paint_aggr_hosts(row): +def paint_aggr_hosts(row, link_to_view): h = [] for site, host in row["aggr_hosts"]: - url = html.makeuri([("view_name", "aggr_host"), ("site", site), ("host", host)]) + url = html.makeuri([("view_name", link_to_view), ("site", site), ("host", host)]) h.append('<a href="%s">%s</a>' % (url, host)) return "", " ".join(h) @@ -128,9 +128,15 @@ multisite_painters["aggr_hosts"] = { "title" : _("Aggregation: affected hosts"), "short" : _("Hosts"), "columns" : [ "aggr_hosts" ], - "paint" : paint_aggr_hosts, + "paint" : lambda row: paint_aggr_hosts(row, "aggr_host"), } +multisite_painters["aggr_hosts_services"] = { + "title" : _("Aggregation: affected hosts (link to host page)"), + "short" : _("Hosts"), + "columns" : [ "aggr_hosts" ], + "paint" : lambda row: paint_aggr_hosts(row, "host"), +} multisite_painter_options["aggr_expand"] = { "title" : _("Initial expansion of aggregations"),

12 years, 3 months

Check_MK Git: check_mk: Added config option default_ts_format to configure default timestamp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e744bba208591b1dc95e3a5bc0e38a03df78a53c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e744bba208591b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 26 15:22:21 2012 +0200 Added config option default_ts_format to configure default timestamp output format in multisite --- ChangeLog | 2 ++ web/htdocs/config.py | 3 +++ web/plugins/views/painters.py | 2 +- 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index af05e44..38b79f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * FIX: deletion of automation accounts now works Multisite + * Added config option default_ts_format to configure default timestamp + output format in multisite * FIX: Fixed encoding problem in "custom notification" message Checks & Agents: diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 9e88fdf..1bd5335 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -586,6 +586,9 @@ filter_columns = 2 # Default language for l10n default_language = None +# Default timestamp format to be used in multisite +default_ts_format = 'mixed' + # Default authentication type. Can be changed to e.g. "cookie" for # using the cookie auth auth_type = 'basic' diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index acdfa9d..eb961b2 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -84,7 +84,7 @@ multisite_painter_options["pnpview"] = { multisite_painter_options["ts_format"] = { "title" : _("Time stamp format"), - "default" : "mixed", + "default" : config.default_ts_format, "values" : [ ("mixed", _("Mixed")), ("abs", _("Absolute")),

12 years, 3 months

Check_MK Git: check_mk: automation_try_inventory_node:

by git＠mathias-kettner.de

initialized parameter params = None 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: b5f31b747cb9a63c65e55ed7bc37d6cd84de86cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5f31b747cb9a6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 28 20:27:54 2012 +0200 automation_try_inventory_node: initialized parameter params = None --- modules/automation.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index eeca56f..00059cf 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -239,6 +239,7 @@ def automation_try_inventory_node(hostname): # Collect current status information about all existing checks table = [] for (ct, item), (state_type, paramstring) in found.items(): + params = None if state_type != 'legacy': descr = service_description(ct, item) infotype = ct.split('.')[0]

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012