diff --git a/README.md b/README.md index f9ceb6ab9938d13c792d55d30c3971e014797f84..2e239f8bf2a5c2eed975a52b2d046fa5582c74c3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/unbound-1.2.5-20240523.mkp "unbound-1.2.5-20240523.mkp" +[PACKAGE]: ../../raw/master/mkp/unbound-1.2.6-20240527.mkp "unbound-1.2.6-20240527.mkp" # unbound This agent plugin cheks the state of the unbound dns daemon. For more information about unbound see: https://nlnetlabs.nl/projects/unbound/about/ diff --git a/mkp/unbound-1.2.6-20240527.mkp b/mkp/unbound-1.2.6-20240527.mkp new file mode 100644 index 0000000000000000000000000000000000000000..7e4879b0739ce92254e0e93658ccc847be116886 Binary files /dev/null and b/mkp/unbound-1.2.6-20240527.mkp differ diff --git a/source/gui/wato/check_parameters/unbound_bakery.py b/source/gui/wato/check_parameters/unbound_bakery.py index c33a9c027d2e95eb87c1f389e13470d598a3fde1..6715df1ada566329c3e9493d737a5e4b07e3c1ab 100644 --- a/source/gui/wato/check_parameters/unbound_bakery.py +++ b/source/gui/wato/check_parameters/unbound_bakery.py @@ -25,59 +25,53 @@ # renamed to unbound.py (from unbound_parameters.py) # moved to ~/local/lib/check_mk/gui/plugins/wato/check_parameters (from local/share/check_mk/web/plugins/wato) # 2024-05-14: separated WATO for bakery and check in two files +# 2024-05-27: fixed crash in CRE version (has no cee elements) -from cmk.gui.i18n import _ -from cmk.gui.plugins.wato.utils import ( - HostRulespec, - rulespec_registry, -) -from cmk.gui.cee.plugins.wato.agent_bakery.rulespecs.utils import ( - RulespecGroupMonitoringAgentsAgentPlugins, -) +try: + from cmk.gui.cee.plugins.wato.agent_bakery.rulespecs.utils import RulespecGroupMonitoringAgentsAgentPlugins +except ModuleNotFoundError: + pass +else: + from cmk.gui.i18n import _ + from cmk.gui.plugins.wato.utils import HostRulespec, rulespec_registry + from cmk.gui.valuespec import Alternative, Dictionary, FixedValue, TextInput -from cmk.gui.valuespec import ( - Alternative, - Dictionary, - FixedValue, - TextInput, -) - -def _parameter_valuespec_unbound_bakery(): - return Alternative( - title='Unbound', - elements=[ - Dictionary( - title='Deploy the unbound agent plugin', - required_keys=['deploy_plugin'], - elements=[ - ('config_file_path', - TextInput( - title=_('Path of config file'), - size=100, - allow_empty=False, - placeholder='/etc/unbound/unbound.conf', - )), - ('deploy_plugin', - FixedValue( - True, - title=_('Deploy unbound plugin'), - totext='Yes', - )) - ]), - FixedValue( - None, - title=_('Do not deploy the unbound agent plugin'), - totext=_('The unbound agent plugin will not be deployed') - ), - ] - ) + def _parameter_valuespec_unbound_bakery(): + return Alternative( + title='Unbound', + elements=[ + Dictionary( + title='Deploy the unbound agent plugin', + required_keys=['deploy_plugin'], + elements=[ + ('config_file_path', + TextInput( + title=_('Path of config file'), + size=100, + allow_empty=False, + placeholder='/etc/unbound/unbound.conf', + )), + ('deploy_plugin', + FixedValue( + True, + title=_('Deploy unbound plugin'), + totext='Yes', + )) + ]), + FixedValue( + None, + title=_('Do not deploy the unbound agent plugin'), + totext=_('The unbound agent plugin will not be deployed') + ), + ] + ) -rulespec_registry.register( - HostRulespec( - group=RulespecGroupMonitoringAgentsAgentPlugins, - name='agent_config:unbound', - valuespec=_parameter_valuespec_unbound_bakery, + rulespec_registry.register( + HostRulespec( + group=RulespecGroupMonitoringAgentsAgentPlugins, + name='agent_config:unbound', + valuespec=_parameter_valuespec_unbound_bakery, + ) ) -) diff --git a/source/packages/unbound b/source/packages/unbound index c959a00fed5dbe452a0edc85fa29716aeaaa844a..58258083b47197a9d88d0d6b7898de775264aca8 100644 --- a/source/packages/unbound +++ b/source/packages/unbound @@ -21,7 +21,7 @@ 'lib': ['python3/cmk/base/cee/plugins/bakery/unbound.py']}, 'name': 'unbound', 'title': 'Unbound', - 'version': '1.2.5-20240523', + 'version': '1.2.6-20240527', 'version.min_required': '2.2.0b1', 'version.packaged': '2.2.0p24', 'version.usable_until': None}