Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

watolib: Cleaned up missing but referenced methods/ attributes in abstract classes

by Lars Michelsen

Module: check_mk Branch: master Commit: de45e622d6b28cd6c45c822201adefe0e0dbf247 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de45e622d6b28c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 16:34:50 2016 +0100 watolib: Cleaned up missing but referenced methods/attributes in abstract classes --- web/htdocs/watolib.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b74ebd2..d689ec0 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -316,6 +316,10 @@ class WithPermissions(object): return self.reason_why_user_may_not(config.user_id, how) + def user_needs_permission(self, user_id, how): + raise NotImplementedError("Subclasses has to implement this!") + + def need_permission(self, how): self.user_needs_permission(config.user_id, how) @@ -342,6 +346,7 @@ class WithPermissions(object): class WithPermissionsAndAttributes(WithPermissions): def __init__(self): WithPermissions.__init__(self) + self._attributes = {} # .--------------------------------------------------------------------. # | ATTRIBUTES | @@ -363,6 +368,10 @@ class WithPermissionsAndAttributes(WithPermissions): return attrname in self.attributes() + def effective_attributes(self): + raise NotImplementedError("Subclasses has to implement this!") + + def effective_attribute(self, attrname, default_value=None): return self.effective_attributes().get(attrname, default_value) @@ -387,6 +396,10 @@ class BaseFolder(WithPermissionsAndAttributes): WithPermissions.__init__(self) + def hosts(self): + raise NotImplementedError("Subclasses has to implement this!") + + def host_names(self): return self.hosts().keys() @@ -403,13 +416,6 @@ class BaseFolder(WithPermissionsAndAttributes): return len(self.hosts()) != 0 - def num_hosts_recursively(self): - num = self.num_hosts() - for subfolder in self.subfolders().values(): - num += subfolder.num_hosts_recursively() - return num - - def host_validation_errors(self): return validate_all_hosts(self.host_names()) @@ -1059,6 +1065,13 @@ class Folder(BaseFolder): return self._num_hosts + def num_hosts_recursively(self): + num = self.num_hosts() + for subfolder in self.subfolders().values(): + num += subfolder.num_hosts_recursively() + return num + + def all_hosts_recursively(self): hosts = {} hosts.update(self.hosts())

8 years, 4 months

Now really fixed invalid MKUserError call

by Lars Michelsen

Module: check_mk Branch: master Commit: 853995ebea49b39531560caeefa06932ec61e706 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=853995ebea49b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 16:12:05 2016 +0100 Now really fixed invalid MKUserError call --- web/htdocs/weblib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index 7c39edb..5f53525 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -35,7 +35,7 @@ def ajax_tree_openclose(): name = html.get_unicode_input("name") if not tree or not name: - raise lib.MKUserError(_('tree or name parameter missing')) + raise lib.MKUserError(None, _('tree or name parameter missing')) html.set_tree_state(tree, name, html.var("state")) html.save_tree_states() @@ -120,7 +120,7 @@ def ajax_set_rowselection(): action = html.var('action', 'set') if action not in [ 'add', 'del', 'set', 'unset' ]: - raise lib.MKUserError(_('Invalid action')) + raise lib.MKUserError(None, _('Invalid action')) rows = html.var('rows', '').split(',')

8 years, 4 months

#3189 FIX mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete

by Simon Betz

Module: check_mk Branch: master Commit: 4cf904b9a341bea332b5be24b78e2b7e78d1b752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cf904b9a341be… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 17 16:07:34 2016 +0100 #3189 FIX mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete --- .werks/3189 | 10 ++++++++++ ChangeLog | 1 + checks/mem | 18 ++++++++++++------ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.werks/3189 b/.werks/3189 new file mode 100644 index 0000000..3aff3c1 --- /dev/null +++ b/.werks/3189 @@ -0,0 +1,10 @@ +Title: mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455721502 + + diff --git a/ChangeLog b/ChangeLog index 66dd375..4bdaeb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 2993 FIX: zfs_arc_cache: fixed crash, no longer reports unknown if not all data is available... * 3188 FIX: ps.include: fixed typo * 3226 FIX: isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent + * 3189 FIX: mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mem b/checks/mem index 43c9b80..e9cfb44 100644 --- a/checks/mem +++ b/checks/mem @@ -326,11 +326,14 @@ def check_mem_linux(_no_item, params, info): if r[0]: yield r # only display if non-OK - # VMalloc - r = check_mem_levels("Largest Free VMalloc Chunk", meminfo["VmallocTotal"] - meminfo["VmallocChunk"], - meminfo["VmallocTotal"], params.get("levels_vmalloc"), of_what = "VMalloc Area", show_free=True) - if r[0]: - yield r # only display if non-OK + # VMalloc, + # newer kernel version report wrong data, + # i.d. both VmallocUsed and Chunk equal zero + if not (meminfo["VmallocUsed"] == 0 and meminfo["VmallocChunk"] == 0): + r = check_mem_levels("Largest Free VMalloc Chunk", meminfo["VmallocTotal"] - meminfo["VmallocChunk"], + meminfo["VmallocTotal"], params.get("levels_vmalloc"), of_what = "VMalloc Area", show_free=True) + if r[0]: + yield r # only display if non-OK # HardwareCorrupted hwc = meminfo.get("HardwareCorrupted") @@ -543,7 +546,10 @@ def inventory_mem_vmalloc(info): if is_linux_meminfo(meminfo): return # handled by new Linux memory check - if "VmallocTotal" in meminfo: + # newer kernel version report wrong data, + # i.d. both VmallocUsed and Chunk equal zero + if "VmallocTotal" in meminfo and \ + not (meminfo["VmallocUsed"] == 0 and meminfo["VmallocChunk"] == 0): # Do not checks this on 64 Bit systems. They have almost # infinitive vmalloc vmalloc = meminfo["VmallocTotal"] / 1024.4

