Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64206 discussions

Check_MK Git: check_mk: WATO: preserve/honors users only in htpasswd

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a706dadaf54b575b816665998c11c73fa69ebc92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a706dadaf54b57… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 13:51:54 2012 +0100 WATO: preserve/honors users only in htpasswd --- ChangeLog | 2 ++ web/htdocs/wato.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b3a6c2..d01304e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ * FIX: allow UTF-8 encoded permission translations * FIX: Fixed several problems in OMD apache shared mode * FIX: Do not use None$ as item when creating new rules + * FIX: Do load *all* users from htpasswd, so passwords from + users not created via WATO will not be lost. Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d574fc3..9f30be0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7005,7 +7005,11 @@ def load_users(): # Passwords are read directly from the apache htpasswd-file. # That way heroes of the command line will still be able to - # change passwords with htpasswd. + # change passwords with htpasswd. Users *only* appearing + # in htpasswd will also be loaded and assigned to the role + # they are getting according to the multisite old-style + # configuration variables. + filename = defaults.htpasswd_file if os.path.exists(filename): for line in file(filename): @@ -7018,12 +7022,12 @@ def load_users(): if id in result: result[id]["password"] = password result[id]["locked"] = locked - elif id in config.admin_users: + else: # Create entry if this is an admin user new_user = { - "roles" : [ "admin" ], + "roles" : config.roles_of_user(id), "password" : password, - "locked" : False + "locked" : False } result[id] = new_user # Other unknown entries will silently be dropped. Sorry...

12 years, 7 months

Check_MK Git: check_mk: Fixed problem with snmp_scan_functions of subchecks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d860b2df886d56bc62eca641f3e415fc02bc0e61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d860b2df886d56… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 13:21:12 2012 +0100 Fixed problem with snmp_scan_functions of subchecks --- modules/check_mk.py | 12 ++++++++---- modules/check_mk_base.py | 27 +++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b34e3af..e283474 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -630,9 +630,7 @@ def get_snmp_character_encoding(hostname): return entries[0] 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].get("snmp_info") != None + return snmp_info.get(check_type.split(".")[0]) != None def is_snmp_host(hostname): return in_binary_hostlist(hostname, snmp_hosts) @@ -741,7 +739,13 @@ def snmp_scan(hostname, ipaddress): continue elif not check_uses_snmp(check_type): continue - scan_function = check["snmp_scan_function"] + basename = check_type.split(".")[0] + # The scan function should be assigned to the basename, because + # subchecks sharing the same SNMP info of course should have + # an identical scan function. But some checks do not do this + # correctly + scan_function = snmp_scan_functions.get(check_type, + snmp_scan_functions.get(basename)) if scan_function: try: if scan_function(lambda oid: get_single_oid(hostname, ipaddress, oid)): diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 54e9374..e617656 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -305,7 +305,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): # Is this an SNMP table check? Then snmp_info specifies the OID to fetch # Please note, that if the check_type is foo.bar then we lookup the # snmp info for "foo", not for "foo.bar". - oid_info = check_info.get(check_type, {}).get("snmp_info") + oid_info = snmp_info.get(check_type.split(".")[0]) if oid_info: content = read_cache_file(cache_relpath, max_cache_age) if content: @@ -735,6 +735,7 @@ def convert_check_info(): check_function, service_description, has_perfdata, inventory_function = info if inventory_function == no_inventory_possible: inventory_function = None + basename = check_type.split(".")[0] check_info[check_type] = { "check_function" : check_function, @@ -743,10 +744,32 @@ def convert_check_info(): "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), + # Sometimes the scan function is assigned to the check_type + # rather than to the base name. + "snmp_scan_function" : + snmp_scan_functions.get(check_type, + snmp_scan_functions.get(basename)), "includes" : check_includes.get(check_type, []), "default_levels_variable" : check_default_levels.get(check_type), } + else: + # Make sure that all keys are present + info.setdefault("inventory_function", None) + info.setdefault("group", None) + info.setdefault("snmp_info", None) + info.setdefault("snmp_scan_function", None) + info.setdefault("includes", []) + info.setdefault("default_levels_variable", None) + + # Now gather snmp_info and snmp_scan_function back to the + # original arrays. Note: these information is tied to a "agent section", + # not to a check. Several checks may use the same SNMP info and scan function. + for info in check_info.values(): + basename = check_type.split(".")[0] + if info["snmp_info"] and basename not in snmp_info: + snmp_info[basename] = info["snmp_info"] + if info["snmp_scan_function"] and basename not in snmp_scan_functions: + snmp_scan_functions[basename] = info["snmp_scan_function"] # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios

12 years, 7 months

