update project

README.md

-[PACKAGE]: ../../raw/master/mkp/unbound-1.2.1-20240514.mkp "unbound-1.2.1-20240514.mkp"
+[PACKAGE]: ../../raw/master/mkp/unbound-1.2.2-20240521.mkp "unbound-1.2.2-20240521.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/

source/agents/plugins/unbound

 #!/bin/sh
-echo '<<<unbound:sep(61)>>>'
-unbound-control stats_noreset
-echo '<<<>>>'
+
+PLUGIN_CONF_DIR="/etc/check_mk"
+UNBOUND_CFG="/etc/unbound/unbound.conf"
+
+if [ -f "$MK_CONFDIR/unbound.cfg" ]; then
+    . "$MK_CONFDIR/unbound.cfg" 2>/dev/null
+elif [ -f "$PLUGIN_CONF_DIR/unbound.cfg" ]; then
+    . "$PLUGIN_CONF_DIR/unbound.cfg" 2>/dev/null
+fi
+
+if [ -f "$(which unbound-control)" ]; then
+  echo '<<<unbound:sep(61)>>>'
+  unbound-control stats_noreset -c $UNBOUND_CFG
+  echo '<<<>>>'
+fi

source/gui/wato/check_parameters/unbound_bakery.py

@@ -35,24 +35,35 @@ from cmk.gui.cee.plugins.wato.agent_bakery.rulespecs.utils import (
     RulespecGroupMonitoringAgentsAgentPlugins,
 )
 
-from cmk.gui.valuespec import Alternative, FixedValue
+from cmk.gui.valuespec import (
+    Alternative,
+    Dictionary,
+    FixedValue,
+    TextInput,
+)
 
 
 def _parameter_valuespec_unbound_bakery():
     return Alternative(
-        title=_('unbound'),
+        title='Unbound',
         elements=[
-            FixedValue(
-                True,
-                title=_('Deploy the unbound agent plugin'),
-                totext=_('The unbound agent plugin will be deployed')
-            ),
+            Dictionary(
+                title='Deploy the unbound agent plugin',
+                elements=[
+                    ('config_file_path',
+                     TextInput(
+                         title=_('Path of config file'),
+                         size=100,
+                         allow_empty=False,
+                         placeholder='/etc/unbound/unbound.conf',
+                     ))
+                ]),
             FixedValue(
                 None,
                 title=_('Do not deploy the unbound agent plugin'),
                 totext=_('The unbound agent plugin will not be deployed')
             ),
-        ],
+        ]
     )
 
 

source/lib/python3/cmk/base/cee/plugins/bakery/unbound.py

@@ -16,6 +16,7 @@ from pathlib import Path
 
 from cmk.base.cee.plugins.bakery.bakery_api.v1 import (
     FileGenerator,
+    PluginConfig,
     OS,
     Plugin,
     register
@@ -23,11 +24,17 @@ from cmk.base.cee.plugins.bakery.bakery_api.v1 import (
 
 
 def get_unbound_files(conf) -> FileGenerator:
-    if conf is True:
+    if conf:
         yield Plugin(
             base_os=OS.LINUX,
             source=Path('unbound'),
         )
+        if config_file_path := conf.get('config_file_path'):
+            yield PluginConfig(
+                base_os=OS.LINUX,
+                lines=[f'UNBOUND_CFG={config_file_path}'],
+                target=Path('unbound.cfg'),
+            )
 
 
 register.bakery_plugin(

source/packages/unbound

@@ -15,7 +15,7 @@
            'lib': ['python3/cmk/base/cee/plugins/bakery/unbound.py']},
  'name': 'unbound',
  'title': 'Unbound',
- 'version': '1.2.1-20240514',
+ 'version': '1.2.2-20240521',
  'version.min_required': '2.2.0b1',
  'version.packaged': '2.2.0p24',
  'version.usable_until': None}