8 years, 4 months

Inventory: Cleaned up some install dates not to contain empty string but None

by Lars Michelsen

Module: check_mk Branch: master Commit: 5277bfde95ce829b699537c34505d72d8aba96e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5277bfde95ce82… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 15:16:02 2016 +0100 Inventory: Cleaned up some install dates not to contain empty string but None --- inventory/win_exefiles | 2 +- inventory/win_reg_uninstall | 4 +++- inventory/win_wmi_software | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/inventory/win_exefiles b/inventory/win_exefiles index 155633a..d9a1641 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -51,7 +51,7 @@ def inv_win_exefiles(info): # This is the 1.2.6p1 new default date install_date = int(time.mktime(time.strptime(write_time, "%m/%d/%Y %H:%M:%S"))) else: - install_date = None # need to return 0 to not break the painter which assumes an int + install_date = None entry = { "name" : parts[-1], diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index 2e70909..903389d 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -38,9 +38,11 @@ def inv_win_reg_uninstall(info): display_name, publisher, path, pacname, version, estimated_size, date, language = line else: continue - install_date = "" + + install_date = None if re.match("^20\d{6}", date): install_date = int(time.mktime(time.strptime(date, "%Y%m%d"))) + size = saveint(estimated_size) if size == 0: size = None diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index 56d8fe7..1140c71 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -39,9 +39,11 @@ def inv_win_wmi_software(info): for line in info: pacname, vendor, version = line[0:3] dat = line[3] - install_date = "" + + install_date = None if len(dat) == 8 and re.match("^20", dat): install_date = int(time.mktime(time.strptime(dat, "%Y%m%d"))) + # contains language as well if len(line) == 5: language = line[4]

8 years, 4 months

#3226 FIX isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent

by Lars Michelsen

Module: check_mk Branch: master Commit: d88e0c4d9c4b17cdd1cf9b8358ed765986f4893e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d88e0c4d9c4b17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 15:05:13 2016 +0100 #3226 FIX isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent --- .werks/3226 | 10 ++++++++++ ChangeLog | 1 + checks/isc_dhcpd | 13 ++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/3226 b/.werks/3226 new file mode 100644 index 0000000..e838f6a --- /dev/null +++ b/.werks/3226 @@ -0,0 +1,10 @@ +Title: isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455717894 + + diff --git a/ChangeLog b/ChangeLog index 118ce4d..66dd375 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ NOTE: Please refer to the migration notes! * 2993 FIX: zfs_arc_cache: fixed crash, no longer reports unknown if not all data is available... * 3188 FIX: ps.include: fixed typo + * 3226 FIX: isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/isc_dhcpd b/checks/isc_dhcpd index 106901b..2ebfe16 100644 --- a/checks/isc_dhcpd +++ b/checks/isc_dhcpd @@ -46,8 +46,13 @@ isc_dhcpd_default_levels = (15.0, 5.0) # 10.0.1.57 def parse_isc_dhcpd(info): - parsed = {} + parsed = { + "pids" : [], + "pools" : [], + "leases" : [], + } + mode = None for line in info: if line[0] == '[general]': mode = "general" @@ -59,10 +64,12 @@ def parse_isc_dhcpd(info): elif mode == "general": if line[0] == "PID:": parsed["pids"] = map(int, line[1:]) + elif mode == "pools": - parsed.setdefault("pools", []).append((line[0], line[1])) + parsed["pools"].append((line[0], line[1])) + elif mode == "leases": - parsed.setdefault("leases", []).append(line[0]) + parsed["leases"].append(line[0]) return parsed

8 years, 4 months

#2994 brocade.temp: increased temperature default levels from 35/40 to 55/ 60

by Andreas Boesl

