Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Switched nagvis_auth API to standard WATO auth export API

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6df749c1dd6cb8a9d84fd7c2c11dc12879980c0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df749c1dd6cb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 10:59:46 2011 +0100 Switched nagvis_auth API to standard WATO auth export API --- web/htdocs/wato.py | 20 ++++ web/plugins/wato/auth.py | 42 ++++++++-- web/plugins/wato/nagvis_auth.py | 188 +++++++-------------------------------- 3 files changed, 87 insertions(+), 163 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6df749c1dd…

12 years, 9 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: fffa44426f824cdb29a3b90f677aab7d895551bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fffa44426f824c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 10:59:50 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO: bugfix hidden topics on bulk edit

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a9090b35e8965853ee2f657b0d00ba377fa0c24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a9090b35e8965… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 23 10:37:02 2011 +0100 WATO: bugfix hidden topics on bulk edit --- web/htdocs/wato.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e04cd09..8a113a8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3802,6 +3802,8 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute # One attribute is always shown -> topic can never # be made invisible topic_is_volatile = False + else: + topic_is_volatile = False # "bulk": determine, if this attribute has the same setting for all hosts. values = []

12 years, 9 months

Check_MK Git: check_mk: WATO: remove internal debug info

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 538d2e44febc0c0f6c9bc2e4f4dd71459ae98718 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=538d2e44febc0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 23 09:50:34 2011 +0100 WATO: remove internal debug info --- 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 ef2c9b2..e04cd09 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9605,7 +9605,6 @@ def mode_edit_rule(phase): if x == 0: html.write("<tr>") html.write("<td>") - html.write("HIRN") item = nr < len(item_list) and item_list[nr] or "" html.text_input("item_%d" % nr, item) html.write("</td>")

12 years, 9 months

Check_MK Git: check_mk: Internal code cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef86f93b269a3511a618ad672919e22fa83efe8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef86f93b269a35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 23 09:26:49 2011 +0100 Internal code cleanup --- checks/kernel | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/checks/kernel b/checks/kernel index 21679f1..8ff91b3 100644 --- a/checks/kernel +++ b/checks/kernel @@ -48,7 +48,9 @@ def inventory_kernel(info): def check_kernel(item, params, info): this_time = int(info[0][0]) - hits = [ (line[0], line[1]) for line in info[1:] if line[0] == item or kernel_counter_names.get(line[0], line[0]) == item ] + hits = [ (line[0], line[1]) + for line in info[1:] + if line[0] == item or kernel_counter_names.get(line[0], line[0]) == item ] if len(hits) == 0: return (3, "UNKNOWN - item '%s' not found in agent output" % item) elif len(hits) > 1:

12 years, 9 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: d56f77494422c90080564d9a93f24a389c89032c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d56f77494422c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 23 09:13:17 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO: better item specification for kernel counters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a94bbb9b1d1a617abfd4403a1b510ecc90578cce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a94bbb9b1d1a61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 23 09:13:13 2011 +0100 WATO: better item specification for kernel counters --- web/htdocs/wato.py | 81 +++++++++++++++++++-------------- web/plugins/wato/check_parameters.py | 5 ++ 2 files changed, 52 insertions(+), 34 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0efe798..ef2c9b2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9347,16 +9347,21 @@ def get_rule_conditions(ruleset): if not explicit: item_list = [ "" ] else: - nr = 0 - item_list = [] - while True: - var = "item_%d" % nr - item = html.var(var, "").strip() - if nr > config.wato_num_itemspecs and not item: - break - if item: - item_list.append(item) - nr += 1 + itemenum = ruleset["itemenum"] + if itemenum: + itemspec = ListChoice(choices = itemenum, columns = 3) + item_list = [ x+"$" for x in itemspec.from_html_vars("item") ] + else: + nr = 0 + item_list = [] + while True: + var = "item_%d" % nr + item = html.var(var, "").strip() + if nr > config.wato_num_itemspecs and not item: + break + if item: + item_list.append(item) + nr += 1 if len(item_list) == 0: raise MKUserError("item_0", _("Please specify at least one %s or " "this rule will never match.") % ruleset["itemname"]) @@ -9585,30 +9590,37 @@ def mode_edit_rule(phase): div_id = "itemlist" html.checkbox("explicit_services", checked, onclick="wato_toggle_option(this, %r)" % div_id) html.write(" " + _("Specify explicit values")) - html.write('<div id="%s" style="display: %s">' % ( + html.write('<div id="%s" style="display: %s; padding: 0px;">' % ( div_id, not checked and "none" or "")) - html.write("<table class=itemlist>") - num_cols = 3 - for nr in range(config.wato_num_itemspecs): - x = nr % num_cols - if x == 0: - html.write("<tr>") - html.write("<td>") - item = nr < len(item_list) and item_list[nr] or "" - html.text_input("item_%d" % nr, item) - html.write("</td>") - if x == num_cols - 1: - html.write("</tr>") - while x < num_cols - 1: - html.write("<td></td>") - if x == num_cols - 1: - html.write("</tr>") - x += 1 - html.write("</table>") - html.write(_("The entries here are regular expressions to match the beginning. " - "Add a <tt>$</tt> for an exact match. An arbitrary substring is matched " - "with <tt>.*</tt>")) - html.write("</div>") + itemenum = rulespec["itemenum"] + if itemenum: + value = [ x.rstrip("$") for x in item_list ] + itemspec = ListChoice(choices = itemenum, columns = 3) + itemspec.render_input("item", value) + else: + html.write("<table class=itemlist>") + num_cols = 3 + for nr in range(config.wato_num_itemspecs): + x = nr % num_cols + if x == 0: + html.write("<tr>") + html.write("<td>") + html.write("HIRN") + item = nr < len(item_list) and item_list[nr] or "" + html.text_input("item_%d" % nr, item) + html.write("</td>") + if x == num_cols - 1: + html.write("</tr>") + while x < num_cols - 1: + html.write("<td></td>") + if x == num_cols - 1: + html.write("</tr>") + x += 1 + html.write("</table>") + html.write(_("The entries here are regular expressions to match the beginning. " + "Add a <tt>$</tt> for an exact match. An arbitrary substring is matched " + "with <tt>.*</tt>")) + html.write("</div>") html.write("<tr><td class=buttons colspan=2>") html.button("save", _("Save")) @@ -9744,7 +9756,7 @@ g_rulespecs = {} g_rulespec_groups = {} def register_rule(group, varname, valuespec = None, title = None, help = None, itemtype = None, itemname = None, - itemhelp = None, + itemhelp = None, itemenum = None, match = "first", optional = False): ruleset = { "group" : group, @@ -9753,6 +9765,7 @@ def register_rule(group, varname, valuespec = None, title = None, "itemtype" : itemtype, # None, "service", "checktype" or "checkitem" "itemname" : itemname, # e.g. "mount point" "itemhelp" : itemhelp, # a description of the item, only rarely used + "itemenum" : itemenum, # possible fixed values for items "match" : match, "title" : title or valuespec.title(), "help" : help or valuespec.help(), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9f5d653..b8d4cbe 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -643,6 +643,7 @@ checkgroups.append(( Float(label = _("events per second")), title = _("Set critical level:"), sameline = True)]), + DropdownChoice( title = _("kernel counter"), choices = [ (x,x) for x in [ @@ -714,10 +715,13 @@ checkgroups.append(( for checkgroup, title, valuespec, itemspec, matchtype in checkgroups: if not valuespec: continue # would be useles rule if check has no parameters + itemenum = None if itemspec: itemtype = "item" itemname = itemspec.title() itemhelp = itemspec.help() + if isinstance(itemspec, DropdownChoice): + itemenum = itemspec._choices else: itemtype = None itemname = None @@ -730,6 +734,7 @@ for checkgroup, title, valuespec, itemspec, matchtype in checkgroups: valuespec = valuespec, itemtype = itemtype, itemname = itemname, itemhelp = itemhelp, + itemenum = itemenum, match = matchtype)

12 years, 9 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc9b487e3c28d9e513dec13c3bca58ac86adf06d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc9b487e3c28d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 10:59:37 2011 +0100 Revert "FIX: Broken WATO hooks lead to empty htpasswd file" This reverts commit c888f7e593f72ed6fc67ecee46c98edadca7b065. --- ChangeLog | 4 +++- web/htdocs/wato.py | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe50be1..0ebfcfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,11 +6,13 @@ * 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 d638998..ea83557 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -673,7 +673,6 @@ 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): @@ -5268,7 +5267,6 @@ 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---------------------------------------------------------------. @@ -5484,7 +5482,6 @@ 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): @@ -5619,7 +5616,6 @@ 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): @@ -6449,7 +6445,6 @@ 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() @@ -7033,7 +7028,6 @@ 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" @@ -7632,7 +7626,6 @@ 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) @@ -7640,7 +7633,6 @@ 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 @@ -7665,7 +7657,6 @@ 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) @@ -7982,7 +7973,6 @@ 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) @@ -8353,7 +8343,6 @@ 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") @@ -9591,7 +9580,6 @@ 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: 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: f6c6f8b67064d00792ce6f4fd99ef4b71116921f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c6f8b67064d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 08:26:09 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 9 months

