Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

Check table is now filterable (services +/- clustered services)

by Lars Michelsen

Module: check_mk Branch: master Commit: 1963e4ca0e7f9599e7264ed3c5dd280283338dc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1963e4ca0e7f95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 14:11:59 2018 +0200 Check table is now filterable (services +/- clustered services) Previously the check table was always filtering clustered services. For two fixes it was now necessary to fetch either only clustered and the regular including clustered services. Future: Clean up the check table implementation to make it easier to deal with these different views on the check table. Change-Id: Ie0b797a9b61837f64740c7b3342a3808ae892cf4 --- cmk_base/check_table.py | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/cmk_base/check_table.py b/cmk_base/check_table.py index e6ac18b..bd1f3a8 100644 --- a/cmk_base/check_table.py +++ b/cmk_base/check_table.py @@ -36,10 +36,16 @@ import cmk_base.rulesets as rulesets import cmk_base.piggyback as piggyback import cmk_base.item_state as item_state +# TODO: Refactor this to OO. The check table needs to be an object. # Returns check table for a specific host # Format: (checkname, item) -> (params, description) -def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='config', skip_autochecks=False): +# +# filter_mode: None -> default, returns only checks for this host +# filter_mode: "include_clustered" -> returns checks of own host, including clustered checks +# filter_mode: "only_clustered" -> returns only checks belonging to clusters +def get_check_table(hostname, remove_duplicates=False, use_cache=True, + world='config', skip_autochecks=False, filter_mode=None): import cmk_base.discovery as discovery if config.is_ping_host(hostname): @@ -47,12 +53,16 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co # speed up multiple lookup of same host check_table_cache = cmk_base.config_cache.get_dict("check_tables") + table_cache_id = hostname, filter_mode - if not skip_autochecks and use_cache and hostname in check_table_cache: + if not skip_autochecks and use_cache and table_cache_id in check_table_cache: + # TODO: The whole is_dual_host handling needs to be cleaned up. The duplicate checking + # needs to be done in all cases since a host can now have a lot of different data + # sources. if remove_duplicates and config.is_dual_host(hostname): - return _remove_duplicate_checks(check_table_cache[hostname]) + return _remove_duplicate_checks(check_table_cache[table_cache_id]) else: - return check_table_cache[hostname] + return check_table_cache[table_cache_id] check_table = {} @@ -123,8 +133,15 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co descr = config.service_description(hostname, checkname, item) if config.service_ignored(hostname, checkname, descr): return - if hostname != config.host_of_clustered_service(hostname, descr): + + svc_is_mine = hostname == config.host_of_clustered_service(hostname, descr) + print hostname, descr, svc_is_mine, filter_mode + if filter_mode is None and not svc_is_mine: return + + elif filter_mode == "only_clustered" and svc_is_mine: + return + deps = service_deps(hostname, descr) check_table[(checkname, item)] = (params, descr, deps) @@ -168,7 +185,7 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co deps.append(d) if not skip_autochecks and use_cache: - check_table_cache[hostname] = check_table + check_table_cache[table_cache_id] = check_table if remove_duplicates: return _remove_duplicate_checks(check_table) @@ -176,8 +193,8 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co return check_table -def get_precompiled_check_table(hostname, remove_duplicates=True, world="config"): - host_checks = get_sorted_check_table(hostname, remove_duplicates, world) +def get_precompiled_check_table(hostname, remove_duplicates=True, world="config", filter_mode=None): + host_checks = get_sorted_check_table(hostname, remove_duplicates, world, filter_mode=filter_mode) precomp_table = [] for check_plugin_name, item, params, description, _unused_deps in host_checks: # make these globals available to the precompile function @@ -254,12 +271,13 @@ def _remove_duplicate_checks(check_table): # if there already is a TCP based one with the same # description. E.g: df vs hr_fs. # TODO: Clean this up! -def get_sorted_check_table(hostname, remove_duplicates=False, world="config"): +def get_sorted_check_table(hostname, remove_duplicates=False, world="config", filter_mode=None): # Convert from dictionary into simple tuple list. Then sort # it according to the service dependencies. unsorted = [ (checkname, item, params, descr, deps) for ((checkname, item), (params, descr, deps)) - in get_check_table(hostname, remove_duplicates=remove_duplicates, world=world).items() ] + in get_check_table(hostname, remove_duplicates=remove_duplicates, world=world, + filter_mode=filter_mode).items() ] def cmp(a, b): if a[3] < b[3]:

6 years, 2 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: f4f83afa9fc8cb70ccc0bc71cc495d4620bd9eef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4f83afa9fc8cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 27 14:16:49 2018 +0200 Reserved 30 Werk IDS Change-Id: I9200eea24554a4d7ece2eb2702af208b42bec119 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 13d67a3..3ce8b89 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6039 +6069

6 years, 2 months

Put the SNMP trap engine state into a new class.

by Sven Panne

Module: check_mk Branch: master Commit: 2948e76fd8b1d5c236288b8191562d784a17022d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2948e76fd8b1d5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 27 10:49:39 2018 +0200 Put the SNMP trap engine state into a new class. This is a purely mechanical refactoring, and the class is still "dumb". Change-Id: I247d9198d72c68c166d5791a30e6de14f53696fc --- cmk/ec/main.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 1b81f07..724bd8e 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -466,6 +466,13 @@ class MKClientError(Exception): # | Generic SNMP-Trap processing functions | # '----------------------------------------------------------------------' +class SNMPTrapEngine(object): + def __init__(self, snmp_receiver, the_snmp_engine): + super(SNMPTrapEngine, self).__init__() + self.snmp_receiver = snmp_receiver + self.snmp_engine = the_snmp_engine + + def initialize_snmptrap_handling(settings, config, event_server, table_events): if settings.options.snmptrap_udp is None: return @@ -484,9 +491,9 @@ def initialize_snmptrap_engine(config, event_server, table_events): pduTypes = (snmp_v1.TrapPDU.tagSet, snmp_v2c.SNMPv2TrapPDU.tagSet) initialize_snmp_credentials(config, the_snmp_engine) - global g_snmp_receiver, g_snmp_engine - g_snmp_receiver = ECNotificationReceiver(the_snmp_engine, event_server.handle_snmptrap) - g_snmp_engine = the_snmp_engine + snmp_receiver = ECNotificationReceiver(the_snmp_engine, event_server.handle_snmptrap) + global g_snmp_trap_engine + g_snmp_trap_engine = SNMPTrapEngine(snmp_receiver, the_snmp_engine) def auth_proto_for(proto_name): @@ -1562,8 +1569,8 @@ class EventServer(ECServerThread): def process_snmptrap(self, data): whole_msg, sender_address = data self.logger.verbose("Trap received from %s:%d. Checking for acceptance now." % sender_address) - g_snmp_engine.setUserContext(sender_address=sender_address) - g_snmp_engine.msgAndPduDsp.receiveMessage(g_snmp_engine, (), (), whole_msg) + g_snmp_trap_engine.snmp_engine.setUserContext(sender_address=sender_address) + g_snmp_trap_engine.snmp_engine.msgAndPduDsp.receiveMessage(g_snmp_trap_engine.snmp_engine, (), (), whole_msg) def handle_snmptrap(self, snmp_engine, state_reference, context_engine_id, context_name, var_binds, cb_ctx):

6 years, 2 months

Don't import names directly, use their hierarchical names.

by Sven Panne

Module: check_mk Branch: master Commit: c503f217427804eaa52371c4ea3ef030e10da08e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c503f217427804… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 27 10:59:32 2018 +0200 Don't import names directly, use their hierarchical names. Explicit is better than implicit, and the previous naming was confusing (even if it was shorter). Actually the naming was so confusing that it contained a bug... :-) This has been fixed on the way, a werk is coming in a separate commit. With some global names now free, rename some local variables back to something more readable. Change-Id: Iab5ba58aee8ee1007bf01967bb2aeb71da348cea --- cmk/ec/main.py | 84 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c503f21742…

6 years, 2 months

6011 FIX Fixed host name translation via regexes in the EC

by Sven Panne

Module: check_mk Branch: master Commit: 1d8139eb006e21a2bb13c1441e0b7b9239ba9161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d8139eb006e21… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 27 11:47:25 2018 +0200 6011 FIX Fixed host name translation via regexes in the EC Using a host name translation via regexes resulted in an exception in the event console, this has been fixed. Note that this was a regression starting with the earliest 1.4.0 relase, the 1.2.8 series is OK. Change-Id: Ibf357e49969dd893c23bad27c18c7d5c456f2338 --- .werks/6011 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6011 b/.werks/6011 new file mode 100644 index 0000000..e6bdf51 --- /dev/null +++ b/.werks/6011 @@ -0,0 +1,12 @@ +Title: Fixed host name translation via regexes in the EC +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524822276 +Class: fix + +Using a host name translation via regexes resulted in an exception in the +event console, this has been fixed. Note that this was a regression +starting with the earliest 1.4.0 relase, the 1.2.8 series is OK.

6 years, 2 months

Fixed arguments. Alaways raise exception.

by Sven Panne

Module: check_mk Branch: master Commit: a75cc96128ed1afe83df3e30acdd9bba206d6ace URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a75cc96128ed1a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 27 08:16:43 2018 +0200 Fixed arguments. Alaways raise exception. Change-Id: Ibf2a55f10dd730b0a919495f526f17be7d5085ce --- cmk/ec/main.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index f700f18..1b81f07 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -583,11 +583,10 @@ class TimePeriods(object): self._last_update = int(time.time()) / 60 except Exception as e: logger.exception("Cannot update timeperiod information: %s" % e) - if settings.options.debug: - raise + raise def check(self, tpname): - self._update(settings) + self._update() if not self._periods: logger.warning("no timeperiod information, assuming %s is active" % tpname) return True @@ -2425,7 +2424,7 @@ class EventServer(ECServerThread): return True def event_rule_matches_timeperiod(self, rule, event): - if "match_timeperiod" in rule and not self._time_periods.check(self.settings, rule["match_timeperiod"]): + if "match_timeperiod" in rule and not self._time_periods.check(rule["match_timeperiod"]): if self._config["debug_rules"]: self.logger.info(" did not match, because timeperiod %s is not active" % rule["match_timeperiod"]) return False

6 years, 2 months

Make time periods a class, nuking 2 global variables.

by Sven Panne

Module: check_mk Branch: master Commit: f88ef498de9db01e5236914abd36be6e5083929c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f88ef498de9db0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 26 16:45:40 2018 +0200 Make time periods a class, nuking 2 global variables. Change-Id: Ic829286a1fc6212b083d1944940f424c67373607 --- cmk/ec/main.py | 64 +++++++++++++++++++++++++++------------------------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 8336ff6..f700f18 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -565,41 +565,36 @@ def initialize_snmp_credentials(config, the_snmp_engine): # | Timeperiods are used in rule conditions | # '----------------------------------------------------------------------' -# Dictionary from name to True/False (active / inactive) -g_timeperiods = None -g_last_timeperiod_update = 0 - - -def update_timeperiods(settings): - global g_timeperiods, g_last_timeperiod_update - - if g_timeperiods is not None and int(time.time()) / 60 == g_last_timeperiod_update: - return # only update once a minute - try: - table = livestatus.LocalConnection().query("GET timeperiods\nColumns: name alias in") - new_timeperiods = {} - for tpname, alias, isin in table: - new_timeperiods[tpname] = (alias, bool(isin)) - g_timeperiods = new_timeperiods - g_last_timeperiod_update = int(time.time()) / 60 - except Exception as e: - logger.exception("Cannot update timeperiod information: %s" % e) - if settings.options.debug: - raise - - -def check_timeperiod(settings, tpname): - update_timeperiods(settings) - if not g_timeperiods: - logger.warning("No timeperiod information. Assuming %s active" % tpname) - return True +class TimePeriods(object): + def __init__(self): + super(TimePeriods, self).__init__() + self._periods = None + self._last_update = 0 - elif tpname not in g_timeperiods: - logger.warning("No such timeperiod %s. Assume to active" % tpname) - return True + def _update(self): + if self._periods is not None and int(time.time()) / 60 == self._last_update: + return # only update once a minute + try: + table = livestatus.LocalConnection().query("GET timeperiods\nColumns: name alias in") + periods = {} + for tpname, alias, isin in table: + periods[tpname] = (alias, bool(isin)) + self._periods = periods + self._last_update = int(time.time()) / 60 + except Exception as e: + logger.exception("Cannot update timeperiod information: %s" % e) + if settings.options.debug: + raise - else: - return g_timeperiods[tpname][1] + def check(self, tpname): + self._update(settings) + if not self._periods: + logger.warning("no timeperiod information, assuming %s is active" % tpname) + return True + if tpname not in self._periods: + logger.warning("no such timeperiod %s, assuming it is active" % tpname) + return True + return self._periods[tpname][1] #. @@ -1291,6 +1286,7 @@ class EventServer(ECServerThread): self.host_config = HostConfig() self._perfcounters = perfcounters self._event_status = event_status + self._time_periods = TimePeriods() self.create_pipe() self.open_eventsocket() @@ -2429,7 +2425,7 @@ class EventServer(ECServerThread): return True def event_rule_matches_timeperiod(self, rule, event): - if "match_timeperiod" in rule and not check_timeperiod(self.settings, rule["match_timeperiod"]): + if "match_timeperiod" in rule and not self._time_periods.check(self.settings, rule["match_timeperiod"]): if self._config["debug_rules"]: self.logger.info(" did not match, because timeperiod %s is not active" % rule["match_timeperiod"]) return False

