lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
May 2018
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
10 participants
375 discussions
Start a n
N
ew thread
Fix for werk #4886
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
← Newer
1
...
35
36
37
38
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
Results per page:
10
25
50
100
200