Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6227 FIX Fix failing termination or config reload

by Konstantin Büttner

Module: check_mk Branch: master Commit: fc519a21c8a878af8e0175437c2621037d78fdac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc519a21c8a878… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 13 10:49:09 2018 +0200 6227 FIX Fix failing termination or config reload Change-Id: Ifb0b0e0a2aa49cc12c54bea618ccf7f4b6c756e2 --- .werks/6227 | 10 +++++++++ cmk/ec/main.py | 69 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/.werks/6227 b/.werks/6227 new file mode 100644 index 0000000..a4ee1a4 --- /dev/null +++ b/.werks/6227 @@ -0,0 +1,10 @@ +Title: Fix failing termination or config reload +Level: 2 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531469606 + diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 93a0386..0a0526e 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3183,35 +3183,41 @@ def run_eventd(terminate_main_event, settings, config, lock_configuration, histo while not terminate_main_event.is_set(): try: - # Wait until either housekeeping or retention is due, but at - # maximum 60 seconds. That way changes of the interval from a very - # high to a low value will never require more than 60 seconds - - event_list = [next_housekeeping, next_retention, next_statistics] - if is_replication_slave(config): - event_list.append(next_replication) - - time_left = max(0, min(event_list) - time.time()) - time.sleep(min(time_left, 60)) - - now = time.time() - if now > next_housekeeping: - event_server.do_housekeeping() - next_housekeeping = now + config["housekeeping_interval"] - - if now > next_retention: - with event_status.lock: - event_status.save_status() - next_retention = now + config["retention_interval"] - - if now > next_statistics: - perfcounters.do_statistics() - next_statistics = now + config["statistics_interval"] - - # Beware: replication might be turned on during this loop! - if is_replication_slave(config) and now > next_replication: - replication_pull(settings, config, lock_configuration, perfcounters, event_status, event_server, slave_status, logger) - next_replication = now + config["replication"]["interval"] + try: + # Wait until either housekeeping or retention is due, but at + # maximum 60 seconds. That way changes of the interval from a very + # high to a low value will never require more than 60 seconds + + event_list = [next_housekeeping, next_retention, next_statistics] + if is_replication_slave(config): + event_list.append(next_replication) + + time_left = max(0, min(event_list) - time.time()) + time.sleep(min(time_left, 60)) + + now = time.time() + if now > next_housekeeping: + event_server.do_housekeeping() + next_housekeeping = now + config["housekeeping_interval"] + + if now > next_retention: + with event_status.lock: + event_status.save_status() + next_retention = now + config["retention_interval"] + + if now > next_statistics: + perfcounters.do_statistics() + next_statistics = now + config["statistics_interval"] + + # Beware: replication might be turned on during this loop! + if is_replication_slave(config) and now > next_replication: + replication_pull(settings, config, lock_configuration, perfcounters, event_status, event_server, slave_status, logger) + next_replication = now + config["replication"]["interval"] + except Exception as e: + logger.exception("Exception in main thread:\n%s" % e) + if settings.options.debug: + raise + time.sleep(1) except MKSignalException as e: if e._signum == 1: logger.info("Received SIGHUP - going to reload configuration") @@ -3219,11 +3225,6 @@ def run_eventd(terminate_main_event, settings, config, lock_configuration, histo else: logger.info("Signalled to death by signal %d" % e._signum) terminate(terminate_main_event, event_server, status_server) - except Exception as e: - logger.exception("Exception in main thread:\n%s" % e) - if settings.options.debug: - raise - time.sleep(1) # Now wait for termination of the server threads event_server.join()

6 years, 2 months

Fixed and enabled simplifiable-if-statement warnings.

by Sven Panne

Module: check_mk Branch: master Commit: de4f12ce9596671536b5d7baae67724f73dd02d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de4f12ce959667… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 10:32:50 2018 +0200 Fixed and enabled simplifiable-if-statement warnings. Change-Id: I410f0f8daf91d8d3770e9304b6525efdbd828c4f --- cmk/gui/htmllib.py | 5 +---- cmk/gui/valuespec.py | 10 ++-------- tests/pylint/pylintrc | 3 +-- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 307c701..79f6f10 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -977,10 +977,7 @@ class TransactionManager(object): return False # Now check, if this id is a valid one - if id in self._load_transids(): - return True - else: - return False + return id in self._load_transids() def is_transaction(self): diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index cc2a5db..b2e38bc 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1540,10 +1540,7 @@ class Checkbox(ValueSpec): return self._true_label if value else self._false_label def from_html_vars(self, varprefix): - if html.var(varprefix): - return True - else: - return False + return bool(html.var(varprefix)) def validate_datatype(self, value, varprefix): if type(value) != bool: @@ -3067,10 +3064,7 @@ class OptionalEdit(Optional): div_id = "option_" + varprefix checked = html.get_checkbox(varprefix + "_use") if checked == None: - if self._negate: - checked = True - else: - checked = False + checked = self._negate html.open_span() diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index c4e80d4..1b5807c 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,9 +77,8 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The 4 warnings below have already been fixed for non-web/ code. When the + # The 3 warnings below have already been fixed for non-web/ code. When the # upcoming reorganization of web/ has been landed, these should be fixed first. - simplifiable-if-statement, unnecessary-lambda, unnecessary-pass, useless-super-delegation,

6 years, 2 months

Fixed and enabled old-style-class warnings.

by Sven Panne

Module: check_mk Branch: master Commit: ccaf3ca92103ca3cab24fe0b7c1b21b8104720ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccaf3ca92103ca… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 10:19:53 2018 +0200 Fixed and enabled old-style-class warnings. Change-Id: I5eab9793142a05f7a3f7505904af7db4c94af2a8 --- cmk/gui/watolib.py | 3 +-- tests/pylint/pylintrc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index d1da847..b0c8f3f 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -3080,9 +3080,8 @@ class CREHost(WithPermissionsAndAttributes): # | hosts. Examples are the IP address and the host tags. | # '----------------------------------------------------------------------' -# TODO: Make new style class # TODO: Refactor declare_host_attribute() setting private attributes here -class Attribute: +class Attribute(object): # The constructor stores name and title. If those are # dynamic then leave them out and override name() and # title() diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 5ce8339..c4e80d4 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,9 +77,8 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The 5 warnings below have already been fixed for non-web/ code. When the + # The 4 warnings below have already been fixed for non-web/ code. When the # upcoming reorganization of web/ has been landed, these should be fixed first. - old-style-class, simplifiable-if-statement, unnecessary-lambda, unnecessary-pass,

6 years, 2 months

Fixed wrong conditional import of CME specific module

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ae68efb9e62d1cfcd80b59c61cd12eba53c5c49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae68efb9e62d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 10:14:17 2018 +0200 Fixed wrong conditional import of CME specific module Change-Id: Ica98cd7d05d1ef2b0ae65eb3a678858d1689cec0 --- cmk/gui/modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/modules.py b/cmk/gui/modules.py index 953db41..3ee5695 100644 --- a/cmk/gui/modules.py +++ b/cmk/gui/modules.py @@ -61,7 +61,7 @@ import cmk.gui.plugins.main_modules if not cmk.is_raw_edition(): import cmk.gui.cee.plugins.main_modules -if not cmk.is_managed_edition(): +if cmk.is_managed_edition(): import cmk.gui.cme.plugins.main_modules # TODO: Both kept for compatibility with old plugins. Drop this one day

6 years, 2 months

Fixed and enabled misplaced-comparison-constant warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 64d4810d8a66956e988af2ae4fe0672a2a9e9471 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d4810d8a6695… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 09:54:43 2018 +0200 Fixed and enabled misplaced-comparison-constant warnings. Change-Id: I23726a86e32bf83e4572bde09318bfb0308e2a57 --- cmk/gui/mkeventd.py | 6 +++--- cmk/gui/wato/__init__.py | 6 +++--- tests/pylint/pylintrc | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmk/gui/mkeventd.py b/cmk/gui/mkeventd.py index 2698dc0..6438d3d 100644 --- a/cmk/gui/mkeventd.py +++ b/cmk/gui/mkeventd.py @@ -315,13 +315,13 @@ def event_rule_matches(rule_pack, rule, event): def event_rule_matches_non_inverted(rule_pack, rule, event): - if False == match_ipv4_network(rule.get("match_ipaddress", "0.0.0.0/0"), event["ipaddress"]): + if match_ipv4_network(rule.get("match_ipaddress", "0.0.0.0/0"), event["ipaddress"]) == False: return _("The source IP address does not match.") - if False == match(rule.get("match_host"), event["host"], complete=True): + if match(rule.get("match_host"), event["host"], complete=True) == False: return _("The host name does not match.") - if False == match(rule.get("match_application"), event["application"], complete=False): + if match(rule.get("match_application"), event["application"], complete=False) == False: return _("The application (syslog tag) does not match") if "match_facility" in rule and event["facility"] != rule["match_facility"]: diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 153d5ab..3ff0bef 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -432,7 +432,7 @@ def page_handler(): target = target() if not target: continue - if '/' == target[0] or target.startswith('../') or '://' in target: + if target[0] == '/' or target.startswith('../') or '://' in target: html.context_button(buttontext, target) else: html.context_button(buttontext, watolib.folder_preserving_link([("mode", target)])) @@ -10101,8 +10101,8 @@ class ModeUsers(WatoMode): html.i(_("not a contact")) elif not user.get("notifications_enabled", True): html.write_text(_("disabled")) - elif "" == user.get("host_notification_options", "") \ - and "" == user.get("service_notification_options", ""): + elif user.get("host_notification_options", "") == "" and \ + user.get("service_notification_options", "") == "": html.write_text(_("all events disabled")) else: tp = user.get("notification_period", "24X7") diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 6abeb1e..5ce8339 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,9 +77,8 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The 6 warnings below have already been fixed for non-web/ code. When the + # The 5 warnings below have already been fixed for non-web/ code. When the # upcoming reorganization of web/ has been landed, these should be fixed first. - misplaced-comparison-constant, old-style-class, simplifiable-if-statement, unnecessary-lambda,

6 years, 2 months

Added missing fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 7731232c73a01ecddd7682f58fde2587ba0e1871 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7731232c73a01e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 10:03:44 2018 +0200 Added missing fixes. Change-Id: Iaf238e7d12976d51e503d63cd03a6d6743c01780 --- cmk/gui/plugins/userdb/hook_auth.py | 2 +- cmk/gui/plugins/wato/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/userdb/hook_auth.py b/cmk/gui/plugins/userdb/hook_auth.py index 1b567e2..09afaf7 100644 --- a/cmk/gui/plugins/userdb/hook_auth.py +++ b/cmk/gui/plugins/userdb/hook_auth.py @@ -68,7 +68,7 @@ g_auth_base_dir = cmk.paths.var_dir + '/wato/auth' def format_php(data, lvl = 1): s = '' - if isinstance(data, tuple) or isinstance(data, list): + if isinstance(data, (list, tuple)): s += 'array(\n' for item in data: s += ' ' * lvl + format_php(item, lvl + 1) + ',\n' diff --git a/cmk/gui/plugins/wato/utils.py b/cmk/gui/plugins/wato/utils.py index 72e594b..9a05127 100644 --- a/cmk/gui/plugins/wato/utils.py +++ b/cmk/gui/plugins/wato/utils.py @@ -583,7 +583,7 @@ def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, itemtype = "item" itemname = itemspec.title() itemhelp = itemspec.help() - if isinstance(itemspec, DropdownChoice) or isinstance(itemspec, OptionalDropdownChoice): + if isinstance(itemspec, (DropdownChoice, OptionalDropdownChoice)): itemenum = itemspec._choices else: itemtype = None

6 years, 2 months

Improve werk description

by Konstantin Büttner

Module: check_mk Branch: master Commit: f4e5bf3311c5ffba5bf7a01b1650d423c27b886c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4e5bf3311c5ff… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 13 09:52:48 2018 +0200 Improve werk description Change-Id: Ie3e8829027166c5891220a0dd4b96ccc85b10407 --- .werks/6225 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/6225 b/.werks/6225 index a1b917d..7decad4 100644 --- a/.werks/6225 +++ b/.werks/6225 @@ -1,4 +1,4 @@ -Title: Fix key errors in mkeventd.log due to missing default values +Title: Fix issues with expected messages and downtime event cleanup Level: 1 Component: ec Class: fix

6 years, 2 months

Fixed and enabled consider-merging-isinstance warnings.

by Sven Panne

Module: check_mk Branch: master Commit: f2afd0e6eaa4f9c5bf4de166caffcd963343e1ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2afd0e6eaa4f9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 09:50:16 2018 +0200 Fixed and enabled consider-merging-isinstance warnings. Change-Id: Ibb0262eb37c5e80bd31d973ff01a3bc60d1d69fe --- cmk/gui/bi.py | 2 +- cmk/gui/config.py | 4 ++-- cmk/gui/dashboard.py | 2 +- cmk/gui/watolib.py | 2 +- tests/pylint/pylintrc | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 5553f2e..3b113cd 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -3714,7 +3714,7 @@ def _convert_legacy_aggregation_rule(rule): if isinstance(rule, dict): return rule - if isinstance(rule, tuple) or isinstance(rule, list): + if isinstance(rule, (list, tuple)): # Rule has at least four entries. # Since version 1.4.0b4 # - werk 4460 introduced 'state_messages'. diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 0b13ef9..44f1b3a 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -162,7 +162,7 @@ def load_config(): # Apply the default configuration to the module global level for k, v in default_config.items(): - if isinstance(v, dict) or isinstance(v, list): + if isinstance(v, (dict, list)): v = copy.deepcopy(v) globals()[k] = v @@ -214,7 +214,7 @@ def _load_default_config_from_module_plugins(): if k[0] == "_": continue - if isinstance(v, dict) or isinstance(v, list): + if isinstance(v, (dict, list)): v = copy.deepcopy(v) default_config[k] = v diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 6de80f7..d2ad9fa 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -1126,7 +1126,7 @@ def page_edit_dashlet(): elements = params, ) - elif isinstance(params, Dictionary) or isinstance(params, Transform): + elif isinstance(params, (Dictionary, Transform)): vs_type = params elif type(params) == type(lambda x: x): diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index c7a4dca..d1da847 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -6549,7 +6549,7 @@ function all_taggroup_choices($object_tags) { def format_php(data, lvl = 1): s = '' - if isinstance(data, tuple) or isinstance(data, list): + if isinstance(data, (list, tuple)): s += 'array(\n' for item in data: s += ' ' * lvl + format_php(item, lvl + 1) + ',\n' diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 137ba98..6abeb1e 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,9 +77,8 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The 7 warnings below have already been fixed for non-web/ code. When the + # The 6 warnings below have already been fixed for non-web/ code. When the # upcoming reorganization of web/ has been landed, these should be fixed first. - consider-merging-isinstance, misplaced-comparison-constant, old-style-class, simplifiable-if-statement,

6 years, 2 months

Removed plugins directory from distr tarball packaging

by Lars Michelsen

Module: check_mk Branch: master Commit: 3fd552d38c71701cab0cc39a45b284b047deddc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fd552d38c7170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 09:16:20 2018 +0200 Removed plugins directory from distr tarball packaging Change-Id: I4b52edf610687ac9c3d40bf9f0e810285166c88d --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 29a21e4..a7df15b 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,6 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI tar czf $(DISTNAME)/notifications.tar.gz $(TAROPTS) -C notifications $$(cd notifications ; ls) tar czf $(DISTNAME)/inventory.tar.gz $(TAROPTS) -C inventory $$(cd inventory ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) - tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins app tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs app tar xzf mk-livestatus-$(VERSION).tar.gz

6 years, 2 months

Fixed missing _ in cmk code after making pylint check for this variable

by Lars Michelsen

Module: check_mk Branch: master Commit: 36d49614b742618514698a5eaaf751aa8b709fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36d49614b74261… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 13 09:06:36 2018 +0200 Fixed missing _ in cmk code after making pylint check for this variable Change-Id: Ic27056e5e5f532a6f331d5e8b7d5cb54c07248d2 --- cmk/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmk/__init__.py b/cmk/__init__.py index f4e87f0..d0cec5b 100644 --- a/cmk/__init__.py +++ b/cmk/__init__.py @@ -36,6 +36,14 @@ import os import cmk.paths from cmk.exceptions import MKGeneralException +# TODO: Clean this up one day by using the way recommended by gettext. +# (See https://docs.python.org/2/library/gettext.html). For this we +# need the path to the locale files here. +try: + _ +except NameError: + _ = lambda x: x # Fake i18n when not available + def omd_version(): return os.path.basename(os.readlink(cmk.paths.omd_root + "/version"))

6 years, 2 months

← Newer
1
...
25
26
27
28
29
30
31
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018