Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4721 FIX Improved error handling when a ruleset value can not be rendered on agent bakery page

by Lars Michelsen

Module: check_mk Branch: master Commit: 2638e5b85dd599ab1116237a508c7f2a53abc097 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2638e5b85dd599… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 17 11:15:11 2017 +0200 4721 FIX Improved error handling when a ruleset value can not be rendered on agent bakery page Change-Id: Idf1fea694ac5f9ee30420549aa0503eb14dac996 --- .werks/4721 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/4721 b/.werks/4721 new file mode 100644 index 0000000..5413608 --- /dev/null +++ b/.werks/4721 @@ -0,0 +1,11 @@ +Title: Improved error handling when a ruleset value can not be rendered on agent bakery page +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1495012484 + +

7 years, 4 months

Updated bug entries #2903

by Lars Michelsen

Module: check_mk Branch: master Commit: 796e046ebd9ce9929abc1fc84dd249cf2159d35c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=796e046ebd9ce9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 17 09:31:56 2017 +0200 Updated bug entries #2903 Change-Id: I0f94c9c3bd1cf091bbebbad76139b75af509bd53 --- .bugs/2903 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2903 b/.bugs/2903 new file mode 100644 index 0000000..c9c12de --- /dev/null +++ b/.bugs/2903 @@ -0,0 +1,8 @@ +Title: rename notification spooler config variable +Component: notification +State: open +Date: 2017-05-17 09:31:20 +Targetversion: 1.5.0 +Class: nastiness + +This config variable is named "config" which is really bad in the context of all other config variable names.

7 years, 4 months

Fixed duplicate slash in config domain config file paths

by Lars Michelsen

Module: check_mk Branch: master Commit: c7f9dde4f8d07f80afb2ed3fa5f153da87f50bee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7f9dde4f8d07f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 17 09:44:08 2017 +0200 Fixed duplicate slash in config domain config file paths Change-Id: I6ee61625b580a88d397e7ef3673a274692c6d139 --- web/htdocs/watolib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 0060127..661a5a2 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -287,9 +287,9 @@ class ConfigDomain(object): def config_file(self, site_specific): if site_specific: - return "%s/sitespecific.mk" % self.config_dir() + return os.path.join(self.config_dir(), "sitespecific.mk") else: - return "%s/global.mk" % self.config_dir() + return os.path.join(self.config_dir(), "global.mk") def activate(self):

7 years, 4 months

4720 FIX The settings of the MK Notify daemon could be lost when saving other global settings

by Lars Michelsen

Module: check_mk Branch: master Commit: 49aef0607610cedc69423e847546f7b205554845 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49aef0607610ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 17 10:18:41 2017 +0200 4720 FIX The settings of the MK Notify daemon could be lost when saving other global settings When a problem occurs during plugin loading of WATO plugins, which should only occur when working with local modifications, it could happen that the global settings of the MK notification daemon were lost when editing any global configuration variable. Change-Id: Ib2fdb2bcba5749e7246243f2008f03c048258d12 --- .werks/4720 | 13 +++++++++++++ web/htdocs/watolib.py | 12 ++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.werks/4720 b/.werks/4720 new file mode 100644 index 0000000..b6b2053 --- /dev/null +++ b/.werks/4720 @@ -0,0 +1,13 @@ +Title: The settings of the MK Notify daemon could be lost when saving other global settings +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1495008952 + +When a problem occurs during plugin loading of WATO plugins, which should only occur when +working with local modifications, it could happen that the global settings of the MK notification +daemon were lost when editing any global configuration variable. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 661a5a2..fac4fc9 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -260,7 +260,15 @@ class ConfigDomain(object): @classmethod def all_classes(cls): - return cls.__subclasses__() # pylint: disable=no-member + subclasses = cls.__subclasses__() # pylint: disable=no-member + + # Classes may be registered twice, only store one of the occurances. + # TODO(lm): Find the reason for this and solve this issue in the plugin mechanism. + classes = {} + for subclass in subclasses: + classes.setdefault(subclass.__name__, subclass) + + return classes.values() @classmethod @@ -270,7 +278,7 @@ class ConfigDomain(object): @classmethod def get_class(cls, ident): - for domain_class in cls.__subclasses__(): # pylint: disable=no-member + for domain_class in cls.all_classes(): if domain_class.ident == ident: return domain_class raise NotImplementedError(_("The domain \"%s\" does not exist") % ident)

7 years, 4 months