Check_MK Git: check_mk: Implemented a new inclusion based API for using multisite permissions in other addons

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d4d5859ac294d76b8a33dadb4c3294fa98058095 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4d5859ac294d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 11:34:06 2011 +0100 Implemented a new inclusion based API for using multisite permissions in other addons --- ChangeLog | 3 +- web/htdocs/config.py | 10 ++++ web/plugins/wato/auth.py | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ebfcfc..d4d94dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,10 +19,11 @@ * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory * NagVis auhtorization file generation is also executed on activate_changes + * Implemented a new inclusion based API for using multisite permissions + in other addons * 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: diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 9b9314a..347bb04 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -366,6 +366,16 @@ def need_permission(pname): "then please ask you administrator to provide you with " "the following permission: '<b>%s</b>'.") % perm["title"]) +def get_role_permissions(): + role_permissions = {} + for perm in permissions_by_order: + for role in perm['defaults']: + if not role in role_permissions: + role_permissions[role] = [ perm['name'] ] + else: + role_permissions[role].append(perm['name']) + return role_permissions + # ------------------------------------------------------------------- # ____ _ _ diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py new file mode 100644 index 0000000..229a08d --- /dev/null +++ b/web/plugins/wato/auth.py @@ -0,0 +1,133 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Creates a includable file for the needed programming languages. +# It can be used to use the multisite permissions in other addons +# for checking permissions. +# +# This declares the following API: +# +# users_with_role(<ROLE_NAME>) +# Returns an array of usernames +# +# user_roles(<USER_NAME>) +# Returns an array of rolenames of the user +# +# user_permissions(<USER_NAME>) +# Returns an array of all permissions of the user +# +# may(<USER_NAME>, <PERMISSION>) +# Returns true/false wether or not the user is permitted + +g_auth_base_dir = defaults.var_dir + '/wato/auth' + +def parse_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 - 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 - 1) + ')' + elif isinstance(data, str) or isinstance(data, unicode): + s += '"%s"' % data + elif isinstance(data, bool): + s += data and 'true' or 'false' + else: + s += data + + return s + + +def create_php_file(users, role_permissions): + file(g_auth_base_dir + '/auth.php', 'w').write(''' +<?php +$mk_users = %s; +$mk_roles = %s; + +function user_roles($username) { + global $mk_users; + if(!isset($mk_users[$username])) + return array(); + else + return $mk_users[$username]['roles']; +} + +function user_permissions($username) { + global $mk_roles; + $permissions = array(); + + foreach(user_roles($username) AS $role) + $permissions = array_merge($permissions, $mk_roles[$role]); + + // Make the array uniq + array_flip($permissions); + array_flip($permissions); + + return $permissions; +} + +function users_with_role($want_role) { + global $mk_users, $mk_roles; + $result = array(); + foreach($mk_users AS $username => $user) { + foreach($user['roles'] AS $role) { + if($want_role == $role) { + $result[] = $username; + } + } + } + return $result; +} + +function may($username, $need_permission) { + global $mk_roles; + foreach(user_roles($username) AS $role) { + foreach($mk_roles[$role] AS $permission) { + if($need_permission == $permission) { + return true; + } + } + } + return false; +} + +?> +''' % (parse_php(users), parse_php(role_permissions))) + +def create_auth_file(users): + if not os.path.exists(g_auth_base_dir): + os.mkdir(g_auth_base_dir) + + create_php_file(users, config.get_role_permissions()) + +api.register_hook('users-saved', create_auth_file) +api.register_hook('roles-saved', lambda x: create_auth_file(load_users())) +api.register_hook('activate-changes', lambda x: create_auth_file(load_users()))

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