Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: Removed obsolete comments

by Mathias Kettner

Module: check_mk Branch: master Commit: 50c06590dea21667435a1877cb8095958bbdca57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50c06590dea216… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 1 13:04:00 2015 +0200 Removed obsolete comments --- checks/allnet_ip_sensoric | 1 - checks/esx_vsphere_objects | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/checks/allnet_ip_sensoric b/checks/allnet_ip_sensoric index d912ad6..69e6109 100644 --- a/checks/allnet_ip_sensoric +++ b/checks/allnet_ip_sensoric @@ -126,7 +126,6 @@ def inventory_allnet_ip_sensoric_tension(info): for sensor in parsed.keys(): if "function" in parsed[sensor].keys() and parsed[sensor]["function"] == "12": item = allnet_ip_sensoric_compose_item(sensor, parsed[sensor]) - #print "sensor: %s, item: %s" % (sensor, item) inventory.append( (item, None) ) return inventory diff --git a/checks/esx_vsphere_objects b/checks/esx_vsphere_objects index d53f777..1f82441 100644 --- a/checks/esx_vsphere_objects +++ b/checks/esx_vsphere_objects @@ -135,20 +135,3 @@ check_info['esx_vsphere_objects.count'] = { "service_description" : "Object count", "has_perfdata" : True, } -# .--Cluster-------------------------------------------------------------. -# | ____ _ _ | -# | / ___| |_ _ ___| |_ ___ _ __ | -# | | | | | | | / __| __/ _ \ '__| | -# | | |___| | |_| \__ \ || __/ | | -# | \____|_|\__,_|___/\__\___|_| | -# | | -# '----------------------------------------------------------------------' - -# def check_esx_vsphere_objects_cluster(_no_item, params, info): -# print info -# return 3, "MIST" -# -# check_info['esx_vsphere_objects.cluster'] = { -# "check_function" : check_esx_vsphere_objects_cluster, -# "service_description" : "HostSystem SUMMARY", -# }

9 years, 2 months

Check_MK Git: check_mk: wut_webtherm: removed obsolete print command

by Mathias Kettner

Module: check_mk Branch: master Commit: 6414a2e254e7c650f41138dccf0259af4efa41e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6414a2e254e7c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 1 13:03:12 2015 +0200 wut_webtherm: removed obsolete print command --- checks/wut_webtherm | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 262087c..9b59278 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -41,7 +41,6 @@ factory_settings["wut_webtherm_defaultlevels"] = { } def inventory_webtherm(info): - print info # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1, 16.1 or 18.1 depending on MIB variant. We chop # of the first part in order to get independent of that. for line in info:

9 years, 2 months

Check_MK Git: check_mk: #2372 FIX Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner

by Mathias Kettner

Module: check_mk Branch: master Commit: 2de87f26e9e0de857e28bebc9933d47759ba0296 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2de87f26e9e0de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 1 12:25:06 2015 +0200 #2372 FIX Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner --- .werks/2372 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/2372 b/.werks/2372 new file mode 100644 index 0000000..daeafd9 --- /dev/null +++ b/.werks/2372 @@ -0,0 +1,10 @@ +Title: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435746279 + + diff --git a/ChangeLog b/ChangeLog index 928e332..ebce334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 2386 SEC: Fixed possible XSS on WATO rule edit page... * 2344 FIX: Improved validation of selected rules when editing BI aggregations... * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules + * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 61dcdf3..4fcf640 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -365,6 +365,9 @@ def need_sidebar_reload(): def lock_exclusive(): aquire_lock(defaults.default_config_dir + "/multisite.mk") +def unlock_exclusive(): + release_lock(defaults.default_config_dir + "/multisite.mk") + def git_command(args): encoded_args = " ".join([ a.encode("utf-8") for a in args ]) @@ -3756,7 +3759,11 @@ def mode_bulk_inventory(phase): arguments = [ "@scan" ] + arguments if not html.get_checkbox("ignore_errors"): arguments = [ "@raiseerrors" ] + arguments + + unlock_exclusive() # Avoid freezing WATO when hosts do not respond timely counts, failed_hosts = check_mk_automation(site_id, "inventory", arguments) + lock_exclusive() + load_hosts(folder) # sum up host individual counts to have a total count sum_counts = [ 0, 0, 0, 0 ] # added, removed, kept, new

9 years, 2 months

Check_MK Git: check_mk: wut_webtherm: Moved default params to factory_settings dict

by Konstantin Büttner

Module: check_mk Branch: master Commit: b3232c423bd08f3395368583ee14c56832095787 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3232c423bd08f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 1 12:15:09 2015 +0200 wut_webtherm: Moved default params to factory_settings dict --- checks/wut_webtherm | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index e45231a..262087c 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -24,9 +24,24 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -wut_webtherm_defaultlevels = (30, 35) +def detect_webtherm(oid): + return oid(".1.3.6.1.2.1.1.2.0") in \ + [ ".1.3.6.1.4.1.5040.1.2.1", + ".1.3.6.1.4.1.5040.1.2.2", + ".1.3.6.1.4.1.5040.1.2.3", + ".1.3.6.1.4.1.5040.1.2.6", + ".1.3.6.1.4.1.5040.1.2.7", + ".1.3.6.1.4.1.5040.1.2.8", + ".1.3.6.1.4.1.5040.1.2.9", + ".1.3.6.1.4.1.5040.1.2.16", + ".1.3.6.1.4.1.5040.1.2.18" ] + +factory_settings["wut_webtherm_defaultlevels"] = { + "levels" : (30, 35), +} def inventory_webtherm(info): + print info # line[0] is 1.1, 2.1, 3.1, 6.1, 8.1, 16.1 or 18.1 depending on MIB variant. We chop # of the first part in order to get independent of that. for line in info: @@ -36,7 +51,7 @@ def inventory_webtherm(info): # Maybe humidity if temp > 75: continue - yield (line[0].split(".")[1], "wut_webtherm_defaultlevels") + yield line[0].split(".")[1], {} def check_webtherm(item, params, info): for line in info: @@ -44,21 +59,11 @@ def check_webtherm(item, params, info): temp = float(line[1].replace(",", ".")) return check_temperature(temp, params) -def detect_webtherm(oid): - return oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.5040.1.2.1", - ".1.3.6.1.4.1.5040.1.2.2", - ".1.3.6.1.4.1.5040.1.2.3", - ".1.3.6.1.4.1.5040.1.2.6", - ".1.3.6.1.4.1.5040.1.2.7", - ".1.3.6.1.4.1.5040.1.2.8", - ".1.3.6.1.4.1.5040.1.2.9", - ".1.3.6.1.4.1.5040.1.2.16", - ".1.3.6.1.4.1.5040.1.2.18" ] check_info["wut_webtherm"] = { - 'check_function' : check_webtherm, + 'default_levels_variable' : "wut_webtherm_defaultlevels", 'inventory_function' : inventory_webtherm, + 'check_function' : check_webtherm, 'service_description' : 'Temperature %s', 'has_perfdata' : True, 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2',

9 years, 2 months

Check_MK Git: check_mk: apc_humidity: Do not discover sensors that report -1%

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6b0eed1048b7759deb4fc2c2b496f4aaec2b37a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b0eed1048b775… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 1 11:07:40 2015 +0200 apc_humidity: Do not discover sensors that report -1% --- checks/apc_humidity | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/apc_humidity b/checks/apc_humidity index 575a7ee..4b4dd67 100644 --- a/checks/apc_humidity +++ b/checks/apc_humidity @@ -29,7 +29,9 @@ apc_humidity_default_levels = (35, 40, 60, 65) def inventory_apc_humidity(info): - return [(line[0], "apc_humidity_default_levels") for line in info] + for line in info: + if int(line[1]) >= 0: + yield line[0], "apc_humidity_default_levels" def check_apc_humidity(item, params, info): for line in info:

9 years, 2 months