4719 FIX Folder host list: Improved performance for folders with a large number of hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f09bf350d936d7df16bbc87f9fc12feebbee6b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f09bf350d936d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 16:11:06 2017 +0200 4719 FIX Folder host list: Improved performance for folders with a large number of hosts Change-Id: I336ed1b5866be0625a060aac5524348e24feb8b0 --- .werks/4719 | 11 +++++++++++ web/htdocs/watolib.py | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/.werks/4719 b/.werks/4719 new file mode 100644 index 0000000..93093f4 --- /dev/null +++ b/.werks/4719 @@ -0,0 +1,11 @@ +Title: Folder host list: Improved performance for folders with a large number of hosts +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494943834 + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 2038c4d..0060127 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -834,7 +834,9 @@ class CREFolder(BaseFolder): self._name = name self._parent = parent_folder self._subfolders = {} + self._choices_for_moving_host = None + self._effective_attributes = None self._root_dir = root_dir if self._root_dir: @@ -1230,6 +1232,8 @@ class CREFolder(BaseFolder): def drop_caches(self): self._choices_for_moving_host = None + self._effective_attributes = None + for subfolder in self._subfolders.values(): subfolder.drop_caches() @@ -1435,6 +1439,9 @@ class CREFolder(BaseFolder): def effective_attributes(self): + if self._effective_attributes != None: + return self._effective_attributes # cached :-) + effective = {} for folder in self.parent_folder_chain(): effective.update(folder.attributes()) @@ -1446,6 +1453,8 @@ class CREFolder(BaseFolder): if attrname not in effective: effective.setdefault(attrname, host_attribute.default_value()) + self._effective_attributes = effective + return effective

7 years, 4 months

livestatus: Use safer eval when processing python data structures received via livestatus

by Lars Michelsen

Module: check_mk Branch: master Commit: 9fb4d0c29ebc1cddac67b7804ed08161c80ba1a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fb4d0c29ebc1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 15:04:37 2017 +0200 livestatus: Use safer eval when processing python data structures received via livestatus Change-Id: I87c74842f5f8309b164e3d7f9436cb25e5600089 --- livestatus/api/python/livestatus.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 7a5a6d2..63a95cb 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import socket, time, re, os +import ast """MK Livestatus Python API""" @@ -338,7 +339,7 @@ class BaseConnection: data = self.receive_data(length) if code == "200": try: - return eval(data) + return ast.literal_eval(data) except: raise MKLivestatusSocketError("Malformed output") else:

7 years, 4 months

4718 FIX Fixed memory leak in Check_MK check helpers when started in verbose mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fa77febaeacc4142264e2fa5a80ec575c817c85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fa77febaeacc4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 13:57:44 2017 +0200 4718 FIX Fixed memory leak in Check_MK check helpers when started in verbose mode When the Check_MK helpers are configured with a higher log level than the default Notice log level the Check_MK helpers were leaking memory. This can be configured by changing the option "Check_MK check helpers" of the global setting "Logging of the core" to e.g. Informational. In this mode the helper gathers information about some changed variables during runtime and the memory usage. It also allows to debug different mechanics of the helpers. If you enabled this, each reload of the core (not restart) was triggering the memory leak in the helpers. In extreme situations this could lead to duplication of the memory usage on each reload. Change-Id: I561abfdffd2f10d88a277d2c3267915a68e8ab7c --- .werks/4718 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/4718 b/.werks/4718 new file mode 100644 index 0000000..4025c3a --- /dev/null +++ b/.werks/4718 @@ -0,0 +1,20 @@ +Title: Fixed memory leak in Check_MK check helpers when started in verbose mode +Level: 2 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1494935598 +Class: fix + +When the Check_MK helpers are configured with a higher log level than the default +Notice log level the Check_MK helpers were leaking memory. This can be configured +by changing the option "Check_MK check helpers" of the global setting "Logging of the core" +to e.g. Informational. + +In this mode the helper gathers information about some changed variables during runtime +and the memory usage. It also allows to debug different mechanics of the helpers. + +If you enabled this, each reload of the core (not restart) was triggering the memory +leak in the helpers. In extreme situations this could lead to duplication of the memory +usage on each reload.

7 years, 4 months

Another update to werk #4658

by Simon Betz

Module: check_mk Branch: master Commit: e00d3fbeb3b15e12ade9c8dd1273e1ca6ae7858e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e00d3fbeb3b15e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 16 12:54:31 2017 +0200 Another update to werk #4658 Change-Id: Iaf6ac91e7c17c4bd536ec6e63c61806b1af511da --- web/plugins/wato/bi.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 670c4a7..f20c9ef 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1203,6 +1203,8 @@ class ModeBIRules(ModeBI): def page(self): + self.must_be_contact_for_pack() + if not self._pack["aggregations"] and not self._pack["rules"]: new_url = self.url_to_pack([("mode", "bi_edit_rule")]) menu_items = [ @@ -1532,6 +1534,8 @@ class ModeBIEditRule(ModeBI): def page(self): + self.must_be_contact_for_pack() + if self._new: cloneid = html.var("clone") if cloneid: @@ -1566,13 +1570,15 @@ class ModeBIEditRule(ModeBI): rules_without_permissions = {} for node in rulepack.get("nodes", []): node_type, node_content = node - node_name = node_content[0] - pack = self.pack_containing_rule(node_name) - if node_type == 'call' and pack is not None and \ - not self.may_use_rules_in_pack(pack): - packid = (pack['id'], pack['title']) - rules_without_permissions.setdefault(packid, []) - rules_without_permissions[packid].append(node_name) + if node_type != 'call': + continue + + node_ruleid = node_content[0] + pack = self.pack_containing_rule(node_ruleid) + if pack is not None and not self.may_use_rules_in_pack(pack): + packid = (pack['id'], pack['title']) + rules_without_permissions.setdefault(packid, []) + rules_without_permissions[packid].append(node_ruleid) if rules_without_permissions: message = ", ".join([_("BI rules %s from BI pack '%s'") % \