Module: check_mk Branch: master Commit: 4df4d356c7b21fe92f5bf8425e0460d0e3a182c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4df4d356c7b21f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 17 15:03:52 2016 +0100 #2994 brocade.temp: increased temperature default levels from 35/40 to 55/60 --- .werks/2994 | 9 +++++++++ ChangeLog | 1 + checks/brocade | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2994 b/.werks/2994 new file mode 100644 index 0000000..fe6f18e --- /dev/null +++ b/.werks/2994 @@ -0,0 +1,9 @@ +Title: brocade.temp: increased temperature default levels from 35/40 to 55/60 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1455717787 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 55c4c55..118ce4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux + * 2994 brocade.temp: increased temperature default levels from 35/40 to 55/60 * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/brocade b/checks/brocade index 7808a8f..137c538 100644 --- a/checks/brocade +++ b/checks/brocade @@ -106,7 +106,7 @@ check_info["brocade.power"] = { } factory_settings["brocade_temp_default_levels"] = { - "levels" : ( 35, 40 ) + "levels" : ( 55, 60 ) } def inventory_brocade_temp(info):

8 years, 4 months

Fixed typo in help text

by Lars Michelsen

Module: check_mk Branch: master Commit: a4f8e500db69b0eb59c657dd419ad516d3d508c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4f8e500db69b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 14:57:03 2016 +0100 Fixed typo in help text --- web/plugins/wato/globals_notification.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 2eba7ef..ae8f464 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -65,7 +65,7 @@ register_configvar(group, help = _("If this option is set to a non-zero number, then Check_MK " "keeps the last <i>X</i> notifications for later reference. " "You can replay these notifications and analyse your set of " - "notifications rules. This only works with rulebased notiications. Note: " + "notifications rules. This only works with rulebased notifications. Note: " "only notifications sent out by the local notification system can be " "tracked. If you have a distributed environment you need to do the analysis " "directly on the remote sites - unless you use a central spooling."),

8 years, 4 months

Updated bug entries #2331

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ce5dec912912ace5d1debc010ef2b4afef4c6dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ce5dec912912a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 14:54:14 2016 +0100 Updated bug entries #2331 --- .bugs/2331 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2331 b/.bugs/2331 new file mode 100644 index 0000000..bb4d8ca --- /dev/null +++ b/.bugs/2331 @@ -0,0 +1,8 @@ +Title: create check to detect failed systemd services +Component: checks +State: open +Date: 2016-02-17 14:53:37 +Targetversion: future +Class: feature + +Create check that analyzes output of "systemctl --failed" to automatically detect failed services.

8 years, 4 months

minor code formating

by Lars Michelsen

Module: check_mk Branch: master Commit: da31239cbaf9c300e2ccd6b0efbd71009a8770cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da31239cbaf9c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 14:51:32 2016 +0100 minor code formating --- checks/fortigate_memory | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/fortigate_memory b/checks/fortigate_memory index 8cafd3f..7c67c87 100644 --- a/checks/fortigate_memory +++ b/checks/fortigate_memory @@ -55,7 +55,7 @@ def check_fortigate_memory(item, params, info): icon = "(!!)" perf = [("mem_usage", current, warn, crit)] - return(state, "%d%%%s (warn/crit at %d%%/%d%%)" % (current, icon, warn, crit), perf) + return (state, "%d%%%s (warn/crit at %d%%/%d%%)" % (current, icon, warn, crit), perf) check_info["fortigate_memory"] = { "check_function" : check_fortigate_memory,

8 years, 4 months

ldap connection loading: Fixed invalid access to variable in exception handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 7bd98f1f71e7c2cc08adc8f687f43923f98fbcfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bd98f1f71e7c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 17 14:37:01 2016 +0100 ldap connection loading: Fixed invalid access to variable in exception handling --- web/htdocs/sidebar.py | 2 +- web/htdocs/userdb.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 6b5a515..b5d8d35 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -371,7 +371,7 @@ def render_snapin(name, state): def snapin_exception(e): if config.debug: - raise + raise e else: html.write("<div class=snapinexception>\n" "<h2>%s</h2>\n" diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index c783363..ac7c219 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -791,21 +791,24 @@ def declare_custom_user_attrs(): # '----------------------------------------------------------------------' def load_connection_config(): + user_connections = [] + filename = multisite_dir + "user_connections.mk" if not os.path.exists(filename): - return [] + return user_connections + try: - vars = { - "user_connections" : [], + context = { + "user_connections": user_connections, } - execfile(filename, vars, vars) - return vars["user_connections"] + execfile(filename, context, context) + return context["user_connections"] except Exception, e: if config.debug: raise MKGeneralException(_("Cannot read configuration file %s: %s" % (filename, e))) - return vars["user_connections"] + return user_connections def save_connection_config(connections):

8 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016