Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

Check_MK Git: check_mk: Fix problem in auth. php after prefixing permissions with general.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fb753c68610b40eb57056f8a5fbc46ff9a0088e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb753c68610b40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 09:40:07 2012 +0200 Fix problem in auth.php after prefixing permissions with general. --- web/htdocs/index.py | 6 +++++- web/plugins/wato/auth.py | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 29f6a5f..ccd09e5 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -228,6 +228,11 @@ def handler(req, profiling = True): os.chmod(profilefile + ".py", 0755) return apache.OK + # Make sure all plugins are avaiable as early as possible. At least + # we need the plugins (i.e. the permissions declared in these) at the + # time before the first login for generating auth.php. + load_all_plugins() + # Detect mobile devices if html.has_var("mobile"): html.mobile = not not html.var("mobile") @@ -247,7 +252,6 @@ def handler(req, profiling = True): # here. Automation calls bybass the normal authentication stuff if req.myfile == "automation": try: - load_all_plugins() handler() except Exception, e: html.write(str(e)) diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index 5a0e450..de524f3 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -59,17 +59,17 @@ g_auth_base_dir = defaults.var_dir + '/wato/auth' -def parse_php(data, lvl = 1): +def format_php(data, lvl = 1): s = '' if isinstance(data, tuple) or isinstance(data, list): s += 'array(\n' for item in data: - s += ' ' * lvl + parse_php(item, lvl + 1) + ',\n' + s += ' ' * lvl + format_php(item, lvl + 1) + ',\n' s += ' ' * (lvl - 1) + ')' elif isinstance(data, dict): s += 'array(\n' for key, val in data.iteritems(): - s += ' ' * lvl + parse_php(key, lvl + 1) + ' => ' + parse_php(val, lvl + 1) + ',\n' + s += ' ' * lvl + format_php(key, lvl + 1) + ' => ' + format_php(val, lvl + 1) + ',\n' s += ' ' * (lvl - 1) + ')' elif isinstance(data, str): s += '\'%s\'' % data.replace('\'', '\\\'') @@ -181,7 +181,7 @@ function may($username, $need_permission) { } ?> -''' % (parse_php(users), parse_php(role_permissions), parse_php(folder_permissions))) +''' % (format_php(users), format_php(role_permissions), format_php(folder_permissions))) def create_auth_file(users): make_nagios_directory(g_auth_base_dir)

11 years, 11 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: 63d492cab30c6edc2ecd7b7601b13345a2e03d74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63d492cab30c6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 09:40:31 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

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: ed2db6855981c97e554840c0c00b162fefa04194 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed2db6855981c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 20 08:32:47 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Added missing image

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0b9453b5b1b9f97a4b99e126e15b3fdeb2ad53e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0b9453b5b1b9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 20 08:32:43 2012 +0200 Added missing image --- web/htdocs/images/icon_matrix.png | Bin 0 -> 4708 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_matrix.png b/web/htdocs/images/icon_matrix.png new file mode 100644 index 0000000..40f1169 Binary files /dev/null and b/web/htdocs/images/icon_matrix.png differ

11 years, 11 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: 4058cfec895a898837cfb26e95a9ff24be7d4ad0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4058cfec895a89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 19 09:42:51 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: FIX: megaraid_pdisks: handle case where no enclosure device exists

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20e084bc9c5f9083b7f8029fd3f31f50291678cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20e084bc9c5f90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 19 09:42:49 2012 +0200 FIX: megaraid_pdisks: handle case where no enclosure device exists --- ChangeLog | 1 + checks/megaraid_pdisks | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9208421..13742d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Checks & Agents: * mssql_backup: Fixed problems with datetime/timezone calculations * New Checks for Siemens Blades (BX600) + * FIX: megaraid_pdisks: handle case where no enclosure device exists WATO: * FIX: remove line about number of rules in rule set overview diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 6ce5d3d..53abb49 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -54,6 +54,7 @@ def megaraid_pdisks_parse(info): current_adapter = adapters[0] return_var = [] adapter = 0 + enclosure_devid = 0 for line in info: if line[0] == 'adapter': current_adapter = {} @@ -65,7 +66,12 @@ def megaraid_pdisks_parse(info): current_adapter = adapters[int(line[1][1:])] # Raute weglassen adapter = int(line[1][1:]) elif line[0] == "Enclosure" and line[1] == "Device": - enclosure_devid = int(line[-1]) + try: + enclosure_devid = int(line[-1]) + except: # no enclosure device + enclosure_devid = 0 + adapters[adapter][0] = 0 + elif line[0] == "Slot": slot = int(line[-1]) elif line[0] == "Firmware" and line[1] == "state:":

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: 2ee4d78b26ff2248f9eb202810a7be6b3ca5eab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee4d78b26ff22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 19 08:51:48 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Added permission to control the "clone host" feature in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cd2caad6d71e7391970e1edfd72ffce9b69102b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cd2caad6d71e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 14:18:14 2012 +0200 Added permission to control the "clone host" feature in WATO --- ChangeLog | 1 + web/htdocs/wato.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7effd3..e15e120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * New Checks for Siemens Blades (BX600) WATO: + * Added permission to control the "clone host" feature in WATO * FIX: remove line about number of rules in rule set overview (that garbled the logical layout) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8da1a09..3e79453 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1309,7 +1309,8 @@ def show_hosts(folder): msg += ". " + _("The inventory of this host failed during a previous bulk inventory.") html.icon_button(services_url, msg, image) if config.may("wato.manage_hosts"): - html.icon_button(clone_url, _("Create a clone of this host"), "insert") + if config.may("wato.clone_hosts"): + html.icon_button(clone_url, _("Create a clone of this host"), "insert") html.icon_button(delete_url, _("Delete this host"), "delete") html.write("</td>\n") @@ -1799,6 +1800,9 @@ def mode_edithost(phase, new, cluster): if clonename and clonename not in g_folder[".hosts"]: raise MKGeneralException(_("You called this page with an invalid host name.")) + if clonename and not config.may("wato.clone_hosts"): + raise MKAuthException(_("Sorry, you are not allowed to clone hosts.")) + if clonename: title = _("Create clone of %s") % clonename host = g_folder[".hosts"][clonename] @@ -11483,6 +11487,12 @@ def load_plugins(): "<i>Modify existing hosts</i>."), [ "admin", "user" ]) + config.declare_permission("wato.clone_hosts", + _("Clone hosts"), + _("Clone existing hosts to create new ones from the existing one." + "Please also add the permission <i>Add & remove hosts</i>."), + [ "admin", "user" ]) + config.declare_permission("wato.random_hosts", _("Create random hosts"), _("The creation of random hosts is a facility for test and development "

11 years, 11 months

Check_MK Git: check_mk: Added new role/ permission matrix page in WATO to compare permissions of roles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aecb93f0698ae2d36ec83f972245697ec77e9e4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aecb93f0698ae2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 16:43:42 2012 +0200 Added new role/permission matrix page in WATO to compare permissions of roles --- ChangeLog | 2 + web/htdocs/wato.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e15e120..5de0409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ WATO: * Added permission to control the "clone host" feature in WATO + * Added new role/permission matrix page in WATO to compare + permissions of roles * FIX: remove line about number of rules in rule set overview (that garbled the logical layout) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3e79453..712568e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8071,6 +8071,7 @@ def mode_roles(phase): elif phase == "buttons": global_buttons() + html.context_button(_("Matrix"), make_link([("mode", "role_matrix")]), "matrix") return roles = load_roles() @@ -8172,7 +8173,6 @@ def mode_roles(phase): # - number of users with this role html.write("</table>") - def mode_edit_role(phase): id = html.var("edit") @@ -8372,6 +8372,63 @@ def rename_user_role(id, new_id): user["roles"].append(new_id) save_users(users) +def mode_role_matrix(phase): + if phase == "title": + return _("Role & Permission Matrix") + + elif phase == "buttons": + global_buttons() + return + + elif phase == "action": + return + + # Show table of builtin and user defined roles, sorted by alias + roles = load_roles() + role_list = roles.items() + role_list.sort(cmp = lambda a,b: cmp((a[1]["alias"],a[0]), (b[1]["alias"],b[0]))) + + html.write("<table class=data>") + html.write("<tr class=dualheader><th></th>") + num_roles = 1 + for id, role in role_list: + html.write('<th>%s</th>' % role['alias']) + num_roles += 1 + html.write("</tr>\n") + + # Loop all permission sections, but sorted plz + odd = "even" + for section, (prio, section_title) in sorted(config.permission_sections.iteritems(), + key = lambda x: x[1][0], reverse = True): + + html.write('<tr>') + html.write('<th colspan=%d>%s</th>' % (num_roles, section_title)) + html.write('</tr>') + + # Loop all permissions + for perm in config.permissions_by_order: + pname = perm["name"] + this_section = pname.split(".")[0] + if section != this_section: + continue # Skip permissions of other sections + + odd = odd == "odd" and "even" or "odd" + + html.write('<tr class="data %s0">' % odd) + html.write('<td class=title>%s</td>' % perm["title"]) + + for id, role in role_list: + base_on_id = role.get('basedon', id) + pvalue = role["permissions"].get(pname) + if pvalue is None: + pvalue = base_on_id in perm["defaults"] + + html.write('<td>%s</td>' % (pvalue and 'X' or '')) + + html.write('</tr>') + + html.write("</table>") + #. # .-Host-Tags------------------------------------------------------------. # | _ _ _ _____ | @@ -11368,6 +11425,7 @@ modes = { "users" : (["users"], mode_users), "edit_user" : (["users"], mode_edit_user), "roles" : (["users"], mode_roles), + "role_matrix" : (["users"], mode_role_matrix), "edit_role" : (["users"], mode_edit_role), "hosttags" : (["hosttags"], mode_hosttags), "edit_hosttag" : (["hosttags"], mode_edit_hosttag),

11 years, 11 months

Check_MK Git: check_mk: Introduce comment and disabling for rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a91e9d810e257df8f4de6716b05fe00cec897505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a91e9d810e257d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 18 17:26:58 2012 +0200 Introduce comment and disabling for rules --- ChangeLog | 11 +++- modules/check_mk.py | 34 +++++++++++ web/htdocs/images/icon_disabled.png | Bin 0 -> 3640 bytes web/htdocs/wato.py | 107 ++++++++++++++++++++++++++++------- 4 files changed, 129 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a91e9d810e…

11 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012