7 years, 4 months

Removed gui_color snapin that was only added for testing

by Lars Michelsen

Module: check_mk Branch: master Commit: 6dc4406254bf21dd730fa45a20a17ed2b5dc694b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dc4406254bf21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 12:42:53 2017 +0200 Removed gui_color snapin that was only added for testing Change-Id: I973982fab13c88f5f61c34985452d10e4b1d1b6d --- web/plugins/sidebar/gui_color.py | 89 ---------------------------------------- 1 file changed, 89 deletions(-) diff --git a/web/plugins/sidebar/gui_color.py b/web/plugins/sidebar/gui_color.py deleted file mode 100644 index 3fd9714..0000000 --- a/web/plugins/sidebar/gui_color.py +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 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- -# tails. 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. - -gui_colors = { - 1 : ( 73, 138, 166), - 2 : ( 73, 166, 157), - 3 : ( 84, 166, 73), - 4 : (166, 166, 73), - 5 : (166, 115, 73), - 6 : (209, 92, 92), - 7 : (201, 96, 219), - 8 : (140, 142, 207), - 9 : (160, 160, 160), -} - - -def render_gui_color(): - html.open_div(class_="gui_color") - for name, rgb_int in gui_colors.items(): - html.div("", - class_ = "pick_gui_color", - style = "background-color: rgb(%d,%d,%d);" % rgb_int, - onclick = "set_gui_color(%d,%d,%d);" % rgb_int, - ) - html.close_div() - - -def ajax_set_gui_color(): - html.log(html.all_vars()) - r = int(html.var("r")) - g = int(html.var("g")) - b = int(html.var("b")) - config.user.save_file("gui_color", (r, g, b)) - - -sidebar_snapins["gui_color"] = { - "title" : _("GUI Color"), - "description" : _("Choose your favourite color of the user interface"), - "render" : render_gui_color, - "allowed" : [ "admin", "user", ], - "styles" : """ - -div.gui_color { - text-align: center; - width: 100%; -} - -div.pick_gui_color { - width: 18.2px; - height: 18.5px; - float: none; - display: inline-block; - margin-right: 5px; - border: 1px solid black; - box-shadow: 0.5px 0.5px 1px rgba(0, 0, 0, 0.5); -} - -div.pick_gui_color:hover { - transform: scale(1.1); - cursor: pointer; - box-shadow: 1.5px 1.5px 3px rgba(0, 0, 0, 0.5); -} -""" -} - -

7 years, 4 months

4717 FIX Fixed "corrupted package" archive messages when installing DEB packages baked on SLES

by Lars Michelsen

Module: check_mk Branch: master Commit: 51146ebe5340ba457526aece86f3c4ac0e5fa719 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51146ebe5340ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 16 11:27:48 2017 +0200 4717 FIX Fixed "corrupted package" archive messages when installing DEB packages baked on SLES When installing debian agent packages baked with the Check_MK Agent Bakery running on a SLES 12 server this could lead to this message during installation: dpkg: error processing archive check-mk-agent_1.4.0b5-88de67ef934c3774_all.deb (--install): corrupted filesystem tarfile - corrupted package archive Background information: The <tt>tar</tt> files built into the debian package were created with a tar format that is not supported for the debian package format. We create the packages with the <tt>gnu</tt> format now on all platforms. Change-Id: I9444ead7ba81828611f5af1a69ecb97b18ff2c7d --- .werks/4717 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.werks/4717 b/.werks/4717 new file mode 100644 index 0000000..c378ed6 --- /dev/null +++ b/.werks/4717 @@ -0,0 +1,19 @@ +Title: Fixed "corrupted package" archive messages when installing DEB packages baked on SLES +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1494926687 + +When installing debian agent packages baked with the Check_MK Agent Bakery running on a SLES 12 +server this could lead to this message during installation: + +dpkg: error processing archive check-mk-agent_1.4.0b5-88de67ef934c3774_all.deb (--install): + corrupted filesystem tarfile - corrupted package archive + +Background information: The <tt>tar</tt> files built into the debian package were created with +a tar format that is not supported for the debian package format. We create the packages with +the <tt>gnu</tt> format now on all platforms.

7 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017