Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

4107 Now you are able to search for check plugins

by Simon Betz

Module: check_mk Branch: master Commit: 7598162c34934e34d80798aedb7c30757559f775 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7598162c34934e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 30 14:13:52 2016 +0100 4107 Now you are able to search for check plugins --- .werks/4107 | 9 ++++++++ ChangeLog | 1 + web/htdocs/wato.py | 65 ++++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/.werks/4107 b/.werks/4107 new file mode 100644 index 0000000..b2a5514 --- /dev/null +++ b/.werks/4107 @@ -0,0 +1,9 @@ +Title: Now you are able to search for check plugins +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i3 +Date: 1480511530 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f80e2b8..cf6575f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 4070 Added a painter for the service check period * 4095 new filter host auxiliary tags * 4106 new filter host/service-service-level... + * 4107 Now you are able to search for check plugins * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 88b2695..98648c1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15009,8 +15009,9 @@ def man_page_catalog_topics(): def mode_check_plugins(phase): - topic = html.var("topic") - if topic: + search = get_search_expression() + topic = html.var("topic") + if topic and not search: path = tuple(topic.split("/")) # e.g. [ "hw", "network" ] if not re.match("^[a-zA-Z0-9_./]+$", topic): raise Exception("Invalid topic") @@ -15024,7 +15025,7 @@ def mode_check_plugins(phase): titles = man_pages.man_page_catalog_titles() has_second_level = None - if topic: + if topic and not search: for t, has_second_level, title, helptext in man_page_catalog_topics(): if t == path[0]: topic_title = title @@ -15033,9 +15034,12 @@ def mode_check_plugins(phase): topic_title = titles.get(path[1], path[1]) if phase == "title": - heading = _("Catalog of Check Plugins") - if topic: - heading += " - " + topic_title + if topic and not search: + heading = "%s - %s" % ( _("Catalog of Check Plugins"), topic_title ) + elif search: + heading = "%s: %s" % ( _("Check plugins matching"), html.attrencode(search) ) + else: + heading = _("Catalog of Check Plugins") return heading elif phase == "buttons": @@ -15057,12 +15061,19 @@ def mode_check_plugins(phase): "manually create services in case you cannot or do not want to rely on the " "automatic service discovery.")) + search_form( "%s: " % _("Search for check plugins"), "check_plugins" ) + # The maxium depth of the catalog paths is 3. The top level is being rendered # like the WATO main menu. The second and third level are being rendered like # the global settings. - if topic: + if topic and not search: render_manpage_topic(manpages, titles, has_second_level, path, topic_title) + + elif search: + for path, manpages in get_manpages_after_search(manpages, search): + render_manpage_list(manpages, titles, path, titles.get(path, path)) + else: menu_items = [] for topic, has_second_level, title, helptext in man_page_catalog_topics(): @@ -15071,6 +15082,45 @@ def mode_check_plugins(phase): render_main_menu(menu_items) +def get_manpages_after_search(manpages, search): + this_search = search + collection = {} + + # searches in {"name" : "asd", "title" : "das", ...} + def get_matched_entry( entry ): + if type(entry) == dict: + name = entry.get("name", "") + if type(name) == str: + name = name.decode("utf8") + title = entry.get("title", "") + if type(title) == str: + title = title.decode("utf8") + if this_search in name.lower() or this_search in title.lower(): + return entry + return None + + def check_entries( key, entries ): + if type(entries) == list: + these_matches = [] + for entry in entries: + match = get_matched_entry(entry) + if match: + these_matches.append(match) + + if these_matches: + collection.setdefault( key, [] ) + collection[key] += these_matches + + elif type(entries) == dict: + for key, subentries in entries.items(): + check_entries( key, subentries ) + + for key, entries in manpages.items(): + check_entries( key, entries ) + + return collection.items() + + def get_check_catalog(args): def path_prefix_matches(p, op): if op and not p: @@ -15129,6 +15179,7 @@ def render_manpage_topic(manpages, titles, has_second_level, path, topic_title): for title, subnode, path_comp in entries: render_manpage_list(subnode, titles, path_comp, title) + def get_check_plugin_stats(subnode): if type(subnode) == list: num_cats = 1

7 years, 10 months

Fix for Werk #4097

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5450e0613afe7def0ed96592c5c66c84a01e540d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5450e0613afe7d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 30 13:44:42 2016 +0100 Fix for Werk #4097 --- bin/mkeventd | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 5fb2cfa..7203a1e 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3458,12 +3458,11 @@ class EventStatus(): status = self.pack_status() path = g_state_dir + "/status" # Belive it or not: cPickle is more than two times slower than repr() - f=file(path + ".new", "w") - f.write(repr(status) + "\n") - fd = f.fileno() - f.flush() - f.close() - os.fsync(fd) + with file(path + ".new", "w") as f: + f.write(repr(status) + "\n") + fd = f.fileno() + f.flush() + os.fsync(fd) os.rename(path + ".new", path) elapsed = time.time() - now if opt_debug:

7 years, 10 months

Tests: added some debug messages

by Lars Michelsen

Module: check_mk Branch: master Commit: e505ccd5a91e5b277b75fae2f1ae258bcf39ba82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e505ccd5a91e5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 13:44:27 2016 +0100 Tests: added some debug messages --- tests/livestatus/test_livestatus.py | 2 ++ tests/testlib/__init__.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/livestatus/test_livestatus.py b/tests/livestatus/test_livestatus.py index bb904a1..5526cb7 100644 --- a/tests/livestatus/test_livestatus.py +++ b/tests/livestatus/test_livestatus.py @@ -6,6 +6,7 @@ from testlib import web @pytest.fixture(scope="module") def default_cfg(web): + print "Applying default config" web.add_host("livestatus-test-host", attributes={ "ipaddress": "127.0.0.1", }) @@ -18,6 +19,7 @@ def default_cfg(web): # # Cleanup code # + print "Cleaning up default config" web.delete_host("livestatus-test-host") diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d03fb05..8cbe151 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -304,12 +304,14 @@ class Site(object): def set_config(self, key, val, with_restart=False): if with_restart: + print "Stopping site" self.stop() assert omd(["config", self.id, "set", key, val]) == 0 if with_restart: self.start() + print "Started site" def get_config(self, key):

7 years, 10 months

pytest: Run in verbose mode by default

by Lars Michelsen

Module: check_mk Branch: master Commit: a2920793062f131bd52fe9f6292c2c1d3de8ca20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2920793062f13… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 11:35:44 2016 +0100 pytest: Run in verbose mode by default --- pytest.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index d0924d8..a43d447 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,4 +3,4 @@ testpaths = tests # Fail on first error and enable stepwise plugin to track steps and # be able to continue with the failed test after analyzing and fixing # the issue -addopts = -rs --maxfail=1 +addopts = -rs -v --maxfail=1

7 years, 10 months

fixed filter

by Simon Betz

Module: check_mk Branch: master Commit: ed701a11f021c9aab85ce989f94c62a825c4cf35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed701a11f021c9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 30 11:12:45 2016 +0100 fixed filter --- web/htdocs/htmllib.py | 4 +++- web/plugins/visuals/filters.py | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 97e6c0b..d8ccdc7 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1846,7 +1846,9 @@ class html(DeprecationWrapper): self.form_vars.append(varname) - def sorted_select(self, varname, choices, deflt="", onchange=None, attrs = {}): + def sorted_select(self, varname, choices, deflt="", onchange=None, attrs = None): + if attrs is None: + attrs = {} # Sort according to display texts, not keys sorted = choices[:] sorted.sort(lambda a,b: cmp(a[1].lower(), b[1].lower())) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index be1771e..60a9d3c 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1218,15 +1218,18 @@ declare_filter(302, FilterHostAuxTags()) # choices = [ (value, "readable"), .. ] class FilterCustomVarChoice(Filter): def __init__(self, name, title, info, custom_var, choices): - Filter.__init__(self, name, title, info, [ name ], []) self.custom_var = custom_var self.choices = choices - self.lower_bound_varname = "%s_lower" % self.name - self.upper_bound_varname = "%s_upper" % self.name + self.lower_bound_varname = "%s_lower" % name + self.upper_bound_varname = "%s_upper" % name + + Filter.__init__( self, name, title, info, + [ self.lower_bound_varname, + self.upper_bound_varname, ], [] ) def _prepare_choices(self): - return map( lambda x: ( x[0], "%s - %s" % (x[0], x[1]) ), self.choices ) + return map( lambda x: ( str(x[0]), "%s - %s" % (x[0], x[1]) ), self.choices ) def display(self): @@ -1242,14 +1245,14 @@ class FilterCustomVarChoice(Filter): upper_bound = html.var(self.upper_bound_varname) if lower_bound and upper_bound: - filterline = "Filter: %s_custom_variable_names = %s\n" % \ + filterline = "Filter: %s_custom_variable_names >= %s\n" % \ ( self.info, self.custom_var ) filterline_values = [] for value, readable in self.choices: if value >= int(lower_bound) and value <= int(upper_bound): - filterline_values.append( "Filter: custom_variable_values >= %s" % \ - lqencode(str(value)) ) + filterline_values.append( "Filter: %s_custom_variable_values >= %s" % \ + (self.info, lqencode(str(value))) ) filterline += "%s\n" % "\n".join( filterline_values ) len_filterline_values = len(filterline_values)

7 years, 10 months

Fixed typo

by Lars Michelsen

Module: check_mk Branch: master Commit: c93129a9b4ba00439155edde4fedf3941abf4b2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c93129a9b4ba00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 08:33:19 2016 +0100 Fixed typo --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b07890a..ab73446 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2971,7 +2971,7 @@ def ip_address_of(hostname, family=None): g_failed_ip_lookups.append(hostname) if not ignore_ip_lookup_failures: configuration_warning("Cannot lookup IP address of '%s' (%s). " - "The host will note be monitored correctly." % (hostname, e)) + "The host will not be monitored correctly." % (hostname, e)) return fallback_ip_for(hostname, family)

7 years, 10 months

4097 FIX Event console: Make writing of status file more robust

by Konstantin Büttner

Module: check_mk Branch: master Commit: b6c1ba80bb0943dce14af9d1393eb15085629082 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c1ba80bb0943… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 29 14:58:16 2016 +0100 4097 FIX Event console: Make writing of status file more robust Previously, a system crash at an inopportune moment could cause the status file to be corrupt, requiring manual deletion to start the mkeventd. --- .werks/4097 | 12 ++++++++++++ ChangeLog | 3 +++ bin/mkeventd | 7 ++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/4097 b/.werks/4097 new file mode 100644 index 0000000..c83bc0d --- /dev/null +++ b/.werks/4097 @@ -0,0 +1,12 @@ +Title: Event console: Make writing of status file more robust +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480427713 + +Previously, a system crash at an inopportune moment could cause +the status file to be corrupt, requiring manual deletion to start +the mkeventd. diff --git a/ChangeLog b/ChangeLog index 8bd2313..f80e2b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,9 @@ BI: * 3991 FIX: BI Aggregations: no longer show duplicate aggregations when an aggregation has mulitple groups + Event Console: + * 4097 FIX: Event console: Make writing of status file more robust... + Livestatus: * 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands table via Livestatus.... diff --git a/bin/mkeventd b/bin/mkeventd index d6e8c67..5fb2cfa 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3458,7 +3458,12 @@ class EventStatus(): status = self.pack_status() path = g_state_dir + "/status" # Belive it or not: cPickle is more than two times slower than repr() - file(path + ".new", "w").write(repr(status) + "\n") + f=file(path + ".new", "w") + f.write(repr(status) + "\n") + fd = f.fileno() + f.flush() + f.close() + os.fsync(fd) os.rename(path + ".new", path) elapsed = time.time() - now if opt_debug:

7 years, 10 months

Improved WATO activating audit logging a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: d97e70567a81718b8cf84ec13754146854fd6d63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d97e70567a8171… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 14:37:09 2016 +0100 Improved WATO activating audit logging a bit --- web/htdocs/watolib.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 79eea4d..4677b47 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4200,12 +4200,13 @@ class ActivateChangesManager(ActivateChanges): def _start_activation(self): + self._log_activation() for site_id in self._sites: self._start_site_activation(site_id) def _start_site_activation(self, site_id): - self._log_activation(site_id) + self._log_site_activation(site_id) # This is doing the first fork and the ActivateChangesSite() is doing the second # (to avoid zombie processes when sync processes exit) @@ -4220,12 +4221,16 @@ class ActivateChangesManager(ActivateChanges): os._exit(0) - def _log_activation(self, site_id): - log_msg = _("Started activation of site %s") % site_id + def _log_activation(self): + log_msg = _("Starting activation (Sites: %s)") % ",".join(self._sites) + log_audit(None, "activate-changes", log_msg) + if self._comment: - log_msg += " (%s: %s)" % (_("Comment"), self._comment) + log_audit(None, "activate-changes", "%s: %s" % (_("Comment"), self._comment)) - log_audit(None, "activate-changes", log_msg) + + def _log_site_activation(self, site_id): + log_audit(None, "activate-changes", _("Started activation of site %s") % site_id) def get_state(self):

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 0492da9fa476a4cb701adb2db79d22dae33a891b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0492da9fa476a4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 29 13:56:01 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/LogwatchListColumn.cc | 33 +++++++++++++++++---------------- livestatus/src/mk_logwatch.cc | 15 +++------------ livestatus/src/mk_logwatch.h | 3 --- 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index 03d2734..ce0b99c 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -25,7 +25,7 @@ #include "LogwatchListColumn.h" #include <dirent.h> #include "Renderer.h" -#include "mk_logwatch.h" +#include "pnp4nagios.h" #ifdef CMC #include "Host.h" @@ -49,21 +49,22 @@ void LogwatchListColumn::output(void *row, RowRenderer &r, #endif ListRenderer l(r); - string path = mk_logwatch_path_of_host(_logwatch_path, host_name); - if (path != "") { - if (DIR *dir = opendir(path.c_str())) { - while (true) { - struct dirent de; - struct dirent *dep; - readdir_r(dir, &de, &dep); - if (dep == nullptr) { - closedir(dir); - break; - } - string name = dep->d_name; - if (name != "." && name != "..") { - l.output(name); - } + if (_logwatch_path.empty()) { + return; + } + string path = _logwatch_path + pnp_cleanup(host_name); + if (DIR *dir = opendir(path.c_str())) { + while (true) { + struct dirent de; + struct dirent *dep; + readdir_r(dir, &de, &dep); + if (dep == nullptr) { + closedir(dir); + break; + } + string name = dep->d_name; + if (name != "." && name != "..") { + l.output(name); } } } diff --git a/livestatus/src/mk_logwatch.cc b/livestatus/src/mk_logwatch.cc index 661cfed..da94ffc 100644 --- a/livestatus/src/mk_logwatch.cc +++ b/livestatus/src/mk_logwatch.cc @@ -30,12 +30,6 @@ using std::string; -string mk_logwatch_path_of_host(const string &logwatch_path, - const string &host_name) { - return logwatch_path.empty() ? "" - : (logwatch_path + pnp_cleanup(host_name)); -} - void mk_logwatch_acknowledge(Logger *logger, const std::string &logwatch_path, const string &host_name, const string &file_name) { if (file_name.find('/') != string::npos) { @@ -43,14 +37,11 @@ void mk_logwatch_acknowledge(Logger *logger, const std::string &logwatch_path, << file_name << "' of host '" << host_name << "'"; return; } - - string path = mk_logwatch_path_of_host(logwatch_path, host_name); - if (path.empty()) { + if (logwatch_path.empty()) { return; } - - int r = remove((path + "/" + file_name).c_str()); - if (r != 0) { + string path = logwatch_path + pnp_cleanup(host_name) + "/" + file_name; + if (remove(path.c_str()) != 0) { generic_error ge("Cannot acknowledge mk_logfile file '" + file_name + "' of host '" + host_name + "'"); Warning(logger) << ge; diff --git a/livestatus/src/mk_logwatch.h b/livestatus/src/mk_logwatch.h index 6602fba..b373911 100644 --- a/livestatus/src/mk_logwatch.h +++ b/livestatus/src/mk_logwatch.h @@ -29,9 +29,6 @@ #include <string> class Logger; -std::string mk_logwatch_path_of_host(const std::string &logwatch_path, - const std::string &host_name); - void mk_logwatch_acknowledge(Logger *logger, const std::string &logwatch_path, const std::string &host_name, const std::string &file_name);

7 years, 10 months

3995 skype check: updated perfvariable and metric names, making their purpose more clear

by Andreas Boesl

Module: check_mk Branch: master Commit: 49bbfaf4ad96d9a784ed336c432d29e913c4361e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49bbfaf4ad96d9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 29 13:03:32 2016 +0100 3995 skype check: updated perfvariable and metric names, making their purpose more clear Due to the renaming, already existing performance data is lost. This check was introduced recently, so this won't have much impact. --- .werks/3995 | 10 +++ ChangeLog | 2 + checks/skype | 72 ++++++++++---------- web/plugins/metrics/check_mk.py | 142 ++++++++++++++++++++-------------------- 4 files changed, 119 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=49bbfaf4ad…

7 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016