Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3e20bfe6e8438e259b3c834239a92082da48d41a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e20bfe6e8438e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed May 2 11:29:08 2018 +0200 Fix for werk #4886 Change-Id: Ib54bda08203c6b758de52c80f73015c1dceff8e2 --- web/plugins/wato/notifications.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index e4c12fc..251597d 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -24,28 +24,30 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # We have to transform because 'add_to_event_context' # in modules/events.py can't handle complex data structures def transform_back_html_mail_url_prefix(p): if type(p) == tuple: return {p[0]: p[1]} - elif p == "automatic_http": + if p == "automatic_http": return {"automatic": "http"} - elif p == "automatic_https": + if p == "automatic_https": return {"automatic": "https"} - else: - return {"manual": p} + return {"manual": p} + def transform_forth_html_mail_url_prefix(p): - if type(p) == dict: - k, v = p.items()[0] - if k == "automatic": - return "%s_%s" % (k, v) - else: - return ("manual", p) - else: + if type(p) != dict: return ("manual", p) + k, v = p.items()[0] + if k == "automatic": + return "%s_%s" % (k, v) + + return ("manual", v) + + def html_email_parameter_elements(): elements = [ ( "from",

6 years, 4 months

Disentangle SNMP trap initialization and MIBs loading.

by Sven Panne

Module: check_mk Branch: master Commit: 030fcb6f8dae05b79768c14d7a489a1307893671 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=030fcb6f8dae05… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 2 10:54:45 2018 +0200 Disentangle SNMP trap initialization and MIBs loading. Change-Id: If6c2e0cba81578e990afb6e5fee180d79a43471f --- cmk/ec/main.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index be87319..f19ace7 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -476,14 +476,6 @@ class SNMPTrapEngine(object): def initialize_snmptrap_handling(settings, config, event_server): if settings.options.snmptrap_udp is None: return - - initialize_snmptrap_engine(config, event_server) - - if snmptrap_translation_enabled(config): - event_server.load_mibs() - - -def initialize_snmptrap_engine(config, event_server): snmp_engine = pysnmp.entity.engine.SnmpEngine() # Disable receiving of SNMPv3 INFORM messages. We do not support them (yet) @@ -1300,6 +1292,7 @@ class EventServer(ECServerThread): self.open_syslog_tcp() self.open_snmptrap() initialize_snmptrap_handling(self.settings, self._config, self) + self._load_mibs() @classmethod def status_columns(cls): @@ -1459,7 +1452,9 @@ class EventServer(ECServerThread): # http://www.outflux.net/blog/archives/2008/03/09/using-select-on-a-fifo/ return os.open(str(self.settings.paths.event_pipe.value), os.O_RDWR | os.O_NONBLOCK) - def load_mibs(self): + def _load_mibs(self): + if self.settings.options.snmptrap_udp is None or not snmptrap_translation_enabled(self._config): + return try: builder = pysnmp.smi.builder.MibBuilder() # manages python MIB modules @@ -2033,6 +2028,7 @@ class EventServer(ECServerThread): def reload_configuration(self, config): self._config = config initialize_snmptrap_handling(self.settings, self._config, self) + self._load_mibs() self.compile_rules(self._config["rules"], self._config["rule_packs"]) self.host_config.initialize()

6 years, 4 months

Nuke g_snmp_trap_engine global. Move stuff into constructor.

by Sven Panne

