[checkmk-commits] Check_MK Git: check_mk: FIX Fixed check-mk-automation call on each new created apache thread

Module: check_mk Branch: master Commit: d19d616b50afd4972947496b790fd5c4e6863217 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d19d616b50afd4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 8 14:39:10 2013 +0100 FIX Fixed check-mk-automation call on each new created apache thread Especially for large installation, with a lot of active users, this could really lead into performance problems --- .werks/49 | 9 +++++++++ ChangeLog | 3 ++- web/plugins/wato/check_mk_configuration.py | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/49 b/.werks/49 new file mode 100644 index 0000000..d06b2f0 --- /dev/null +++ b/.werks/49 @@ -0,0 +1,9 @@ +Title: Fixed check-mk-automation call on each new created apache thread +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1383917888 +Class: fix + +Especially for large installation, with a lot of active users, this +could really lead into performance problems diff --git a/ChangeLog b/ChangeLog index 83964bd..6c7c4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,10 +18,11 @@ * 0044 FIX: LDAP: Fixed error with empty groups during non nested group sync... * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles * 0046 FIX: Allowing "-" chars in var names again... + * 0049 FIX: Fixed check-mk-automation call on each new created apache thread... WATO: * 0053 New rule for configuring the display_name of a service... - * 0048 FIX: Fixed locking issue on host diagnose page... + * 0048 FIX: Fixed locking issue on host diagnose page Reporting & Availability: * 0051 Option for showing timeline directly in availability table... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f769830..819720a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1493,7 +1493,7 @@ def get_snmp_checktypes(): types = [ (cn, (c['title'] != cn and '%s: ' % cn or '') + c['title']) for (cn, c) in checks.items() if c['snmp'] ] types.sort() - return types + return [ (None, _('All SNMP Checks')) ] + types register_rule(group, "snmp_check_interval", @@ -1505,7 +1505,7 @@ register_rule(group, elements = [ DropdownChoice( title = _("Checktype"), - choices = [ (None, _('All SNMP Checks')) ] + get_snmp_checktypes(), + choices = get_snmp_checktypes, ), Integer( title = _("Do check every"),