Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: WATO - Improved the new auth api

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04f853c92821e74d279090afa4127918a5cfeeea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04f853c92821e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 14:47:44 2011 +0100 WATO - Improved the new auth api --- web/plugins/wato/auth.py | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index 229a08d..91ae7fc 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -39,6 +39,12 @@ # user_permissions(<USER_NAME>) # Returns an array of all permissions of the user # +# roles_with_permission(<PERMISSION>) +# Returns an array of rolenames with the given permission +# +# users_with_permission(<PERMISSION>) +# Returns an array of usernames with the given permission +# # may(<USER_NAME>, <PERMISSION>) # Returns true/false wether or not the user is permitted @@ -67,8 +73,8 @@ def parse_php(data, lvl = 1): def create_php_file(users, role_permissions): - file(g_auth_base_dir + '/auth.php', 'w').write(''' -<?php + file(g_auth_base_dir + '/auth.php', 'w').write('''<?php +global $mk_users, $mk_roles; $mk_users = %s; $mk_roles = %s; @@ -107,6 +113,29 @@ function users_with_role($want_role) { return $result; } +function roles_with_permission($want_permission) { + global $mk_roles; + $result = array(); + foreach($mk_roles AS $rolename => $role) { + foreach($role AS $permission) { + if($permission == $want_permission) { + $result[] = $rolename; + break; + } + } + } + return $result; +} + +function users_with_permission($need_permission) { + global $mk_users; + $result = array(); + foreach(roles_with_permission($need_permission) AS $rolename) { + $result = array_merge($result, users_with_role($rolename)); + } + return $result; +} + function may($username, $need_permission) { global $mk_roles; foreach(user_roles($username) AS $role) {

12 years, 9 months

Check_MK Git: check_mk: FIX: Broken WATO hooks lead to empty htpasswd file

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c888f7e593f72ed6fc67ecee46c98edadca7b065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c888f7e593f72e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 10:47:43 2011 +0100 FIX: Broken WATO hooks lead to empty htpasswd file --- ChangeLog | 4 +--- web/htdocs/wato.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6febf41..55a911d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,13 +6,11 @@ * linux agent - ipmi: Creating directory of cache file if not exists * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in order to be consistent with other checks - - Multisite: - * FIX: ship missing CSS files for mobile GUI Multisite: * Several cleanups to prevent css/js warning messages in e.g. Firefox * Made texts in selectable rows selectable again + * FIX: ship missing CSS files for mobile GUI WATO: * Optimized wraps in host lists tag column diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ea83557..d638998 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -673,6 +673,7 @@ def save_hosts(folder = None): # values stored for check_mk as well. out.write("\n# Host attributes (needed for WATO)\n") out.write("host_attributes.update(\n%s)\n" % pprint.pformat(cleaned_hosts)) + out.close() def delete_configuration_file(folder, thefile): @@ -5267,6 +5268,7 @@ def save_configuration_vars(vars, filename): out.write("# Written by WATO\n# encoding: utf-8\n\n") for varname, value in vars.items(): out.write("%s = %r\n" % (varname, value)) + out.close() #. # .-Groups---------------------------------------------------------------. @@ -5482,6 +5484,7 @@ def save_group_information(groups): if what in groups and len(groups[what]) > 0: out.write("if type(define_%sgroups) != dict:\n define_%sgroups = {}\n" % (what, what)) out.write("define_%sgroups.update(%s)\n\n" % (what, pprint.pformat(groups[what]))) + out.close() class GroupSelection(ElementSelection): @@ -5616,6 +5619,7 @@ def save_timeperiods(timeperiods): out = file(root_dir + "timeperiods.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("timeperiods.update(%s)\n" % pprint.pformat(timeperiods)) + out.close() def mode_edit_timeperiod(phase): @@ -6445,6 +6449,7 @@ def save_sites(sites): out = file(sites_mk, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("sites = \\\n%s\n" % pprint.pformat(sites)) + out.close() update_distributed_wato_file(sites) need_sidebar_reload() @@ -7028,6 +7033,7 @@ def create_distributed_wato_file(siteid, mode): "# push the configuration to us. It makes sure that\n" "# we only monitor hosts that are assigned to our site.\n\n") out.write("distributed_wato_site = '%s'\n" % siteid) + out.close() def delete_distributed_wato_file(): p = defaults.check_mk_configdir + "/distributed_wato.mk" @@ -7626,6 +7632,7 @@ def save_users(profiles): out = file(filename, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("contacts.update(\n%s\n)\n" % pprint.pformat(contacts)) + out.close() # Users with passwords for Multisite make_nagios_directory(multisite_dir) @@ -7633,6 +7640,7 @@ def save_users(profiles): out = file(filename, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("multisite_users = \\\n%s\n" % pprint.pformat(users)) + out.close() # Apache htpasswd. We only store passwords here. During # loading we created entries for all admin users we know. Other @@ -7657,6 +7665,7 @@ def save_users(profiles): create_user_file(auth_file, "w").write("%s\n" % user["automation_secret"]) elif os.path.exists(auth_file): os.remove(auth_file) + out.close() # Call the users_saved hook call_hook(call_hook_users_saved, users) @@ -7973,6 +7982,7 @@ def save_roles(roles): out = file(filename, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("roles.update(\n%s)\n" % pprint.pformat(roles)) + out.close() call_hook(call_hook_roles_saved, roles) @@ -8343,6 +8353,7 @@ def save_hosttags(hosttags): out = file(multisite_dir + "hosttags.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("wato_host_tags += \\\n%s\n" % pprint.pformat(hosttags)) + out.close() def rename_host_tags_after_confirmation(tag_id, operations): mode = html.var("_repair") @@ -9580,6 +9591,7 @@ def save_rulesets(folder, rulesets): for rule in ruleset: save_rule(out, folder, rulespec, rule) out.write("]\n\n") + out.close() def save_rule(out, folder, rulespec, rule): out.write(" ( ")