Module: check_mk Branch: master Commit: 43eb87ab28dd5b87cbff2fe09272f61fa27c6961 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43eb87ab28dd5b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 2 11:00:55 2018 +0200 Nuke g_snmp_trap_engine global. Move stuff into constructor. Change-Id: I013dc79788f974011f6cb07f2aa02e7838b15d28 --- cmk/ec/main.py | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index f19ace7..02992a6 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -467,25 +467,19 @@ class MKClientError(Exception): # '----------------------------------------------------------------------' class SNMPTrapEngine(object): - def __init__(self, snmp_receiver, snmp_engine): - super(SNMPTrapEngine, self).__init__() - self.snmp_receiver = snmp_receiver - self.snmp_engine = snmp_engine - - -def initialize_snmptrap_handling(settings, config, event_server): - if settings.options.snmptrap_udp is None: - return - snmp_engine = pysnmp.entity.engine.SnmpEngine() # Disable receiving of SNMPv3 INFORM messages. We do not support them (yet) class ECNotificationReceiver(pysnmp.entity.rfc3413.ntfrcv.NotificationReceiver): pduTypes = (pysnmp.proto.api.v1.TrapPDU.tagSet, pysnmp.proto.api.v2c.SNMPv2TrapPDU.tagSet) - initialize_snmp_credentials(config, snmp_engine) - snmp_receiver = ECNotificationReceiver(snmp_engine, event_server.handle_snmptrap) - global g_snmp_trap_engine - g_snmp_trap_engine = SNMPTrapEngine(snmp_receiver, snmp_engine) + + def __init__(self, settings, config, callback): + super(SNMPTrapEngine, self).__init__() + if settings.options.snmptrap_udp is None: + return + self.snmp_engine = pysnmp.entity.engine.SnmpEngine() + initialize_snmp_credentials(config, self.snmp_engine) + self.snmp_receiver = SNMPTrapEngine.ECNotificationReceiver(self.snmp_engine, callback) def auth_proto_for(proto_name): @@ -1291,7 +1285,7 @@ class EventServer(ECServerThread): self.open_syslog() self.open_syslog_tcp() self.open_snmptrap() - initialize_snmptrap_handling(self.settings, self._config, self) + self._snmp_trap_engine = SNMPTrapEngine(self.settings, self._config, self.handle_snmptrap) self._load_mibs() @classmethod @@ -1564,8 +1558,9 @@ class EventServer(ECServerThread): # and processing. PySNMP is calling self.handle_snmptrap back. def process_snmptrap(self, message, sender_address): self.logger.verbose("Trap received from %s:%d. Checking for acceptance now." % sender_address) - 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, (), (), message) + engine = self._snmp_trap_engine.snmp_engine + engine.setUserContext(sender_address=sender_address) + engine.msgAndPduDsp.receiveMessage(engine, (), (), message) def handle_snmptrap(self, snmp_engine, state_reference, context_engine_id, context_name, var_binds, cb_ctx): @@ -2027,7 +2022,7 @@ class EventServer(ECServerThread): def reload_configuration(self, config): self._config = config - initialize_snmptrap_handling(self.settings, self._config, self) + self._snmp_trap_engine = SNMPTrapEngine(self.settings, self._config, self.handle_snmptrap) self._load_mibs() self.compile_rules(self._config["rules"], self._config["rule_packs"]) self.host_config.initialize()

6 years, 4 months

6055 FIX Updated Python to 2.7.15

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c82907a9591b0dc1646d47a2a5cb99a6e21d61f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c82907a9591b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 2 08:43:59 2018 +0200 6055 FIX Updated Python to 2.7.15 Change-Id: I1c51cf8946f55c3559373e4ec79b7a0268778c1a --- .werks/6055 | 11 +++++++++++ omd/packages/python/Makefile | 2 +- .../{Python-2.7.14.tgz => Python-2.7.15.tgz} | Bin 17176758 -> 17496336 bytes 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6055 b/.werks/6055 new file mode 100644 index 0000000..dec39bf --- /dev/null +++ b/.werks/6055 @@ -0,0 +1,11 @@ +Title: Updated Python to 2.7.15 +Level: 1 +Component: packages +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525243419 + + diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index fcbba64..503535e 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Python -VERSION = 2.7.14 +VERSION = 2.7.15 DIR = $(NAME)-$(VERSION) .PHONY: build install skel clean diff --git a/omd/packages/python/Python-2.7.14.tgz b/omd/packages/python/Python-2.7.15.tgz similarity index 65% rename from omd/packages/python/Python-2.7.14.tgz rename to omd/packages/python/Python-2.7.15.tgz index 78f0e90..28e749a 100644 Binary files a/omd/packages/python/Python-2.7.14.tgz and b/omd/packages/python/Python-2.7.15.tgz differ

6 years, 4 months

Fixed status data inventory execution

by Simon Betz

Module: check_mk Branch: master Commit: ffe1fba642c328499ecc22050ba7e50b0912e1d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffe1fba642c328… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 1 19:20:24 2018 +0200 Fixed status data inventory execution Change-Id: I9ba097d913ae15f37bb480edd2a2569a8f125933 --- cmk_base/checks.py | 4 +--- cmk_base/inventory.py | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 9014148..5be485c 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -720,9 +720,7 @@ def do_status_data_inventory_for(hostname): # use it after every check cycle. params = rulesets.host_extra_conf(hostname, rules) if params: - # Means: Enabled "Do hardware/software inventory", - # => params is at least [{}] - return params[0].get('status_data_inventory', True) + return params[0].get('status_data_inventory', False) return False diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index dd57b4f..89dbcb0 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -173,7 +173,8 @@ def do_inv_for(sources, hostname, ipaddress): console.section_success("Found %s%s%d%s inventory entries" % (tty.bold, tty.yellow, inventory_tree.count_entries(), tty.normal)) - if not status_data_tree.is_empty(): + if not status_data_tree.is_empty() \ + and checks.do_status_data_inventory_for(hostname): status_data_tree.normalize_nodes() _save_status_data_tree(hostname, status_data_tree)

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018