simplify

Author: HenriWahl

mkp/local/lib/python3/cmk/base/cee/plugins/bakery/yum.py

@@ -16,8 +16,8 @@ def get_yum_files(conf: Any) -> FileGenerator:
     """
 
     # debugging
-    # with open('/tmp/debug.txt', 'a') as debug_file:
-    #     debug_file.write(f'config: {conf}\n')
+    with open('/tmp/debug.txt', 'a') as debug_file:
+        debug_file.write(f'config: {conf}\n')
 
     if isinstance(conf, dict):
         # default to no interval - will be filled if set in config
@@ -41,8 +41,6 @@ def get_yum_files(conf: Any) -> FileGenerator:
             elif conf.get('deploy', 'interval')[1] is not None:
                 interval = conf.get('deploy', 'interval')[1]
 
-
-
     # only makes sense on Linux so just create for that OS
     yield Plugin(base_os=OS.LINUX,
                  source=Path('yum'),

mkp/local/lib/python3/cmk_addons/plugins/yum/rulesets/yum_cee.py

@@ -81,6 +81,47 @@ def _migrate_int_to_float(value: object) -> Mapping[str, object]:
         }
 
 
+def _migrate_int_to_float2(value: object) -> Mapping[str, object]:
+    """
+    migrate from integer interval to float interval
+    """
+    if value is not None:
+        # backward compatibility - migrate from deploy to deployment
+        if value.get('deploy'):
+            if value['deploy'].get('interval'):
+                return {
+                    'deploy': {
+                        'interval': float(value['deploy']['interval'])
+                    }
+                }
+            else:
+                return {
+                    'deploy': {
+                        'interval': False
+                    }
+                }
+        # fix a short time used interval instead of deploy
+        elif value.get('interval'):
+            return {
+                'deploy': {
+                    'interval': float(value['interval'])
+                }
+            }
+        # backward compatibility
+        elif value.get('nointerval'):
+            return {
+                'deploy': {
+                    'interval': False
+                }
+            }
+        else:
+            return value
+    else:
+        return {
+                'deploy': False
+        }
+
+
 def _parameter_form_yum_bakery() -> Dictionary:
     """
     definition of the parameter form for the YUM bakery plugin
@@ -138,10 +179,48 @@ def _parameter_form_yum_bakery() -> Dictionary:
     )
 
 
+def _parameter_form_yum_bakery2() -> Dictionary:
+    """
+    definition of the parameter form for the YUM bakery plugin
+    :return:
+    """
+    return Dictionary(
+        migrate=_migrate_int_to_float2,
+        title=Title('YUM Update Check'),
+        help_text=Help('This will deploy the agent plugin <tt>YUM</tt>. This will activate the '
+                       'check <tt>YUM</tt> on RedHat based hosts and monitor pending normal and security updates.'
+                       ),
+        elements={
+            'deploy': DictElement(
+                parameter_form=Dictionary(
+                    title=Title('Deploy plugin'),
+                    help_text=Help(
+                        'Determines how the the <tt>YUM</tt> plugin will run on a deployed agent or disables it on an deployed agent'),
+                    elements={
+                        'interval': DictElement(
+                            parameter_form=TimeSpan(
+                                title=Title('Run asynchronously'),
+                                label=Label('Interval for collecting data'),
+                                help_text=Help(
+                                    'Determines how often the plugin will run on a deployed agent.'),
+                                displayed_magnitudes=[TimeMagnitude.SECOND,
+                                                      TimeMagnitude.MINUTE,
+                                                      TimeMagnitude.HOUR,
+                                                      TimeMagnitude.DAY],
+                                prefill=DefaultValue(DEFAULT_INTERVAL),
+                            )
+                        )
+                    }
+                ),
+            )
+        }
+    )
+
+
 rule_spec_yum_bakery = AgentConfig(
     title=Title('YUM Update Check'),
     name='yum',
-    parameter_form=_parameter_form_yum_bakery,
+    parameter_form=_parameter_form_yum_bakery2,
     topic=Topic.OPERATING_SYSTEM,
     help_text=Help('This will deploy the agent plugin <tt>YUM</tt> '
                    'for checking package update status.'),