[checkmk-commits] [tribe29/checkmk] ac150e: Notify helper: Improve handling of corrupt spool f...

Branch: refs/heads/master Home: https://github.com/tribe29/checkmk Commit: ac150ec82d0c14edda0426f442e01831a8ae4ac2 https://github.com/tribe29/checkmk/commit/ac150ec82d0c14edda0426f442e01831a… Author: Lars Michelsen &lt;lm(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: M cmk/base/notify.py Log Message: ----------- Notify helper: Improve handling of corrupt spool files * Improve logging of unhandled exception * Fix traceback in notify.log in case of corrupt files * Do not read files that are currently being written (empty file created for locking during create_spoolfile()) Change-Id: I3927c929bd87fb6e32c996c43ac1362b1709e862 Commit: 069a35d4897e4649191b0d3cf0eab3a7b9121561 https://github.com/tribe29/checkmk/commit/069a35d4897e4649191b0d3cf0eab3a7b… Author: Lars Michelsen &lt;lm(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: A .werks/14284 M cmk/base/notify.py M cmk/utils/notify.py Log Message: ----------- 14284 FIX Notification spooler: Fix producing corrupted spool files The Notification Spooler could create corrupted spool files which resulted in error messages like this in the <tt>var/log/mknotifyd.log</tt> log: C+: 2022-07-18 21:49:14,276 [40] [cmk.mknotifyd] Corrupted spoolfile /omd/sites/stable/var/check_mk/notify/spool/ccaae1d5-8b33-403c-bbd8-e1b8796035ca: Traceback (most recent call last): File "/omd/sites/stable/lib/python3/cmk/cee/mknotifyd/spool_handler.py", line 70, in _process_spool_directory content: Message = evaluate_file(spoolfile_path) File "/omd/sites/stable/lib/python3/cmk/cee/mknotifyd/utils.py", line 50, in evaluate_file return ast.literal_eval(f.read()) File "/omd/sites/stable/lib/python3.9/ast.py", line 62, in literal_eval node_or_string = parse(node_or_string, mode='eval') File "/omd/sites/stable/lib/python3.9/ast.py", line 50, in parse return compile(source, filename, mode, flags, File "<unknown>", line 0 SyntaxError: unexpected EOF while parsing 2022-07-18 21:49:14,728 [20] [cmk.mknotifyd] got exit code 2 2022-07-18 21:49:14,728 [40] [cmk.mknotifyd] exception handling notification result 2 for 82bcd0e5-5d28-4162-9f46-84d008e1d73d: Traceback (most recent call last): File "/omd/sites/stable/lib/python3/cmk/cee/mknotifyd/notification_queue.py", line 129, in _handle_result content = evaluate_file(path.joinpath(filename)) File "/omd/sites/stable/lib/python3/cmk/cee/mknotifyd/utils.py", line 50, in evaluate_file return ast.literal_eval(f.read()) File "/omd/sites/stable/lib/python3.9/ast.py", line 62, in literal_eval node_or_string = parse(node_or_string, mode='eval') File "/omd/sites/stable/lib/python3.9/ast.py", line 50, in parse return compile(source, filename, mode, flags, File "<unknown>", line 0 SyntaxError: unexpected EOF while parsing C-: The <tt>var/log/notify.log</tt> could also show errors in this situation, with messages like this: C+: 2022-07-18 20:40:55,960 [40] [cmk.base.notify] ERROR: Traceback (most recent call last): File "/omd/sites/stable/lib/python3/cmk/base/notify.py", line 1765, in handle_spoolfile raw_context = data["context"] KeyError: 'context' C-: Change-Id: I8239d1c1e449b8250a9d3eba31ac3cea756e071c Commit: 6fc816399532cb53132edf8d5066a579d5454c21 https://github.com/tribe29/checkmk/commit/6fc816399532cb53132edf8d5066a579d… Author: Lars Michelsen &lt;lm(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: A .werks/14285 Log Message: ----------- 14285 FIX Fix frozen Microcore (Livestatus not responding) during config reloads The reload of the Microcore core and it's helper processed could freeze when the core had notifications pending during reload. This was caused by a deadlock between the Notification helper and the Microcore. The Microcore was still alive but waiting to the notification helper to terminate while the notification helper waited for the Microcore. while the cmc.log showed a message like: <tt>still X unsent events, sending them now</tt>. Change-Id: I8ac1a2a179e44f761c21a7a7a3e0ebb3ab4cc976 Commit: a7872277462892f9e9680bffcb7186b0afbbe968 https://github.com/tribe29/checkmk/commit/a7872277462892f9e9680bffcb7186b0a… Author: Lars Michelsen &lt;lm(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: M cmk/base/notify.py Log Message: ----------- Apply connect timeout to local livestatus connections In case the core is not responsive for some reason, then it is better to continue without sending the command and logging it instead of blocking endlessly. Change-Id: Ie6f6667053b6bd2423dee40f829656725aeb0bdb Commit: 6d8f86f0015c41ebc60959a10f6d1b3b19afdf2a https://github.com/tribe29/checkmk/commit/6d8f86f0015c41ebc60959a10f6d1b3b1… Author: Lars Michelsen &lt;lm(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: M cmk/base/notify.py M cmk/utils/notify.py M tests/unit/cmk/base/test_notify.py Log Message: ----------- Cleanup livestatus usage from RBN processing In case a user configured the contact selection option "Members of contact groups" (contact_groups), a Livestatus query was made to get the members of the configured contact groups. This was done every time such a rule matched a notification. In specific situations such a lookup could cause dead locks between the Microcore and the notify helper. Since the notification helpers have the whole base configuration in memory, we can simply lookup the group memberships without the Livestatus lookup. Change-Id: Ia78b26153ea53ea39e3e7e4be5922e93eab268d8 Commit: 1474accd2380a506cbe2498d30a466eb3a14c735 https://github.com/tribe29/checkmk/commit/1474accd2380a506cbe2498d30a466eb3… Author: Lars Michelsen &lt;lm(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: A .werks/14286 M cmk/notification_plugins/mail.py Log Message: ----------- 14286 FIX mail: Add timeout to graph processing of HTML mail notifications In case fetching the graphs takes more than 10 seconds, the notification plugin aborts waiting for the graphs and continues to send the notification without graphs. Change-Id: I207d83f440fc2b0c34fbb8175db254baf2ef3226 Commit: b7d19451a8d5c1284fdb6eb0a281a8f83e66fdc0 https://github.com/tribe29/checkmk/commit/b7d19451a8d5c1284fdb6eb0a281a8f83… Author: Mathias Laurin &lt;mathias.laurin(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: M doc/documentation/arch-comp-liveproxyd-classes.puml Log Message: ----------- Add missing elem to liveproxy class diagram Change-Id: I7ecf4648cc37043d7ed855118a7880fd497a26bd Commit: 3b5fe28807449e286d96c99f0803a0a4d24f32e1 https://github.com/tribe29/checkmk/commit/3b5fe28807449e286d96c99f0803a0a4d… Author: Lisa Pichler &lt;lisa.pichler(a)tribe29.com&gt; Date: 2022-07-19 (Tue, 19 Jul 2022) Changed paths: A .werks/14499 Log Message: ----------- 14499 FIX activate changes: performance issues when synchronising users and user settings managed services snapshot: use os.link instead of copytree SUP-10229 Change-Id: I99ba424a90639d96936796724c8f1422c9bd2739 Compare: https://github.com/tribe29/checkmk/compare/ef62c40b55fb...3b5fe2880744