Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: check_bi_local.py: support cookie based login

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 385d5eeb5f3c5a8cf73bc12ca2301a6370880678 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=385d5eeb5f3c5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 14 12:40:50 2012 +0100 check_bi_local.py: support cookie based login --- ChangeLog | 1 + doc/treasures/check_bi_local.py | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d28249..75803ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * Views: Only show the commands and row selection options for views where commands are possible * The login mask honors the default_language definition now + * check_bi_local.py: works now with cookie based authentication 1.1.13i3: Core, Setup, etc.: diff --git a/doc/treasures/check_bi_local.py b/doc/treasures/check_bi_local.py index dffb84b..f0a783a 100755 --- a/doc/treasures/check_bi_local.py +++ b/doc/treasures/check_bi_local.py @@ -32,22 +32,42 @@ # 3. Add a correct url_prefix (OMD site and slash) # user and password with read access to Multisite. -user = "omdadmin" -password = "omd" url_prefix = "" # non-OMD installations # url_prefix = "mysite/" # with OMD site name +# HTTP Basic Auth +user = "omdadmin" +password = "omd" +# Alternatively: Multisite Cookie authentication: +# If you are using Cookie base authentication, then +# login with your browser and get the cookie content +# of auth_... from your browser settings and put +# it here: +# cookie = "omdadmin:1329218457.69:16b1d572fe059e00a89b7f24592733f2" + + # Do not change anything below import os, sys -url = 'http://%s:%s@localhost/%scheck_mk/view.py?view_name=aggr_summary&output_format=python' % \ - (user, password, url_prefix) +if cookie: + logininfo = "" + opts = "-b 'auth_=%s'" % cookie +else: + logininfo = "%s:%s@" % (user, password) + opts = "" + +url = 'http://%slocalhost/%scheck_mk/view.py?view_name=aggr_summary&output_format=python' % \ + (logininfo, url_prefix) try: - data = eval(os.popen("curl --silent '%s'" % url).read()) + command = "curl --silent %s '%s'" % (opts, url) + output = os.popen(command).read() + data = eval(output) except: - sys.stderr.write("Invalid output from URL %s\n" % url) + sys.stderr.write("Invalid output from URL %s:\n" % url) + sys.stderr.write(output) + sys.stderr.write("Command was: %s\n" % command) sys.exit(1) states = {

12 years, 4 months

Check_MK Git: check_mk: Added newline to auth.secret file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59f3ba21d835df77e793729e36d57e3aca1b27c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59f3ba21d835df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 14 12:40:29 2012 +0100 Added newline to auth.secret file --- web/htdocs/login.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index a1a3f8c..670046e 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -75,7 +75,7 @@ def load_secret(): secret_path = '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) if not os.path.exists(secret_path): secret = md5.md5(str(time.time())).hexdigest() - file(secret_path, 'w').write(secret) + file(secret_path, 'w').write(secret + "\n") else: secret = file(secret_path).read().strip() return secret

12 years, 4 months

Check_MK Git: check_mk: Fix some problems with new check registration API

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec41bd630e6698ff72ee018d1720fdd31d50ebbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec41bd630e6698… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 13 09:00:24 2012 +0100 Fix some problems with new check registration API --- checks/cpu | 19 +++++++++++++++---- checks/df | 15 +++++++++------ checks/mem | 11 ++++++++--- modules/check_mk.py | 46 ++++++++++++++++++++++++++++------------------ modules/check_mk_base.py | 21 +++++++++++---------- 5 files changed, 71 insertions(+), 41 deletions(-) diff --git a/checks/cpu b/checks/cpu index e2bb254..5a42b0a 100644 --- a/checks/cpu +++ b/checks/cpu @@ -74,8 +74,19 @@ def check_cpu_threads(item, params, info): else: return (0, "OK - %d threads" % (nthreads,), perfdata) -check_info['cpu.loads'] = (check_cpu_load, "CPU load", 1, inventory_cpu_load ) -checkgroup_of['cpu.loads'] = "cpu_load" +check_info["cpu.loads"] = { + "check_function" : check_cpu_load, + "inventory_function" : inventory_cpu_load, + "service_description" : "CPU load", + "has_perfdata" : True, + "group" : "cpu_load", +} + +check_info["cpu.threads"] = { + "check_function" : check_cpu_threads, + "inventory_function" : inventory_cpu_threads, + "service_description" : "Number of threads", + "has_perfdata" : True, + "group" : "threads", +} -check_info['cpu.threads'] = (check_cpu_threads, "Number of threads", 1, inventory_cpu_threads) -checkgroup_of['cpu.threads'] = "threads" diff --git a/checks/df b/checks/df index a53d4fc..7664b85 100644 --- a/checks/df +++ b/checks/df @@ -31,8 +31,6 @@ # /dev/sda1 reiserfs 256666 16052 227362 7% /boot # /dev/mapper/mirrored-database ext3 20642428 1027112 19405604 6% /mirrored/database -check_includes['df'] = [ "df.include" ] - def inventory_df(info): inventory = [] for line in info: @@ -81,7 +79,12 @@ def check_df(mountpoint, params, info): return df_check_filesystem(g_hostname, mountpoint, size_mb, avail_mb, params) - -check_info['df'] = (check_df, "fs_%s", 1, inventory_df) -check_default_levels['df'] = "filesystem_default_levels" -checkgroup_of['df'] = "filesystem" +check_info['df'] = { + "check_function" : check_df, + "inventory_function" : inventory_df, + "service_description" : "fs_%s", + "has_perfdata" : True, + "group" : "df", + "default_levels_variable" : "filesystem_default_levels", + "includes" : [ "df.include" ], +} diff --git a/checks/mem b/checks/mem index 92112aa..3e5c172 100644 --- a/checks/mem +++ b/checks/mem @@ -120,9 +120,14 @@ def check_mem_used(item, params, info): return (0, 'OK - %s' % infotext, perfdata) -check_info['mem.used'] = (check_mem_used, "Memory used", 1, inventory_mem_used) -check_config_variables.append("mem_extended_perfdata") -checkgroup_of["mem.used"] = "memory" +check_info['mem.used'] = { + "check_function" : check_mem_used, + "inventory_function" : inventory_mem_used, + "service_description" : "Memory used", + "has_perfdata" : True, + "group" : "memory", + "check_config_variables" : [ "mem_extended_perfdata" ], +} # +----------------------------------------------------------------------+ diff --git a/modules/check_mk.py b/modules/check_mk.py index 5bf4626..a8c246b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -633,7 +633,7 @@ def get_snmp_character_encoding(hostname): def check_uses_snmp(check_type): base_check_name = check_type.split(".")[0] return base_check_name in check_info and \ - check_info[base_check_name]["snmp_info"] != None + check_info[base_check_name].get("snmp_info") != None def is_snmp_host(hostname): return in_binary_hostlist(hostname, snmp_hosts) @@ -2395,15 +2395,17 @@ no_inventory_possible = None # Do we need to load the SNMP module? This is the case, if the host # has at least one SNMP based check. Also collect the needed check - # types. + # types and sections. need_snmp_module = False - needed_types = set([]) - for checktype, item, param, descr, aggr in check_table: - if checktype not in check_info: - sys.stderr.write('Warning: Ignoring missing check %s.\n' % checktype) + needed_check_types = set([]) + needed_sections = set([]) + for check_type, item, param, descr, aggr in check_table: + if check_type not in check_info: + sys.stderr.write('Warning: Ignoring missing check %s.\n' % check_type) continue - needed_types.add(checktype.split(".")[0]) - if check_uses_snmp(checktype): + needed_sections.add(check_type.split(".")[0]) + needed_check_types.add(check_type) + if check_uses_snmp(check_type): need_snmp_module = True if need_snmp_module: @@ -2416,9 +2418,9 @@ no_inventory_possible = None # We need to include all those plugins that are referenced in the host's # check table filenames = [] - for checktype in needed_types: + for check_type in needed_check_types: # Add library files needed by check (also look in local) - for lib in check_includes.get(checktype, []): + for lib in check_info[check_type].get("includes", []): if local_checks_dir and os.path.exists(local_checks_dir + "/" + lib): to_add = local_checks_dir + "/" + lib else: @@ -2426,11 +2428,12 @@ no_inventory_possible = None if to_add not in filenames: filenames.append(to_add) - # Now add check file itself - path = find_check_plugin(checktype) + # Now add check file itself (convert check_type to section) + section = check_type.split(".")[0] + path = find_check_plugin(section) if not path: - raise MKGeneralException("Cannot find plugin for check type %s (missing file %s/%s)\n" % \ - (checktype, checks_dir, checktype)) + raise MKGeneralException("Cannot find check file %s needed for check type %s" % \ + (section, check_type)) if path not in filenames: filenames.append(path) @@ -2521,6 +2524,11 @@ no_inventory_possible = None for var in check_config_variables: output.write("%s = %r\n" % (var, eval(var))) + # The same for those checks that use the new API + for check_type in needed_check_types: + for var in check_info[check_type].get("check_config_variables", []): + output.write("%s = %r\n" % (var, eval(var))) + # perform actual check output.write("do_check(%r, %r)\n" % (hostname, ipaddress)) output.close() @@ -4000,8 +4008,10 @@ def read_config_files(with_autochecks=True, with_conf_d=True): global vars_before_config, final_mk, local_mk, checks # Initialize dictionary-type default levels variables - for varname in check_default_levels.values(): - globals()[varname] = {} + for check in check_info.values(): + def_var = check.get("default_levels_variable") + if def_var: + globals()[def_var] = {} # Create list of all files to be included if with_conf_d: @@ -4090,7 +4100,7 @@ def read_config_files(with_autochecks=True, with_conf_d=True): # at least those keys defined in the factory # settings are present in the parameters if type(params) == dict: - def_levels_varname = check_default_levels.get(checktype) + def_levels_varname = check_info[checktype].get("default_levels_variable") if def_levels_varname: for key, value in factory_settings.get(def_levels_varname, {}).items(): if key not in params: @@ -4159,7 +4169,7 @@ def read_config_files(with_autochecks=True, with_conf_d=True): # the values code in autochecks (given as parameter params) def compute_check_parameters(host, checktype, item, params): # Handle dictionary based checks - def_levels_varname = check_default_levels.get(checktype) + def_levels_varname = check_info[checktype].get("default_levels_variable") if def_levels_varname: vars_before_config.add(def_levels_varname) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index fbdccc4..54e9374 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -730,21 +730,22 @@ def check_unimplemented(checkname, params, info): return (3, 'UNKNOWN - Check not implemented') def convert_check_info(): - for checkname, info in check_info.items(): + for check_type, info in check_info.items(): if type(info) != dict: check_function, service_description, has_perfdata, inventory_function = info if inventory_function == no_inventory_possible: inventory_function = None - check_info[checkname] = { - "check_function" : check_function, - "service_description" : service_description, - "has_perfdata" : not not has_perfdata, - "inventory_function" : inventory_function, - "group" : checkgroup_of.get(checkname), - "snmp_info" : snmp_info.get(checkname), - "snmp_scan_function" : snmp_scan_functions.get(checkname), - "includes" : check_includes.get(checkname, []), + check_info[check_type] = { + "check_function" : check_function, + "service_description" : service_description, + "has_perfdata" : not not has_perfdata, + "inventory_function" : inventory_function, + "group" : checkgroup_of.get(check_type), + "snmp_info" : snmp_info.get(check_type), + "snmp_scan_function" : snmp_scan_functions.get(check_type), + "includes" : check_includes.get(check_type, []), + "default_levels_variable" : check_default_levels.get(check_type), } # Loops over all checks for a host, gets the data, calls the check

12 years, 4 months

Check_MK Git: check_mk: FIX: fix prefix-tags rules (needed for WATO)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d5507f9df0a304c299cc30367118c6a4182af717 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5507f9df0a304… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 13 09:16:48 2012 +0100 FIX: fix prefix-tags rules (needed for WATO) WATO rules on folders did not apply to subfolders except rules for the main folder. --- ChangeLog | 1 + modules/check_mk.py | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0983113..1df497f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ information from one monitoring core and importing this into another. * Enable new check registration API (not yet used in checks) + * FIX: fix handling of prefix-tag rules (+), needed for WATO WATO: * Distributed WATO: Made all url calls using curl now diff --git a/modules/check_mk.py b/modules/check_mk.py index a8c246b..b34e3af 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -480,15 +480,14 @@ def hosttags_match_taglist(hosttags, required_tags): for t in hosttags: if t.startswith(tag): matches = True - if not matches: - return False + break else: - if (tag in hosttags) == negate: - return False + matches = (tag in hosttags) - if (tag in hosttags) == negate: + if matches == negate: return False + return True # +----------------------------------------------------------------------+

12 years, 4 months

Check_MK Git: check_mk: Fixed type in snapin description

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 999332227429cfbac8d2ac72b58bce6ab7085f98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=999332227429cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 13 11:02:19 2012 +0100 Fixed type in snapin description --- web/plugins/sidebar/shipped.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 03fa20c..1679bdd 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -358,7 +358,7 @@ def render_hostmatrix(): sidebar_snapins["hostmatrix"] = { "title" : _("Host Matrix"), - "description" : _("A matrix showing s colored square for each host"), + "description" : _("A matrix showing a colored square for each host"), "author" : "Mathias Kettner", "render" : render_hostmatrix, "allowed" : [ "user", "admin", "guest" ],

12 years, 4 months

Check_MK Git: check_mk: Prepare new check registration API

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9980e8e46f7b42cb7046f58f97698631713353b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9980e8e46f7b42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 12 18:12:40 2012 +0100 Prepare new check registration API --- ChangeLog | 1 + modules/automation.py | 16 ++++---- modules/check_mk.py | 104 +++++++++++++++++++++------------------------ modules/check_mk_base.py | 36 ++++++++++++---- 4 files changed, 86 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9980e8e46f…

12 years, 4 months

Check_MK Git: check_mk: FIX: fix inventory of f5_bigip_temp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1cd6c9df47ad1e9e1d7e0af91e97bfc8117ec0cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cd6c9df47ad1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 12 18:10:10 2012 +0100 FIX: fix inventory of f5_bigip_temp --- ChangeLog | 1 + checks/f5_bigip_temp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8548556..33f32fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ on HP-UX. * if/if64: inventory also picks up type 62 (fastEther). This is needed on Cisco WLC 21xx series (thanks to Ralf Ertzinger) + * FIX: fix inventory of f5_bigip_temp Multisite: * Added several missing localization stringsw diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index 80e82ce..83fbfcb 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -59,8 +59,7 @@ def f5_bigip_temp_genitem(info): def inventory_f5_bigip_temp(info): inventory = [] for sensor in f5_bigip_temp_genitem(info): - inventory.append([sensor[0], nom_temp]) - + inventory.append((sensor[0], sensor[2])) return inventory

12 years, 4 months

Check_MK Git: check_mk: Showing inventory icon only when permitted

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9fc6f8b40db77203ad75573999c21c1818b12dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9fc6f8b40db77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 16:03:48 2012 +0100 Showing inventory icon only when permitted --- web/htdocs/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index af72f16..3fc2047 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1204,7 +1204,8 @@ def show_hosts(folder): html.write("<td class=buttons>") html.icon_button(edit_url, _("Edit the properties of this host"), "edit") - html.icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") + if check_host_permissions(hostname, False) == True: + html.icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") if config.may("wato.manage_hosts"): html.icon_button(clone_url, _("Create a clone of this host"), "insert") html.icon_button(delete_url, _("Delete this host"), "delete")