12 years, 9 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e738a9233d662034d7478c889ad04022d5e33b4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e738a9233d6620… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 10:48:29 2011 +0100 Updated changelog --- ChangeLog | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55a911d..fe50be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,9 +17,10 @@ * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory * NagVis auhtorization file generation is also executed on activate_changes - * Bugfix: Calling activate_changes hook also in distributed WATO setups - * Bugfix: Fixed javascript errors when doing replication in distributed + * FIX: Calling activate_changes hook also in distributed WATO setups + * FIX: Fixed javascript errors when doing replication in distributed wato environments when not having the sidebar open + * FIX: Broken WATO hooks lead to empty htpasswd file 1.1.13i1: Multisite:

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0524

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26c05cc18fb2456f03e03ef3de9edbc33b953a0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26c05cc18fb245… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 11:21:14 2011 +0100 Updated bug entries #0524 --- .bugs/524 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/524 b/.bugs/524 new file mode 100644 index 0000000..d51e765 --- /dev/null +++ b/.bugs/524 @@ -0,0 +1,10 @@ +Title: Update docu about styles for Multisite +Component: docu +State: open +Date: 2011-12-22 11:20:25 +Targetversion: 1.2.0 +Class: todo + +The Stylesheets have been splitted into parts. Update the +documentation and make a table of all stylesheets and when +they are loaded.

12 years, 9 months

Check_MK Git: check_mk: Reserved 50 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 324a51f9e07ac1742ef4af4358686d2aeca9dc6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324a51f9e07ac1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 11:20:19 2011 +0100 Reserved 50 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 97a0533..f27ce70 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -524 +574

12 years, 9 months