6 years, 2 months

Simplified conditional.

by Sven Panne

Module: check_mk Branch: master Commit: 27dc348d9c7122ee33eb36c81ef4fe72cc6dba48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27dc348d9c7122… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 26 09:10:50 2018 +0200 Simplified conditional. This way it is a bit clearer that we are actually doing a switch/case here. Change-Id: I716f1ead50db1ff93b1b32598884300887e488de --- omd/packages/python-modules/Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index b16b89a..cb31b24 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -93,18 +93,16 @@ ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 MODULES += cryptography-1.4.tar.gz PATCHES += patches/0005-NID_ecdsa_with_SHA-fix.patch PATCHES += patches/0009-cryptography-1.4-disable-version-warning.patch +else ifneq ($(filter $(DISTRO_CODE),el6),) +# Cryptography dropped support for OpenSSL 1.0.0 with release 1.7 +# (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst), +# so we stick with 1.5.3. + MODULES += cryptography-1.5.3.tar.gz + PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch + PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch else - ifneq ($(filter $(DISTRO_CODE),el6),) - # Cryptography dropped support for OpenSSL 1.0.0 with release 1.7 - # (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst). - # Therefore we need stick with 1.5.3 which was default previously to 1.9. - MODULES += cryptography-1.5.3.tar.gz - PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch - PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch - else - MODULES += cryptography-1.9.tar.gz - MODULES += asn1crypto-0.24.0.tar.gz - endif + MODULES += cryptography-1.9.tar.gz + MODULES += asn1crypto-0.24.0.tar.gz endif # Added for NetApp special agent, but may be used in other components too in future

6 years, 2 months

Fix CentOS 6 build: Needs python cryptography <= 1.7

by Lars Michelsen

Module: check_mk Branch: master Commit: e88f0424b167cd0c72aaa4c9ce5a26a25f2ec488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e88f0424b167cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 20:11:35 2018 +0200 Fix CentOS 6 build: Needs python cryptography <= 1.7 Change-Id: Ib0ead8c0186e592509a358ad1dd3c8bb3fe29e6b --- omd/packages/python-modules/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 89bd41d..b16b89a 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -94,10 +94,17 @@ ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 PATCHES += patches/0005-NID_ecdsa_with_SHA-fix.patch PATCHES += patches/0009-cryptography-1.4-disable-version-warning.patch else - MODULES += cryptography-1.9.tar.gz - MODULES += asn1crypto-0.24.0.tar.gz - #PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch - #PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch + ifneq ($(filter $(DISTRO_CODE),el6),) + # Cryptography dropped support for OpenSSL 1.0.0 with release 1.7 + # (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst). + # Therefore we need stick with 1.5.3 which was default previously to 1.9. + MODULES += cryptography-1.5.3.tar.gz + PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch + PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch + else + MODULES += cryptography-1.9.tar.gz + MODULES += asn1crypto-0.24.0.tar.gz + endif endif # Added for NetApp special agent, but may be used in other components too in future

6 years, 2 months

6034 FIX Fixed adding combined graphs to reports

by Lars Michelsen

Module: check_mk Branch: master Commit: d3d9ea19938eb89562987c45c98ec3ef9061af78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3d9ea19938eb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 15:00:28 2018 +0200 6034 FIX Fixed adding combined graphs to reports When clicking on the context menu of a combined graph and adding it to a report, the element that is added to the report is not created correctly. When trying to edit the element later an exception "TypeError (unhashable type: 'dict')" is shown. Delete the element after the update and re-add it to the report should fix the issue. Change-Id: I88bc3c6680e2f8b2a7486ff34b177dcdf84285b0 --- .werks/6034 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/6034 b/.werks/6034 new file mode 100644 index 0000000..00fa698 --- /dev/null +++ b/.werks/6034 @@ -0,0 +1,17 @@ +Title: Fixed adding combined graphs to reports +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1524661146 + +When clicking on the context menu of a combined graph and adding it to a report, +the element that is added to the report is not created correctly. When trying +to edit the element later an exception "TypeError (unhashable type: 'dict')" is +shown. + +Delete the element after the update and re-add it to the report should fix the +issue.

6 years, 2 months

← Newer
1
2
3
4
5
6
7
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018