Check_MK Git: check_mk: #2319 FIX winperf_if: fixed exception when using windows_if.ps1 in an old windows version

by Andreas Boesl

Module: check_mk Branch: master Commit: 705bbeee0429af9ab811336eefca3401efa07db9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=705bbeee0429af… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 1 11:05:42 2015 +0200 #2319 FIX winperf_if: fixed exception when using windows_if.ps1 in an old windows version The windows_if.ps1 plugin does not provide all informations on windows installations older than Windows 2003. The winperf_if check was unable to work without the missing data. This has been fixed. --- .werks/2319 | 12 ++++++++++++ ChangeLog | 1 + checks/winperf_if | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2319 b/.werks/2319 new file mode 100644 index 0000000..fcbc229 --- /dev/null +++ b/.werks/2319 @@ -0,0 +1,12 @@ +Title: winperf_if: fixed exception when using windows_if.ps1 in an old windows version +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435741362 + +The windows_if.ps1 plugin does not provide all informations on windows installations +older than Windows 2003. The winperf_if check was unable to work without the missing data. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 4bb2a62..928e332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 2383 FIX: FreeBSD Agent: Fixed handling <<<ps>>> section when jailed * 2368 FIX: ucd_cpu_load: fix exception in case of dump SNMP agent sending 12,540000 instead of 12.540000 * 2318 FIX: windows agent: no longer crashes when a cached plugin has several hundred sections... + * 2319 FIX: winperf_if: fixed exception when using windows_if.ps1 in an old windows version... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/winperf_if b/checks/winperf_if index 105fad8..8b982a0 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -142,7 +142,7 @@ def convert_winperf_if(info): # it may happen that there are non-existing interfaces # with the same nic_name as an active one (at least on HP # hardware) - if as_dict["NetConnectionStatus"] == "4": + if as_dict.get("NetConnectionStatus") == "4": continue # Exact match

9 years, 2 months

Check_MK Git: check_mk: #2393 FIX Fixed exception "user_confdir" not set in case of exceptions during login

by Lars Michelsen

Module: check_mk Branch: master Commit: cedab164d3d763f65447a1627067f9aeda361b2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cedab164d3d763… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 1 10:23:41 2015 +0200 #2393 FIX Fixed exception "user_confdir" not set in case of exceptions during login --- .werks/2393 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/config.py | 16 +++++++++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.werks/2393 b/.werks/2393 new file mode 100644 index 0000000..0fc3207 --- /dev/null +++ b/.werks/2393 @@ -0,0 +1,10 @@ +Title: Fixed exception "user_confdir" not set in case of exceptions during login +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435738995 + + diff --git a/ChangeLog b/ChangeLog index 90509c6..4bb2a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... * 2380 FIX: Custom Host Notes painter was showing service notes when used in service based views + * 2393 FIX: Fixed exception "user_confdir" not set in case of exceptions during login WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index be00813..c9e7c0c 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -58,6 +58,7 @@ except NameError: user = None user_id = None +user_confdir = None builtin_role_ids = [ "user", "admin", "guest" ] # hard coded in various permissions user_role_ids = [] @@ -267,13 +268,16 @@ def login(u): user_permissions["wato.users"] = True # ... with access to user management # Prepare users' own configuration directory - global user_confdir - user_confdir = config_dir + "/" + user_id - make_nagios_directory(user_confdir) + set_user_confdir(user_id) # load current on/off-switching states of sites read_site_config() +def set_user_confdir(user_id): + global user_confdir + user_confdir = config_dir + "/" + user_id + make_nagios_directory(user_confdir) + def get_language(default = None): if default == None: default = default_language @@ -401,6 +405,12 @@ def save_stars(stars): # Helper functions def load_user_file(name, deflt, lock = False): + # In some early error during login phase there are cases where it might + # happen that a user file is requested byt the user_confdir is not yet + # set. We have all information to set it, then do it. + if user_confdir == None: + set_user_confdir(name) + path = user_confdir + "/" + name + ".mk" try: if lock:

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015