Check_MK Git: check_mk: WATO: further layout fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 302501b8a84498a5d8f31e6fdedacb45ebc2835c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=302501b8a84498… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 11:20:14 2011 +0100 WATO: further layout fix --- web/htdocs/wato.css | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 6d0e4fa..d249448 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -46,7 +46,6 @@ Boston, MA 02110-1301 USA. /* Tables in WATO are not size to 100% per default */ .wato table.data { width: auto; - box-shadow: 0px 0px 2px #000000; } .wato table.data th { -moz-border-radius: 0px; @@ -442,10 +441,10 @@ Boston, MA 02110-1301 USA. -moz-border-radius: 5px; } .wato table.configmodules td.text { - width: 45%; + width: 49%; } .wato table.configmodules td.icon { - width: 5%; + width: 1%; } .wato table.configmodules td.text a { color: #246;

12 years, 9 months

Check_MK Git: check_mk: WATO: remove debug code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4558f1ba9c1d679254e02cfe573adc7883857c10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4558f1ba9c1d67… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 10:32:06 2011 +0100 WATO: remove debug code --- web/htdocs/wato.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fc6f72b..0efe798 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -831,7 +831,6 @@ def mode_folder(phase): return "bulkcleanup" else: - html.debug_vars() render_folder_path() have_something = show_subfolders(g_folder) have_something = show_hosts(g_folder) or have_something

12 years, 9 months

Check_MK Git: check_mk: WATO: fix styling of icon menus

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 706dcf0013893a7779c9f9ff1f841699e4af2146 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=706dcf0013893a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 10:21:43 2011 +0100 WATO: fix styling of icon menus --- web/htdocs/wato.css | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index a60ce6e..6d0e4fa 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -441,6 +441,12 @@ Boston, MA 02110-1301 USA. padding: 6px; -moz-border-radius: 5px; } +.wato table.configmodules td.text { + width: 45%; +} +.wato table.configmodules td.icon { + width: 5%; +} .wato table.configmodules td.text a { color: #246; font-weight: bold;

12 years, 9 months

Check_MK Git: check_mk: WATO: move folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9362f81b30dd12e2635637bf0f4958fd4c9cba91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9362f81b30dd12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 10:18:21 2011 +0100 WATO: move folders --- ChangeLog | 5 +- web/htdocs/wato.css | 12 +++++ web/htdocs/wato.py | 123 +++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 111 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9362f81b30…

12 years, 9 months

Check_MK Git: check_mk: Made texts in selectable rows selectable again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 86d0594b1e74f91f219b81435d9a858726df7086 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86d0594b1e74f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 17:30:53 2011 +0100 Made texts in selectable rows selectable again --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 45 +++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e4627c..0a67478 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Multisite: * Several cleanups to prevent css/js warning messages in e.g. Firefox + * Made texts in selectable rows selectable again WATO: * Optimized wraps in host lists tag column diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index fcba936..caa8e14 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1099,22 +1099,23 @@ function toggle_row(e, elem) { return false; } -function disable_selection(e) { - if(!e) - e = window.event; - - // Skip handling clicks on links/images/... - var target = getTarget(e); - if(target.tagName != 'TD') - return true; - - // Firefox handling - if(typeof target.style.MozUserSelect != 'undefined') - target.style.MozUserSelect = 'none'; - - // All others - return false; -} +// FIXME: If current "row text selection" behavior is ok - remove this +//function disable_selection(e) { +// if(!e) +// e = window.event; +// +// // Skip handling clicks on links/images/... +// var target = getTarget(e); +// if(target.tagName != 'TD') +// return true; +// +// // Firefox handling +// if(typeof target.style.MozUserSelect != 'undefined') +// target.style.MozUserSelect = 'none'; +// +// // All others +// return false; +//} // Toggles the datarows of the group which the given checkbox is part of. function toggle_group_rows(checkbox) { @@ -1272,12 +1273,12 @@ function table_init_rowselect(oTable) { return toggle_row(e, this); }; // Disable selections in IE and then in mozilla - elem.onselectstart = function(e) { - return disable_selection(e); - }; - elem.onmousedown = function(e) { - return disable_selection(e); - }; + //elem.onselectstart = function(e) { + // return disable_selection(e); + //}; + //elem.onmousedown = function(e) { + // return disable_selection(e); + //}; elem = null; }); }

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits