fix migration from older config

Author: HenriWahl

docker-compose.yml

@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: dockerfiles/checkmk/Dockerfile
       args:
-        CHECKMK_VERSION: 2.4.0p19
+        CHECKMK_VERSION: 2.4.0p20
         CMK_PASSWORD: cmkadmin
         CMK_SITE_ID: cmk
     restart: unless-stopped

dockerfiles/client/Dockerfile_fedora-43

@@ -5,7 +5,7 @@ COPY check-mk-agent*.rpm /tmp/
 RUN dnf -y install iproute \
                    lsof \
                    nmap-ncat \
-                   procps-ng \
+                   procps-ng
 
 RUN dnf -y install /tmp/*.rpm && \
     rm -f /tmp/check-mk-agent*.rpm

dockerfiles/client/Dockerfile_rocky-8

@@ -5,7 +5,7 @@ COPY check-mk-agent*.rpm /tmp/
 RUN dnf -y install iproute \
                    lsof \
                    nmap-ncat \
-                   procps-ng \
+                   procps-ng
 
 RUN dnf -y install /tmp/*.rpm && \
     rm -f /tmp/check-mk-agent*.rpm

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

@@ -29,46 +29,53 @@
 # default interval in seconds
 DEFAULT_INTERVAL = 60.0
 
+# used in migrate method per default - empty dictionary means no deployment
+DEFAULT_CONFIG = {
+    'deploy': {
+        'interval': dict()
+    }
+}
+
 
 def _migrate_int_to_float(value: object) -> Mapping[str, object]:
     """
     migrate from integer interval to float interval
     """
 
     # debugging - might become an option later
-    #with open('/tmp/debug-migrate_int_to_float.txt', 'a') as debug_file:
+    # with open('/tmp/debug-migrate_int_to_float.txt', 'a') as debug_file:
     #    debug_file.write(f'value: {value}\n')
 
     if value is not None:
         if value.get('deploy'):
-            if value['deploy'].get('interval'):
-                return {
-                    'deploy': {
-                        'interval': float(value['deploy']['interval'])
+            if isinstance(value['deploy'], dict):
+                if value['deploy'].get('interval'):
+                    return {
+                        'deploy': {
+                            'interval': float(value['deploy']['interval'])
+                        }
                     }
-                }
-            else:
-                return {
-                    'deploy': {
-                        'interval': dict()
+            # backward compatiblility with tuple
+            elif isinstance(value['deploy'], tuple):
+                if len(value['deploy']) == 2:
+                    return {
+                        'deploy': {
+                            'interval': float(value['deploy'][1])
+                        }
                     }
-                }
+                else:
+                    return DEFAULT_CONFIG
+            else:
+                return DEFAULT_CONFIG
         # backward compatibility - migrate from interval to deploy
         elif value.get('interval'):
             return {
                 'deploy': {
                     'interval': float(value['interval'])
                 }
             }
-        # backward compatibility
-        elif value.get('nointerval'):
-            return {
-                'deploy': {
-                    'interval': dict()
-                }
-            }
-        else:
-            return value
+        # if no other case matches just give back empty default config
+        return DEFAULT_CONFIG
     else:
         # empty dictionary means no deployment
         return dict()