Check_MK Git: check_mk: WATO: Do not use None$ as item when creating new rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 43824429a1b0c580031a9dcb8b158aeca288dd23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43824429a1b0c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 15 08:26:59 2012 +0100 WATO: Do not use None$ as item when creating new rules --- .bugs/633 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.bugs/633 b/.bugs/633 new file mode 100644 index 0000000..08183e0 --- /dev/null +++ b/.bugs/633 @@ -0,0 +1,12 @@ +Title: Creating service rule creates explicit item None +Component: wato +Class: bug +State: done +Date: 2012-02-15 08:20:05 +Targetversion: 1.2.0 + +When creating a service rule, then always "None$" is being +used as item. There should not be an explicit item ist. + +2012-02-15 08:26:23: changed state open -> done +Fixed. diff --git a/ChangeLog b/ChangeLog index a88883a..77dbcb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * FIX: do not use isdisjoint() (was in rule editor on Lenny) * FIX: allow UTF-8 encoded permission translations * FIX: Fixed several problems in OMD apache shared mode + * FIX: Do not use None$ as item when creating new rules Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1382669..d574fc3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8250,7 +8250,7 @@ def mode_edit_ruleset(phase): if html.check_transaction(): if html.var("_new_rule"): hostname = None - item = None + item = NO_ITEM new_rule = create_rule(rulespec, hostname, item) if hostname: rules[0:0] = [new_rule] @@ -8471,7 +8471,7 @@ def mode_edit_ruleset(phase): title += _(" and %s '%s'") % (rulespec["itemname"], item) html.button("_new_host_rule", title) html.write(" " + _("or") + " ") - html.button("_new_rule", _("General rule in folder: ")) + html.button("_new_rule", _("Create rule in folder: ")) html.select("folder", folder_selection(g_root_folder)) html.write("</p>\n") html.hidden_fields()

12 years, 7 months

Check_MK Git: check_mk: Move reschedule icon to first position

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50a72721ea7d7e5e9fe9630fcace261b0a3853d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50a72721ea7d7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 15 08:29:13 2012 +0100 Move reschedule icon to first position That way this icon is better aligned --- web/plugins/icons/builtin.py | 80 +++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 9b51479..09cc393 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -75,6 +75,46 @@ multisite_icons.append({ 'paint': paint_icon_image, }) + +# +----------------------------------------------------------------------+ +# | ____ _ _ _ | +# | | _ \ ___ ___ ___| |__ ___ __| |_ _| | ___ | +# | | |_) / _ \/ __|/ __| '_ \ / _ \/ _` | | | | |/ _ \ | +# | | _ < __/\__ \ (__| | | | __/ (_| | |_| | | __/ | +# | |_| \_\___||___/\___|_| |_|\___|\__,_|\__,_|_|\___| | +# | | +# +----------------------------------------------------------------------+ + +def paint_reschedule(what, row, tags, custom_vars): + # Reschedule button + if (row[what + "_active_checks_enabled"] == 1 + or row[what + '_check_command'].startswith('check_mk-')) \ + and config.may('action.reschedule'): + + servicedesc = '' + wait_svc = '' + icon = 'icon_reload' + txt = _('Reschedule an immediate check of this %s') % _(what) + + if what == 'service': + servicedesc = row['service_description'] + wait_svc = servicedesc + + # Use Check_MK service for cmk based services + if row[what + '_check_command'].startswith('check_mk-'): + servicedesc = 'Check_MK' + icon = 'icon_reload_cmk' + txt = _('Reschedule an immediate check of the \'Check_MK\' service') + + return '<a href=\"javascript:void(0);\" ' \ + 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ + '<img class=icon title="%s" src="images/%s.gif" /></a>' % \ + (row["site"], row["host_name"], servicedesc, wait_svc, txt, icon) + +multisite_icons.append({ + 'columns': [ 'active_checks_enabled' ], + 'paint': paint_reschedule, +}) # +----------------------------------------------------------------------+ # | _ _ _ _ | # | / \ ___| | ___ __ _____ _| | ___ __| | __ _ ___ | @@ -409,43 +449,3 @@ def paint_aggregations(what, row, tags, custom_vars): multisite_icons.append({ 'paint': paint_aggregations, }) - -# +----------------------------------------------------------------------+ -# | ____ _ _ _ | -# | | _ \ ___ ___ ___| |__ ___ __| |_ _| | ___ | -# | | |_) / _ \/ __|/ __| '_ \ / _ \/ _` | | | | |/ _ \ | -# | | _ < __/\__ \ (__| | | | __/ (_| | |_| | | __/ | -# | |_| \_\___||___/\___|_| |_|\___|\__,_|\__,_|_|\___| | -# | | -# +----------------------------------------------------------------------+ - -def paint_reschedule(what, row, tags, custom_vars): - # Reschedule button - if (row[what + "_active_checks_enabled"] == 1 - or row[what + '_check_command'].startswith('check_mk-')) \ - and config.may('action.reschedule'): - - servicedesc = '' - wait_svc = '' - icon = 'icon_reload' - txt = _('Reschedule an immediate check of this %s') % _(what) - - if what == 'service': - servicedesc = row['service_description'] - wait_svc = servicedesc - - # Use Check_MK service for cmk based services - if row[what + '_check_command'].startswith('check_mk-'): - servicedesc = 'Check_MK' - icon = 'icon_reload_cmk' - txt = _('Reschedule an immediate check of the \'Check_MK\' service') - - return '<a href=\"javascript:void(0);\" ' \ - 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ - '<img class=icon title="%s" src="images/%s.gif" /></a>' % \ - (row["site"], row["host_name"], servicedesc, wait_svc, txt, icon) - -multisite_icons.append({ - 'columns': [ 'active_checks_enabled' ], - 'paint': paint_reschedule, -})

