Merge pull request #100 from FingerlessGlov3s/master

CheckMK 2.4 fix parameters

Author: HenriWahl

lib/python3/cmk_addons/plugins/yum/agent_based/yum.py

@@ -107,11 +107,6 @@ def discovery_yum(section: Section):
 def check_yum(params: Dict[str, object], section: Section):
     debug = False
 
-    def extract_levels(entry, default):
-        if isinstance(entry, tuple) and isinstance(entry[0], str):
-            return entry[1]
-        return entry
-
     if section.error_message:
         yield Result(state=State.UNKNOWN, summary=section.error_message)
         return
@@ -127,23 +122,31 @@ def extract_levels(entry, default):
         yield Result(state=State.OK, summary="All packages are up to date")
         yield Metric(name="normal_updates", value=0)
     else:
-        warn, crit = extract_levels(params.get("normal", (5, 10)), (5, 10))
-        if section.packages >= crit:
-            state = State.CRIT
-        elif section.packages >= warn:
-            state = State.WARN
+        mode, levels = params.get("normal")
+        if mode == 'fixed':
+            warn, crit = levels
+            if section.packages >= crit:
+                state = State.CRIT
+            elif section.packages >= warn:
+                state = State.WARN
+            else:
+                state = State.OK
         else:
             state = State.OK
         yield Result(state=state, summary=f"{section.packages} normal updates available")
         yield Metric(name="normal_updates", value=section.packages)
 
     # === Security Updates ===
     if section.security_packages >= 0:
-        warn, crit = extract_levels(params.get("security", (1, 3)), (1, 3))
-        if section.security_packages >= crit:
-            state = State.CRIT
-        elif section.security_packages >= warn:
-            state = State.WARN
+        mode, levels = params.get("security")
+        if mode == 'fixed':
+            warn, crit = levels
+            if section.security_packages >= crit:
+                state = State.CRIT
+            elif section.security_packages >= warn:
+                state = State.WARN
+            else:
+                state = State.OK
         else:
             state = State.OK
         if section.security_packages_list:
@@ -204,8 +207,8 @@ def extract_levels(entry, default):
     check_ruleset_name="yum",
     check_default_parameters={
         "reboot_req": 2,
-        "normal": (1, 3),
-        "security": (5, 10),
+        "normal": {"fixed": (1, 10)},
+        "security": {"fixed": (1, 1)},
         "last_update_state": 1,
         "last_update_time_diff": 60,
     },

lib/python3/cmk_addons/plugins/yum/rulesets/yum_check_parameters.py

@@ -30,7 +30,7 @@ def _parameter_form_yum():
                     title=Title("State when normal updates are available"),
                     form_spec_template=Integer(),
                     level_direction=LevelDirection.UPPER,
-                    prefill_fixed_levels=DefaultValue(value=(1, 1)),
+                    prefill_fixed_levels=DefaultValue(value=(1, 10)),
                 ),
                 required=False,
             ),
@@ -39,7 +39,7 @@ def _parameter_form_yum():
                     title=Title("State when security updates are available"),
                     form_spec_template=Integer(),
                     level_direction=LevelDirection.UPPER,
-                    prefill_fixed_levels=DefaultValue(value=(2, 2)),
+                    prefill_fixed_levels=DefaultValue(value=(1, 1)),
                 ),
                 required=False,
             ),