Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5772 mssql_counters.transactions, mssql_counters.pageactivity,

by Simon Betz

mssql_counters.locks are cluster aware Message-ID: <5ab3bba6.+qANpjzqu56V7nPU%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 02d991bca0a3878ac083f3bd6392c1e6fe09dd3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02d991bca0a387… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 8 11:59:22 2018 +0100 5772 mssql_counters.transactions,mssql_counters.pageactivity,mssql_counters.locks are cluster aware Change-Id: Ibbbc12fab18e2dbe5121d803ff765b7a007a0f74 --- .werks/5772 | 10 ++ checks/mssql_counters | 425 ++++++++++++++++++++++++++++---------------------- 2 files changed, 252 insertions(+), 183 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=02d991bca0…

6 years, 6 months

Don't change a dictionary during iteration. 8-month old bug...

by Sven Panne

Module: check_mk Branch: master Commit: 9d0692ed2ec575d53e2fba1bb55d502b669dca3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d0692ed2ec575… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 22 14:39:56 2018 +0100 Don't change a dictionary during iteration. 8-month old bug... Change-Id: I2fdfd6e2d8f108589ed93a17ac1a38c352ddb590 --- cmk/ec/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 1e17751..26534b5 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1639,7 +1639,8 @@ class EventServer(ECServerThread): client_sockets[client_socket.fileno()] = (client_socket, address, "") # Read data from existing event unix socket connections - for fd, (cs, address, previous_data) in client_sockets.iteritems(): + # NOTE: We modify client_socket in the loop, so we need to copy below! + for fd, (cs, address, previous_data) in list(client_sockets.iteritems()): if fd in readable: # Receive next part of data try:

6 years, 6 months

Added missing manpage

by Simon Betz

Module: check_mk Branch: master Commit: adbc7306a0614b2b7f5abb8a22d56bc6aa51ccba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adbc7306a0614b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 22 09:58:59 2018 +0100 Added missing manpage Change-Id: I464b9acaa476507d682ff151508516da68d8938b --- checkman/mssql_counters | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/checkman/mssql_counters b/checkman/mssql_counters new file mode 100644 index 0000000..f23fd50 --- /dev/null +++ b/checkman/mssql_counters @@ -0,0 +1,11 @@ +title: MSSQL Databases +agents: windows +catalog: app/mssql +license: GPL +distribution: check_mk +description: + This check does not monitor anything. It's a dummy check which + implements the parse function for all subchecks. + +inventory: + No service is generated.

6 years, 6 months

Refactored

by Simon Betz

Module: check_mk Branch: master Commit: 5d1b904469189968df7a816790e1a26b065583e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d1b9044691899… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 7 14:37:04 2018 +0100 Refactored Change-Id: I58746c5cb5cef1053c9ab70a15d2031420a1511f --- checks/mssql_counters | 671 +++++++++++++++++++++++++------------------------- 1 file changed, 342 insertions(+), 329 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5d1b904469…

6 years, 6 months

5752 cisco_stackpower: only inventorize enabled ports, show operational status in service output

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 21b266c7d03f57898e517b83e3270d1a10ce8282 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21b266c7d03f57… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Mar 21 11:08:31 2018 +0100 5752 cisco_stackpower: only inventorize enabled ports, show operational status in service output Change-Id: Ia85a73f72a08bb46632d265b82f9b60ccabb5e8a --- .werks/5752 | 10 +++++ checks/cisco_stackpower | 102 +++++++++++++++++++++++++++++------------------- 2 files changed, 71 insertions(+), 41 deletions(-) diff --git a/.werks/5752 b/.werks/5752 new file mode 100644 index 0000000..2ee64a7 --- /dev/null +++ b/.werks/5752 @@ -0,0 +1,10 @@ +Title: cisco_stackpower: only inventorize enabled ports, show operational status in service output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521626667 +Class: feature + + diff --git a/checks/cisco_stackpower b/checks/cisco_stackpower index 9478de1..87432eb 100644 --- a/checks/cisco_stackpower +++ b/checks/cisco_stackpower @@ -24,55 +24,75 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# example: -# 1001 stack member and master -# 2001 stack member -# 3001 stack member -# 4001 stack member - -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.1001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.1001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.1001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.1001.1 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.2001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.2001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.2001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.2001.1 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.3001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.3001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.3001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.3001.1 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.4001.0 Port 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.4001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.4001.1 Port 2 --> CISCO-STACKWISE-MIB::cswStackPowerPortName.4001.1 - -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.1001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.1001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.1001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.1001.1 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.2001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.2001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.2001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.2001.1 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.3001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.3001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.3001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.3001.1 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.4001.0 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.4001.0 -# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.4001.1 1 --> CISCO-STACKWISE-MIB::cswStackPowerPortLinkStatus.4001.1 - +# .1.3.6.1.4.1.9.9.500.1.3.2.1.2.1001.0 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.2.1001.1 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.2.2001.0 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.2.2001.1 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.2.3001.0 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.2.3001.1 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.3.1001.0 "00 00 00 00 00 00 " +# .1.3.6.1.4.1.9.9.500.1.3.2.1.3.1001.1 "00 00 00 00 00 00 " +# .1.3.6.1.4.1.9.9.500.1.3.2.1.3.2001.0 "00 00 00 00 00 00 " +# .1.3.6.1.4.1.9.9.500.1.3.2.1.3.2001.1 "00 00 00 00 00 00 " +# .1.3.6.1.4.1.9.9.500.1.3.2.1.3.3001.0 "00 00 00 00 00 00 " +# .1.3.6.1.4.1.9.9.500.1.3.2.1.3.3001.1 "00 00 00 00 00 00 " +# .1.3.6.1.4.1.9.9.500.1.3.2.1.4.1001.0 0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.4.1001.1 0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.4.2001.0 0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.4.2001.1 0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.4.3001.0 0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.4.3001.1 0 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.1001.0 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.1001.1 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.2001.0 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.2001.1 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.3001.0 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.5.3001.1 1 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.6.1001.0 40 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.6.1001.1 40 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.6.2001.0 40 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.6.2001.1 40 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.6.3001.0 40 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.6.3001.1 40 +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.1001.0 "Port 1" +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.1001.1 "Port 2" +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.2001.0 "Port 1" +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.2001.1 "Port 2" +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.3001.0 "Port 1" +# .1.3.6.1.4.1.9.9.500.1.3.2.1.7.3001.1 "Port 2" def inventory_cisco_stackpower(info): - return [ ("%s %s" % (oid.split(".")[0], port_name), None) \ - for oid, port_name, port_status in info ] + return [("%s %s" % (oid.split(".")[0], port_name), None) + for oid, port_oper_status, port_link_status, port_name in info + if port_oper_status == '1'] def check_cisco_stackpower(item, params, info): + map_oper_status = { + '1': (0, 'Port enabled'), + '2': (2, 'Port disabled'), + } + map_status = { - "1" : (0, "connected and operational"), - "2" : (2, "forced down or not connected"), + '1': (0, 'Status: connected and operational'), + '2': (2, 'Status: forced down or not connected'), } - for oid, port_name, port_status in info: - if "%s %s" % (oid.split(".")[0], port_name) == item: - state, state_readable = map_status[port_status] - return state, "link status: %s" % state_readable + + for oid, port_oper_status, port_link_status, port_name in info: + if item == '%s %s' % (oid.split(".")[0], port_name): + yield map_oper_status[port_oper_status] + yield map_status[port_link_status] check_info['cisco_stackpower'] = { - 'inventory_function' : inventory_cisco_stackpower, - 'check_function' : check_cisco_stackpower, - 'service_description' : 'Stackpower Interface %s', - 'snmp_info' : (".1.3.6.1.4.1.9.9.500.1.3.2.1", [ - OID_END, - "7", # cswStackPowerPortName - "5", # cswStackPowerPortLinkStatus - ]), - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.9.1.516"), + 'inventory_function' : inventory_cisco_stackpower, + 'check_function' : check_cisco_stackpower, + 'service_description': 'Stackpower Interface %s', + 'snmp_info' : ('.1.3.6.1.4.1.9.9.500.1.3.2.1', [ + OID_END, + '2', # cswStackPowerPortOperStatus + '5', # cswStackPowerPortLinkStatus + '7', # cswStackPowerPortName + ]), + 'snmp_scan_function' : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.9.1.516'), }

6 years, 6 months

5907 FIX CentOS/RedHat: Add explicit dependency to php-cli to fix possible broken PNP graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ca59abc0381be866728596fb159c51c2b61e8ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ca59abc0381be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 21 15:43:56 2018 +0100 5907 FIX CentOS/RedHat: Add explicit dependency to php-cli to fix possible broken PNP graphs The previous Check_MK packages were not explicitly declaring the dependency to the php-cli package which is needed to make Dokuwiki, NagVis and PNP4Nagios work. The dependency was only declared for php which normally implies php-cli. Unfortunately there are third party packages that don't have this implicit dependency. To make Check_MK work out of the box with those PHP installations, we now added php-cli as explicit dependency. Change-Id: I20ff20e466c4e0048a5f47737fb68b9d274bcbf2 --- .werks/5907 | 19 +++++++++++++++++++ omd/distros/CENTOS_5.mk | 1 + omd/distros/CENTOS_6.mk | 1 + omd/distros/CENTOS_7.mk | 1 + 4 files changed, 22 insertions(+) diff --git a/.werks/5907 b/.werks/5907 new file mode 100644 index 0000000..2ba5754 --- /dev/null +++ b/.werks/5907 @@ -0,0 +1,19 @@ +Title: CentOS/RedHat: Add explicit dependency to php-cli to fix possible broken PNP graphs +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521643261 +Class: fix + +The previous Check_MK packages were not explicitly declaring the dependency +to the php-cli package which is needed to make Dokuwiki, NagVis and PNP4Nagios +work. + +The dependency was only declared for php which normally implies php-cli. +Unfortunately there are third party packages that don't have this implicit +dependency. + +To make Check_MK work out of the box with those PHP installations, we now added +php-cli as explicit dependency. diff --git a/omd/distros/CENTOS_5.mk b/omd/distros/CENTOS_5.mk index adabad9..d399651 100644 --- a/omd/distros/CENTOS_5.mk +++ b/omd/distros/CENTOS_5.mk @@ -60,6 +60,7 @@ OS_PACKAGES += binutils # Needed by Check_MK Agent Bakery OS_PACKAGES += rpm-build # Needed by Check_MK Agent Bakery OS_PACKAGES += perl-Net-SNMP OS_PACKAGES += php +OS_PACKAGES += php-cli OS_PACKAGES += php-mbstring OS_PACKAGES += php-pdo OS_PACKAGES += php-gd diff --git a/omd/distros/CENTOS_6.mk b/omd/distros/CENTOS_6.mk index acdc68c..8e79b76 100644 --- a/omd/distros/CENTOS_6.mk +++ b/omd/distros/CENTOS_6.mk @@ -68,6 +68,7 @@ OS_PACKAGES += pango OS_PACKAGES += patch OS_PACKAGES += perl-Net-SNMP OS_PACKAGES += php +OS_PACKAGES += php-cli OS_PACKAGES += php-mbstring OS_PACKAGES += php-pdo OS_PACKAGES += php-gd diff --git a/omd/distros/CENTOS_7.mk b/omd/distros/CENTOS_7.mk index 4553a18..b87f918 100644 --- a/omd/distros/CENTOS_7.mk +++ b/omd/distros/CENTOS_7.mk @@ -74,6 +74,7 @@ OS_PACKAGES += perl-Net-SNMP OS_PACKAGES += perl-Locale-Maketext-Simple OS_PACKAGES += perl-IO-Zlib OS_PACKAGES += php +OS_PACKAGES += php-cli OS_PACKAGES += php-mbstring OS_PACKAGES += php-pdo OS_PACKAGES += php-gd