12 years, 4 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: dae7a2dfc28d229abb303c4584a6279708c077db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dae7a2dfc28d22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 16:03:57 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: The login mask honors the default_language definition now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 071e2517fb70fd1a5f28442ea78df188391f9ff0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=071e2517fb70fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 11:59:34 2012 +0100 The login mask honors the default_language definition now --- .bugs/603 | 7 +++++-- .bugs/618 | 7 +++++-- ChangeLog | 1 + web/htdocs/config.py | 2 +- web/htdocs/index.py | 4 ++++ 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.bugs/603 b/.bugs/603 index 3c41bf2..a5c69c4 100644 --- a/.bugs/603 +++ b/.bugs/603 @@ -1,9 +1,9 @@ Title: default_language not honored by login maski Component: multisite -State: open +Class: bug +State: done Date: 2012-01-25 09:58:35 Targetversion: 1.2.0 -Class: bug I've translated "Username" and "Password" into 'de'. Then I've set default_language = 'de' in multisite.mk. Texts are not @@ -11,3 +11,6 @@ translated in the Cookie based login form, even after are restart of Apache. The I login, set my user language to 'de' and logout. Now the login screen is in German. After a logout the login screen is in German. Restarting Apache now switches it back to english. + +2012-02-10 11:59:32: changed state open -> done +Has just been implemented. diff --git a/.bugs/618 b/.bugs/618 index 8bf2335..cf78a5e 100644 --- a/.bugs/618 +++ b/.bugs/618 @@ -1,9 +1,9 @@ Title: Hosts Snapin berücksichtigt Nutzer Berechtigungen nicht Component: multisite -State: open +Class: bug +State: done Date: 2012-01-18 10:25:53 Targetversion: 1.2.0 -Class: bug Ich habe gerade eine leere Site mit 2 Hosts in 2 Foldern angelegt. Auf den einen ist der Nutzer berechtigt, auf den anderen nicht. Im Hosts Snapin sehe ich troztem beide @@ -13,3 +13,6 @@ Lösungsmöglichkeit: Das Snapin nur noch für die Statusgui Navigation benutzen und dann via Livestatus Query die Anzahl der Hosts herausfinden. + +2012-02-10 11:53:14: changed state open -> done +Has already been solved. The hosts snapin has been recoded. diff --git a/ChangeLog b/ChangeLog index c7feb79..ce9ea0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * Chrome: Fixed styling problem of foldertree snapin * Views: Only show the commands and row selection options for views where commands are possible + * The login mask honors the default_language definition now 1.1.13i3: Core, Setup, etc.: diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 13c04e2..8273b6e 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -304,7 +304,7 @@ def login(u): def get_language(default = None): if default == None: default = default_language - return user.get('language', default) + return user and user.get('language', default) or default def roles_of_user(user): # Make sure, builtin roles are present, even if not modified diff --git a/web/htdocs/index.py b/web/htdocs/index.py index d6b0fd3..25916e5 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -240,6 +240,10 @@ def handler(req, profiling = True): # While api call don't show the login dialog raise MKUnauthenticatedException(_('You are not authenticated.')) + # Initialize the i18n for the login dialog. This might be overridden + # later after user login + load_language(html.var("lang", config.get_language())) + # After auth check the regular page can be shown result = login.page_login() if type(result) == tuple:

12 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012