Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: cc130b026a278c58a1c23aa04672283ed1b53d4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc130b026a278c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 20 13:42:07 2017 +0200 Removed useless globals Change-Id: I9c21205992ac9639625bb09c66fe506f7741fade --- web/htdocs/userdb.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 46d9895..3577162 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -50,8 +50,6 @@ multisite_user_connectors = {} # Load all userdb plugins def load_plugins(force): - global user_attributes - global multisite_user_connectors global builtin_user_attribute_names # Do not cache the custom user attributes. They can be created by the user

6 years, 11 months

5021 FIX Make sure that the output of the event console active check is valid

by Sven Panne

Module: check_mk Branch: master Commit: 8879bcd3cba7f9c692d3fad098aa10eb1e8df016 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8879bcd3cba7f9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 20 13:21:53 2017 +0200 5021 FIX Make sure that the output of the event console active check is valid It was possible that part of the check output looked like (incorrectly formatted) performance data, confusing other parts of Check_MK, e.g. the graphing subsystem. This has been fixed. Change-Id: I5d1798891919c6cc1be440255d865317978f8663 --- .werks/5021 | 12 +++ active_checks/check_mkevents.cc | 173 +++++++++++++++++++++------------------- 2 files changed, 104 insertions(+), 81 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8879bcd3cb…

6 years, 11 months

Adapted WATO rule title/help

by Simon Betz

Module: check_mk Branch: master Commit: d830bf07ef8ba15dee835fe8904733ad22e2b7a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d830bf07ef8ba1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 20 13:22:59 2017 +0200 Adapted WATO rule title/help Change-Id: I0a02f10a2f39b3bc5363f40242a0899b5d0ae84e --- web/plugins/wato/check_parameters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4926c86..85a8e08 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2887,10 +2887,10 @@ register_check_parameters( register_check_parameters( subgroup_applications, "clr_memory", - _(".Net runtime memory levels"), + _("DotNet (.Net) runtime memory levels"), Dictionary( help = _("This rule allows to set the warn and crit levels of the memory " - "metrics of the .Net Runtime"), + "metrics of the DotNet (.Net) Runtime"), elements = [ ( "upper", Tuple( @@ -2904,7 +2904,7 @@ register_check_parameters( ), TextAscii( title = _("Name of the Application"), - help = _("The name of the .net application or _Global_"), + help = _("The name of the DotNet (.Net) application or _Global_"), allow_empty = False, ), "dict"

6 years, 11 months

5002 FIX Fixed possible exception related to multisite_user_connectors on login failures

by Lars Michelsen

Module: check_mk Branch: master Commit: 88afff0e28a3a7d9f0a149c8504a42538118ea5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88afff0e28a3a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 20 12:00:34 2017 +0200 5002 FIX Fixed possible exception related to multisite_user_connectors on login failures Change-Id: Ic7e14061fc221d700e0587eb31e21c408a990f7d --- .werks/5002 | 11 +++++++++++ web/htdocs/userdb.py | 9 ++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/5002 b/.werks/5002 new file mode 100644 index 0000000..f57c486 --- /dev/null +++ b/.werks/5002 @@ -0,0 +1,11 @@ +Title: Fixed possible exception related to multisite_user_connectors on login failures +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500544809 + + diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 5cdb5c8..46d9895 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -45,6 +45,9 @@ connection_dict = {} g_connections = {} auth_logger = logger.getChild("auth") +# declare lobal vars +multisite_user_connectors = {} + # Load all userdb plugins def load_plugins(force): global user_attributes @@ -69,9 +72,9 @@ def load_plugins(force): if loaded_with_language == current_language and not force: return - # declare & initialize global vars - user_attributes = {} - multisite_user_connectors = {} + # clear global vars + user_attributes.clear() + multisite_user_connectors.clear() load_web_plugins("userdb", globals()) builtin_user_attribute_names = user_attributes.keys()

6 years, 11 months

5001 FIX PDF exports: Default graph layout options were not applied

by Lars Michelsen

Module: check_mk Branch: master Commit: e5b91cf654a0097ec038464f0c080508e3cc7062 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5b91cf654a009… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 20 11:11:33 2017 +0200 5001 FIX PDF exports: Default graph layout options were not applied When creating an "intant report" (PDF export of a view) the default graph layout options were not applied to the graphs displayed in the report. Change-Id: I90bbd998905c7a5aab92ec90fd19ce623838c8e9 --- .werks/5001 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5001 b/.werks/5001 new file mode 100644 index 0000000..d36d867 --- /dev/null +++ b/.werks/5001 @@ -0,0 +1,12 @@ +Title: PDF exports: Default graph layout options were not applied +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1500541729 + +When creating an "intant report" (PDF export of a view) the default graph +layout options were not applied to the graphs displayed in the report.

6 years, 11 months

4977 Improved displaying a great amount of contact groups in folder/ host properties

by Simon Betz

Module: check_mk Branch: master Commit: 780791473a71c6c01b4f4b6ff5df8f2b414db6a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=780791473a71c6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 17 16:48:16 2017 +0200 4977 Improved displaying a great amount of contact groups in folder/host properties Change-Id: Ib2d1fe129954d9ff5894e35be2d6e3d037e30d3e --- .werks/4977 | 14 ++++++++++++++ web/htdocs/watolib.py | 21 +++++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.werks/4977 b/.werks/4977 new file mode 100644 index 0000000..66af248 --- /dev/null +++ b/.werks/4977 @@ -0,0 +1,14 @@ +Title: Improved displaying a large number of contact groups in folder/host properties +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1500302729 +Class: feature + +If a large number of contact groups are configured +these were displayed as a long list of checkboxes +exceeding screensize. +Now the available and selected contact groups are +shown as parallel lists with fixed size and scrolling bar. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 49150b5..b30bec0 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3117,9 +3117,9 @@ class ContactGroupsAttribute(Attribute): self._users = None self._loaded_at = None + def paint(self, value, hostname): value = convert_cgroups_from_tuple(value) - texts = [] self.load_data() items = self._contactgroups.items() @@ -3134,6 +3134,7 @@ class ContactGroupsAttribute(Attribute): title=_("These contact groups are also used in the monitoring configuration.")) return "", result + def render_input(self, varprefix, value): value = convert_cgroups_from_tuple(value) @@ -3146,12 +3147,8 @@ class ContactGroupsAttribute(Attribute): # Only show contact groups I'm currently in and contact # groups already listed here. self.load_data() - items = self._contactgroups.items() - items.sort(cmp = lambda a,b: cmp(a[1], b[1])) - for name, group in items: - html.checkbox(varprefix + self._name + "_n_" + name, name in value["groups"]) - html.a(group['alias'] if group['alias'] else name , href=folder_preserving_link([("mode", "edit_contact_group"), ("edit", name)])) - html.br() + self._vs_contactgroups().render_input(varprefix + self._name + "_n_", value['groups']) + html.hr() if is_host: @@ -3183,9 +3180,9 @@ class ContactGroupsAttribute(Attribute): if self._loaded_at == id(html): return self._loaded_at = id(html) - self._contactgroups = userdb.load_group_information().get("contact", {}) + def from_html_vars(self, varprefix): cgs = [] self.load_data() @@ -3200,6 +3197,7 @@ class ContactGroupsAttribute(Attribute): "recurse_use" : html.get_checkbox(varprefix + self._name + "_recurse_use"), } + def filter_matches(self, crit, value, hostname): value = convert_cgroups_from_tuple(value) # Just use the contact groups for searching @@ -3209,6 +3207,13 @@ class ContactGroupsAttribute(Attribute): return True + def _vs_contactgroups(self): + cg_choices = sorted([(cg_id, cg_attrs.get("alias", cg_id)) + for cg_id, cg_attrs in self._contactgroups.items()], + key=lambda x: x[1]) + return DualListChoice(choices=cg_choices, rows=40, size=100) + + def initialize_host_attribute_structures(): global g_host_attributes, g_host_attribute g_host_attributes = []

6 years, 11 months

5010 FIX f5_bigip_mem.tmm: Fixed discovery warning on command line if TMM information is not provided by the device

by Marcel Arentz

Module: check_mk Branch: master Commit: e182c9ccb84b647f43ffc9b10a1544ff79a59dce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e182c9ccb84b64… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jul 19 17:08:54 2017 +0200 5010 FIX f5_bigip_mem.tmm: Fixed discovery warning on command line if TMM information is not provided by the device The service has not been created and no impact could be noticed in WATO. But on command line a warning showed up that there is an esception during discovering services based on that check. This has been fixed now. Change-Id: I1286092c10eb20841c13a6a159c855a3fdbe1a6e --- .werks/5010 | 12 ++++++++++++ checks/f5_bigip_mem | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/5010 b/.werks/5010 new file mode 100644 index 0000000..37cd812 --- /dev/null +++ b/.werks/5010 @@ -0,0 +1,12 @@ +Title: f5_bigip_mem.tmm: Fixed discovery warning on command line if TMM information is not provided by the device +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1500476578 +Class: fix + +The service has not been created and no impact could be noticed in WATO. But on +command line a warning showed up that there is an esception during discovering +services based on that check. This has been fixed now. diff --git a/checks/f5_bigip_mem b/checks/f5_bigip_mem index 17fa5b8..7062b67 100644 --- a/checks/f5_bigip_mem +++ b/checks/f5_bigip_mem @@ -71,7 +71,9 @@ check_info['f5_bigip_mem'] = { } def inventory_f5_bigip_mem_tmm(parsed): - if not float(parsed["tmm"][0]) == 0: + mem = parsed["tmm"][0] + # Some devices obviously do not deliver this information... + if not mem == '' and not float(mem) == 0: return [ ( "TMM", {} ) ]

6 years, 11 months

Make a field private, it should die soon, anyway.

by Sven Panne

Module: check_mk Branch: master Commit: 1329cf52cd47bd1ee89e719d8d01c5d09c59d033 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1329cf52cd47bd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 19 14:40:40 2017 +0200 Make a field private, it should die soon, anyway. Change-Id: Ie55d14346a27775173aba4f48f4d384a6601265c --- livestatus/src/LogEntry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index a976c43..ee222f8 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -82,7 +82,6 @@ public: LogEntryType _type; char *_complete; // copy of complete unsplit message char *_options; // points into _complete after ':' - char *_msg; // split up with binary zeroes char *_text; // points into msg char *_host_name; // points into msg or is 0 char *_svc_desc; // points into msg or is 0 @@ -127,6 +126,7 @@ private: std::vector<Param> params; }; + char *_msg; // split up with binary zeroes static std::vector<LogDef> log_definitions; bool assign(Param par, char **scan);

6 years, 11 months

Turn a field into a simple local variable.

by Sven Panne

Module: check_mk Branch: master Commit: 7f8053572719827be9c97997d9a8529300da1e70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f805357271982… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 19 14:37:34 2017 +0200 Turn a field into a simple local variable. Change-Id: Ia50479b861cb964ebc172fec0314cdcf82d6ac6c --- livestatus/src/LogEntry.cc | 8 ++++---- livestatus/src/LogEntry.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index ed3b0b3..552786e 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -57,9 +57,9 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) // make a copy of the message and strip trailing newline _msg = strdup(line); - _msglen = strlen(line); - while (_msglen > 0 && _msg[_msglen - 1] == '\n') { - _msg[--_msglen] = '\0'; + size_t msglen = strlen(line); + while (msglen > 0 && _msg[msglen - 1] == '\n') { + _msg[--msglen] = '\0'; // keep unsplitted copy of the message (needs lots of memory, // maybe we could optimize that one day...) @@ -80,7 +80,7 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) } // [1260722267] xxx - extract timestamp, validate message - if (_msglen < 13 || _msg[0] != '[' || _msg[11] != ']') { + if (msglen < 13 || _msg[0] != '[' || _msg[11] != ']') { _logclass = Class::invalid; return; // ignore invalid lines silently } diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 18d11b4..a976c43 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -83,7 +83,6 @@ public: char *_complete; // copy of complete unsplit message char *_options; // points into _complete after ':' char *_msg; // split up with binary zeroes - unsigned _msglen; // size of _msg char *_text; // points into msg char *_host_name; // points into msg or is 0 char *_svc_desc; // points into msg or is 0

6 years, 11 months

Refactoring: Inline _set_logger methods

by Sven Panne

Module: check_mk Branch: master Commit: 5cc0fcfe53bf4fb82965fa3173f900f7006e80f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cc0fcfe53bf4f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 19 13:33:59 2017 +0200 Refactoring: Inline _set_logger methods Each of them had only a single call site and consisted of at most 2 lines. Furthermore, one of those 2 lines will die soon. See: https://refactoring.com/catalog/inlineMethod.html Change-Id: I6448cb7efea3804c647d33208054d78ba2a1f130 --- bin/mkeventd | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 17a0aeb..5461c50 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -394,10 +394,7 @@ class VerboseLock(object): def __init__(self, name): self._depth = 0 self._name = name - self._set_logger() - - def _set_logger(self): - self.logger = logger.getChild("VerboseLock(%s)" % self._name) + self.logger = logger.getChild("VerboseLock(%s)" % name) def __enter__(self): self._depth += 1 @@ -596,13 +593,8 @@ def check_timeperiod(tpname): class HostConfig(object): def __init__(self): - self._set_logger() - self.initialize() - - - def _set_logger(self): self.logger = logger.getChild("HostConfig") - #self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.HostConfig"]) + self.initialize() def initialize(self): @@ -1259,7 +1251,8 @@ class EventServer(object): self._syslog_tcp = None self._snmptrap = None self._mib_resolver = None - self._set_logger() + self.logger = logger.getChild("EventServer") + self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventServer"]) self.create_pipe() self.open_eventsocket() @@ -1275,11 +1268,6 @@ class EventServer(object): self.host_config = HostConfig() - def _set_logger(self): - self.logger = logger.getChild("EventServer") - self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventServer"]) - - def status_columns(self): columns = self._general_columns() columns += g_perfcounters.status_columns() @@ -3092,13 +3080,9 @@ class StatusServer(object): self._tcp_socket = None self._reopen_sockets = False self._should_terminate = False - self._set_logger() - self.open_sockets() - - - def _set_logger(self): self.logger = logger.getChild("StatusServer") self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.StatusServer"]) + self.open_sockets() def open_sockets(self): @@ -3652,13 +3636,9 @@ def run_eventd(): class EventStatus(object): def __init__(self): - self._set_logger() - self.flush() - - - def _set_logger(self): self.logger = logger.getChild("EventStatus") self.logger.setLevel(g_config["log_level"]["cmk.mkeventd.EventStatus"]) + self.flush() def flush(self):

6 years, 11 months

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017