6 years, 6 months

checktestlib.py: Slight formatting improvement

by Konstantin Büttner

Module: check_mk Branch: master Commit: 501c011f5c640dc75578fbd9911e3a5b479967bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=501c011f5c640d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 21 14:50:49 2018 +0100 checktestlib.py: Slight formatting improvement Change-Id: I757a78834ab6d481d5cfaacd01b4f10f7772d103 --- tests/checks/checktestlib.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 68fa1a8..44333f4 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -1,5 +1,7 @@ import types + + class Tuploid(object): """Base class for values with (potentially variadic) tuple representations""" @@ -21,6 +23,7 @@ class Tuploid(object): yield x + class PerfValue(Tuploid): """Represents a single perf value""" @@ -60,6 +63,7 @@ class PerfValue(Tuploid): self.crit, self.minimum, self.maximum) + class BasicCheckResult(Tuploid): """ A basic check result @@ -100,6 +104,7 @@ class BasicCheckResult(Tuploid): return 'BasicCheckResult(%s, "%s", %s)' % (self.status, self.infotext, self.perfdata) + class CheckResult(object): """ A check result potentially consisting of multiple subresults, @@ -152,6 +157,7 @@ class CheckResult(object): return perfdata + class DiscoveryEntry(Tuploid): """A single entry as returned by the discovery (or in oldspeak: inventory) function.""" @@ -169,6 +175,7 @@ class DiscoveryEntry(Tuploid): return "DiscoveryEntry(%r, %r)" % (self.item, self.default_params) + class DiscoveryResult(object): """ The result of the discovery as a whole.

6 years, 6 months

checktestlib: Allow infotext to be unicode, as the check api converts to unicode anyway

by Konstantin Büttner

Module: check_mk Branch: master Commit: 25c26ebbe193ff81380ff1fb7815991d0f22f8d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25c26ebbe193ff… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 21 14:46:52 2018 +0100 checktestlib: Allow infotext to be unicode, as the check api converts to unicode anyway Change-Id: I0da5c31c468151326a30db7eb8eebba2620ecd00 --- tests/checks/checktestlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index a9f0488..68fa1a8 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -75,7 +75,7 @@ class BasicCheckResult(Tuploid): assert status in [0, 1, 2, 3] self.status = status - assert type(infotext) == str + assert type(infotext) in [ str, unicode ] assert "\n" not in infotext self.infotext = infotext

6 years, 6 months

5906 FIX NagVis: Updated to 1.9.6

by Lars Michelsen

Module: check_mk Branch: master Commit: 6825840056749ca2df1bbf8c48fc836211fbd736 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6825840056749c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 21 13:19:41 2018 +0100 5906 FIX NagVis: Updated to 1.9.6 Change-Id: I7410085e57193f12615db4f544c6872cfb29a6fb --- .werks/5906 | 10 ++++++++++ omd/packages/nagvis/Makefile | 2 +- omd/packages/nagvis/nagvis-1.9.5.tar.gz | Bin 1788889 -> 0 bytes omd/packages/nagvis/nagvis-1.9.6.tar.gz | Bin 0 -> 1790239 bytes 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5906 b/.werks/5906 new file mode 100644 index 0000000..ec8f143 --- /dev/null +++ b/.werks/5906 @@ -0,0 +1,10 @@ +Title: NagVis: Updated to 1.9.6 +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521634762 +Class: fix + + diff --git a/omd/packages/nagvis/Makefile b/omd/packages/nagvis/Makefile index e9faa89..525cef0 100644 --- a/omd/packages/nagvis/Makefile +++ b/omd/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.9.5 +VERSION = 1.9.6 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/omd/packages/nagvis/nagvis-1.9.5.tar.gz b/omd/packages/nagvis/nagvis-1.9.5.tar.gz deleted file mode 100644 index 01d4ed8..0000000 Binary files a/omd/packages/nagvis/nagvis-1.9.5.tar.gz and /dev/null differ diff --git a/omd/packages/nagvis/nagvis-1.9.6.tar.gz b/omd/packages/nagvis/nagvis-1.9.6.tar.gz new file mode 100644 index 0000000..5b6f8d3 Binary files /dev/null and b/omd/packages/nagvis/nagvis-1.9.6.tar.gz differ

6 years, 6 months

Fixed race condition regarding rules/rule packs.

by Sven Panne

Module: check_mk Branch: master Commit: 6b75c593f9a924ee0bb1ad287ec3dd29825c2b11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b75c593f9a924… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 21 13:08:58 2018 +0100 Fixed race condition regarding rules/rule packs. Change-Id: I6cd24176ce368b14c69f51c2c112aa3e5aecd4b4 --- cmk/ec/export.py | 3 +++ web/plugins/wato/mkeventd.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 47fa629..287678f 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -284,6 +284,9 @@ def save_rule_packs(legacy_rules, rule_packs, pretty_print=False, dir_=None): cmk.store.save_file(file_, output) +# NOTE: It is essential that export_rule_pack() is called *before* +# save_rule_packs(), otherwise there is a race condition when the EC +# recursively reads all *.mk files! def export_rule_pack(rule_pack, pretty_print=False, dir_=None): # type: (Dict[str, Any], bool, Optional[Path]) -> None """ diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 6ed1def..184a6fe 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1418,11 +1418,11 @@ def mode_mkeventd_rules(phase): rule_packs[other_pack_nr]["rules"][0:0] = [ rule ] del rule_packs[rule_pack_nr]["rules"][move_nr] - save_mkeventd_rules(legacy_rules, rule_packs) if other_type_ == ec.RulePackType.exported: export_mkp_rule_pack(other_pack) if type_ == ec.RulePackType.exported: export_mkp_rule_pack(rule_pack) + save_mkeventd_rules(legacy_rules, rule_packs) add_ec_change("move-rule-to-pack", _("Moved rule %s to pack %s") % (rule["id"], other_pack["id"])) return None, html.render_text(_("Moved rule %s to pack %s") % (rule["id"], other_pack["title"])) @@ -1445,9 +1445,9 @@ def mode_mkeventd_rules(phase): del rules[nr] - save_mkeventd_rules(legacy_rules, rule_packs) if type_ == ec.RulePackType.exported: export_mkp_rule_pack(rule_pack) + save_mkeventd_rules(legacy_rules, rule_packs) elif c == False: return "" else: @@ -1466,9 +1466,9 @@ def mode_mkeventd_rules(phase): del rules[from_pos] # make to_pos now match! rules[to_pos:to_pos] = [rule] - save_mkeventd_rules(legacy_rules, rule_packs) if type_ == ec.RulePackType.exported: export_mkp_rule_pack(rule_pack) + save_mkeventd_rules(legacy_rules, rule_packs) add_ec_change("move-rule", _("Changed position of rule %s") % rule["id"]) return @@ -1850,9 +1850,9 @@ def mode_mkeventd_edit_rule(phase): else: rules[edit_nr] = rule - save_mkeventd_rules(legacy_rules, rule_packs) if type_ == ec.RulePackType.exported: export_mkp_rule_pack(rule_pack) + save_mkeventd_rules(legacy_rules, rule_packs) if new: add_ec_change("new-rule", _("Created new event correlation rule with id %s") % rule["id"])

6 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018