12 years, 7 months

Check_MK Git: check_mk: FIX: handle buggy SNMP devices with non-consecutive OIDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5003de7877884dfd5edd9ae86187dec834b1a8a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5003de7877884d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 10:59:59 2012 +0100 FIX: handle buggy SNMP devices with non-consecutive OIDS --- ChangeLog | 2 ++ modules/snmp.py | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77dbcb6..0f3cb68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ into another. * Enable new check registration API (not yet used in checks) * FIX: fix handling of prefix-tag rules (+), needed for WATO + * FIX: handle buggy SNMP devices with non-consecutive OIDS + (such as BINTEC routers) WATO: * Distributed WATO: Made all url calls using curl now diff --git a/modules/snmp.py b/modules/snmp.py index 8e17c11..58c41ce 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -256,9 +256,10 @@ def get_snmp_table(hostname, ip, oid_info): # an endoid differs empty values are added until the hole is filled for o, value in column: eo = extract_end_oid(fetchoid, o) - while i < len(endoids) and endoids[i] != eo: - new_column.append("") # (beginoid + '.' +endoids[i], "" ) ) - i += 1 + if len(column) != len(endoids): + while i < len(endoids) and endoids[i] != eo: + new_column.append("") # (beginoid + '.' +endoids[i], "" ) ) + i += 1 new_column.append(value) i += 1 @@ -280,6 +281,7 @@ def get_snmp_table(hostname, ip, oid_info): return info + # SNMP-Helper functions used in various checks def check_snmp_misc(item, params, info):

12 years, 7 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: c00dac7bcb5ffb60091ee4a6f5de84332eb01d41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c00dac7bcb5ffb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 11:00:58 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: FIX: Fixed wrong redirection after login in some cases

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc305c595a42eac549494e39413770631278c974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc305c595a42ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 10:56:13 2012 +0100 FIX: Fixed wrong redirection after login in some cases --- ChangeLog | 1 + web/htdocs/login.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a88883a..9377a6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ commands are possible * The login mask honors the default_language definition now * check_bi_local.py: works now with cookie based authentication + * FIX: Fixed wrong redirection after login in some cases 1.1.13i3: Core, Setup, etc.: diff --git a/web/htdocs/login.py b/web/htdocs/login.py index f3176e7..f36aa5c 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -173,7 +173,7 @@ def do_login(): # Use redirects for URLs or simply execute other handlers for # mulitsite modules - if '/' in origtarget: + if '/' in origtarget or '?' in origtarget: html.set_http_header('Location', origtarget) raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY else: @@ -221,7 +221,7 @@ def normal_login_page(): origtarget = html.var('_origtarget', '') if not origtarget and not html.req.myfile == 'login': - origtarget = html.req.uri + origtarget = html.makeuri([]) html.write("<div id=login>") html.write("<div id=logo></div>")

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0654, #0655

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5ad5aa97aefc1a6156d73f21849f2f08b28bbca8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ad5aa97aefc1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 10:55:38 2012 +0100 Updated bug entries #0654, #0655 --- .bugs/654 | 10 ++++++++++ .bugs/655 | 8 ++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/654 b/.bugs/654 new file mode 100644 index 0000000..770b51a --- /dev/null +++ b/.bugs/654 @@ -0,0 +1,10 @@ +Title: View editor mixes up views on editing +Component: multisite +State: open +Date: 2012-02-15 08:48:38 +Targetversion: future +Class: bug + +We had a strange problem. We had a view named "offline_locations" using the "All services" +table. Then we added a "offline_locations1" view which used the "All hosts" table. +BUt after saving the second view had the same options as the first view. diff --git a/.bugs/655 b/.bugs/655 new file mode 100644 index 0000000..de0fa8b --- /dev/null +++ b/.bugs/655 @@ -0,0 +1,8 @@ +Title: "Table" preview styles broken in view editor preview +Component: multisite +State: open +Date: 2012-02-15 08:51:28 +Targetversion: future +Class: bug + +The background colors are broken in the view editor.

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

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0652

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8807f248f9370486be9942d7a3afa9388cfd262f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8807f248f93704… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 15:56:20 2012 +0100 Updated bug entries #0652 --- .bugs/652 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/652 b/.bugs/652 new file mode 100644 index 0000000..fc74f09 --- /dev/null +++ b/.bugs/652 @@ -0,0 +1,9 @@ +Title: Rulesets: not configurable with "secondary tags" +Component: wato +State: open +Date: 2012-02-14 15:54:52 +Targetversion: future +Class: feature + +When e.g. the "snmp" tag is added to the hosts as implicit tag it can not +be used in rulesets.

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits